michael/merlyn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issue with files loading with watching enabled (#3930)

Browse Source
This commit is contained in:
Timothy Carambat 2025-06-01 12:53:48 -07:00 committed by GitHub
parent 702e75635c
commit a0134de979
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/models/documentSyncQueue.js
View File

@ -53,6 +53,8 @@ const DocumentSyncQueue = {
* @returns {boolean} - true if the document can be watched, false otherwise * @returns {boolean} - true if the document can be watched, false otherwise
*/ */
canWatch: function ({ title, chunkSource = null } = {}) { canWatch: function ({ title, chunkSource = null } = {}) {
if (!chunkSource) return false;
if (chunkSource.startsWith("link://") && title.endsWith(".html")) if (chunkSource.startsWith("link://") && title.endsWith(".html"))
return true; // If is web-link material (prior to feature most chunkSources were links://) return true; // If is web-link material (prior to feature most chunkSources were links://)
if (chunkSource.startsWith("youtube://")) return true; // If is a youtube link if (chunkSource.startsWith("youtube://")) return true; // If is a youtube link

9
server/utils/files/index.js
View File

@ -361,9 +361,6 @@ async function fileToPickerData({
const filename = path.basename(pathToFile); const filename = path.basename(pathToFile);
const fileStats = fs.statSync(pathToFile); const fileStats = fs.statSync(pathToFile);
const cachedStatus = await cachedVectorInformation(cachefilename, true); const cachedStatus = await cachedVectorInformation(cachefilename, true);
const canWatchStatus = liveSyncAvailable
? DocumentSyncQueue.canWatch(metadata)
: false;
if (fileStats.size < FILE_READ_SIZE_THRESHOLD) { if (fileStats.size < FILE_READ_SIZE_THRESHOLD) {
const rawData = fs.readFileSync(pathToFile, "utf8"); const rawData = fs.readFileSync(pathToFile, "utf8");
@ -381,7 +378,9 @@ async function fileToPickerData({
type: "file", type: "file",
...metadata, ...metadata,
cached: cachedStatus, cached: cachedStatus,
canWatch: canWatchStatus, canWatch: liveSyncAvailable
? DocumentSyncQueue.canWatch(metadata)
: false,
// pinnedWorkspaces: [], // This is the list of workspaceIds that have pinned this document // pinnedWorkspaces: [], // This is the list of workspaceIds that have pinned this document
// watched: false, // boolean to indicate if this document is watched in ANY workspace // watched: false, // boolean to indicate if this document is watched in ANY workspace
}; };
@ -429,7 +428,7 @@ async function fileToPickerData({
type: "file", type: "file",
...metadata, ...metadata,
cached: cachedStatus, cached: cachedStatus,
canWatch: canWatchStatus, canWatch: liveSyncAvailable ? DocumentSyncQueue.canWatch(metadata) : false,
}; };
} }