diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx index 9fa258405f..77174822c9 100644 --- a/web/apps/photos/src/pages/gallery.tsx +++ b/web/apps/photos/src/pages/gallery.tsx @@ -821,7 +821,7 @@ const Page: React.FC = () => { // 2. Construct a fake a metadata object with the updates // reflected in it. // - // 3. The caller (eventually) triggers a remote sync in the + // 3. The caller (eventually) triggers a remote pull in the // background, but meanwhile uses this updated metadata. // // TODO(RE): Replace with file fetch? diff --git a/web/apps/photos/src/pages/shared-albums.tsx b/web/apps/photos/src/pages/shared-albums.tsx index b6b5ce3c8c..8daa9c897e 100644 --- a/web/apps/photos/src/pages/shared-albums.tsx +++ b/web/apps/photos/src/pages/shared-albums.tsx @@ -362,7 +362,7 @@ export default function PublicCollectionGallery() { setPublicCollection(null); setPublicFiles(null); } else { - log.error("failed to sync public album with remote", e); + log.error("Public album remote pull failed", e); } } finally { hideLoadingBar(); diff --git a/web/packages/gallery/services/file-data.ts b/web/packages/gallery/services/file-data.ts index 6e456fa122..f9434b5389 100644 --- a/web/packages/gallery/services/file-data.ts +++ b/web/packages/gallery/services/file-data.ts @@ -196,8 +196,8 @@ export interface UpdatedFileDataFileIDsPage { fileIDs: Set; /** * The latest updatedAt (epoch microseconds) time obtained from remote in - * this batch of sync (from amongst all of the files in the batch, not just - * those that were filtered to be part of {@link fileIDs}). + * this batch being fetched (from amongst all of the files in the batch, not + * just those that were filtered to be part of {@link fileIDs}). */ lastUpdatedAt: number; } diff --git a/web/packages/new/photos/components/gallery/reducer.ts b/web/packages/new/photos/components/gallery/reducer.ts index c06edaa990..6febb458ea 100644 --- a/web/packages/new/photos/components/gallery/reducer.ts +++ b/web/packages/new/photos/components/gallery/reducer.ts @@ -163,7 +163,7 @@ export interface GalleryState { * Unsynced modifications are those whose effects have already been made on * remote (so thus they have been "saved", so to say), but we still haven't * yet refreshed our local state to incorporate them. The refresh will - * happen on the next "file sync", until then they remain as in-memory state + * happen on the next files pull, until then they remain as in-memory state * in the reducer. */ collectionFiles: EnteFile[]; @@ -318,9 +318,9 @@ export interface GalleryState { * the user's favorites, false otherwise) which should be used for that file * instead of what we get from our local DB. * - * The next time a sync with remote completes, we clear this map since - * thereafter just deriving {@link favoriteFileIDs} from our local files - * would reflect the correct state on remote too. + * The next time a remote pull completes, we clear this map since thereafter + * just deriving {@link favoriteFileIDs} from our local files would reflect + * the correct state on remote too. */ unsyncedFavoriteUpdates: Map; /** @@ -338,9 +338,9 @@ export interface GalleryState { * Each entry from a file ID to the magic metadata that should be used for * that file instead of what we get from our local DB. * - * The next time a sync with remote completes, we clear this map since - * thereafter the synced files themselves will reflect the latest private - * magic metadata. + * The next time a remote pull completes, we clear this map since thereafter + * the synced files themselves will reflect the latest private magic + * metadata. */ unsyncedPrivateMagicMetadataUpdates: Map< number, diff --git a/web/packages/new/photos/services/pull.ts b/web/packages/new/photos/services/pull.ts index 7061791bc5..0e8bb9491c 100644 --- a/web/packages/new/photos/services/pull.ts +++ b/web/packages/new/photos/services/pull.ts @@ -79,7 +79,7 @@ interface PullFilesOpts { * This is a subset of a full remote pull, independently exposed for use at * times when we only want to pull the file related information (e.g. we just * made some API request that modified collections or files, and so now want to - * sync our local changes to match remote). + * update our local changes to match remote). * * See also: [Note: Remote pull] *