Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

update(electron):persist-confirmation-dialog-values

Aswin Asok1566c2ef7ee6
diff --git a/desktop/src/main/services/upload.ts b/desktop/src/main/services/upload.ts
index e7c159147f..eb48b2096a 100644
--- a/desktop/src/main/services/upload.ts
+++ b/desktop/src/main/services/upload.ts
@@ -84,10 +84,21 @@ export const pendingUploads = (): PendingUploads | undefined => {
const zipItems = allZipItems.filter(([z]) => existsSync(z));
const preUploadSkippedFiles =
uploadStatusStore.get("preUploadSkippedFiles") ?? [];
+ const importTakeoutFavorites =
+ uploadStatusStore.get("importTakeoutFavorites") ?? true;
+ const includePartnerSharedFiles =
+ uploadStatusStore.get("includePartnerSharedFiles") ?? true;
if (filePaths.length == 0 && zipItems.length == 0) return undefined;
- return { collectionName, filePaths, zipItems, preUploadSkippedFiles };
+ return {
+ collectionName,
+ filePaths,
+ zipItems,
+ preUploadSkippedFiles,
+ importTakeoutFavorites,
+ includePartnerSharedFiles,
+ };
};
/**
@@ -131,12 +142,16 @@ export const setPendingUploads = ({
filePaths,
zipItems,
preUploadSkippedFiles,
+ importTakeoutFavorites,
+ includePartnerSharedFiles,
}: PendingUploads) => {
uploadStatusStore.set({
collectionName: collectionName ?? "",
filePaths: filePaths,
zipItems: zipItems,
preUploadSkippedFiles: preUploadSkippedFiles ?? [],
+ importTakeoutFavorites: importTakeoutFavorites ?? true,
+ includePartnerSharedFiles: includePartnerSharedFiles ?? true,
});
};
diff --git a/desktop/src/main/stores/upload-status.ts b/desktop/src/main/stores/upload-status.ts
index 67cddffe32..76fa0ba273 100644
--- a/desktop/src/main/stores/upload-status.ts
+++ b/desktop/src/main/stores/upload-status.ts
@@ -25,6 +25,10 @@ export interface UploadStatusStore {
* or they are hidden dot files.
*/
preUploadSkippedFiles?: PreUploadSkippedFile[];
+ /** Whether Takeout-favorited uploads should be added to Favorites. */
+ importTakeoutFavorites?: boolean;
+ /** Whether media originating from Google Photos partner sharing is uploaded. */
+ includePartnerSharedFiles?: boolean;
}
const uploadStatusSchema: Schema<UploadStatusStore> = {
@@ -46,6 +50,8 @@ const uploadStatusSchema: Schema<UploadStatusStore> = {
},
},
},
+ importTakeoutFavorites: { type: "boolean" },
+ includePartnerSharedFiles: { type: "boolean" },
};
export const uploadStatusStore = new Store({
diff --git a/desktop/src/types/ipc.ts b/desktop/src/types/ipc.ts
index 9f1dea2856..08ab5f2b15 100644
--- a/desktop/src/types/ipc.ts
+++ b/desktop/src/types/ipc.ts
@@ -88,6 +88,8 @@ export interface PendingUploads {
filePaths: string[];
zipItems: ZipItem[];
preUploadSkippedFiles?: PreUploadSkippedFile[];
+ importTakeoutFavorites?: boolean;
+ includePartnerSharedFiles?: boolean;
}
export type FFmpegCommand = string[] | { default: string[]; hdr: string[] };
diff --git a/web/apps/photos/src/components/Upload.tsx b/web/apps/photos/src/components/Upload.tsx
index 30ef33f639..6adb2898a0 100644
--- a/web/apps/photos/src/components/Upload.tsx
+++ b/web/apps/photos/src/components/Upload.tsx
@@ -186,6 +186,8 @@ interface NewCollectionsOptions {
includeHiddenCollections?: boolean;
createHidden?: boolean;
skipConfirmation?: boolean;
+ importTakeoutFavorites?: boolean;
+ includePartnerSharedFiles?: boolean;
}
type PendingUpload =
@@ -333,6 +335,12 @@ export const Upload: React.FC<UploadProps> = ({
const pendingDesktopUploadCollectionName = useRef<string | undefined>(
undefined,
);
+ const pendingDesktopUploadConfirmationOptions = useRef<
+ Pick<
+ NewCollectionsOptions,
+ "importTakeoutFavorites" | "includePartnerSharedFiles"
+ >
+ >({});
/**
* This is set to thue user's choice when the user chooses one of the
@@ -354,7 +362,7 @@ export const Upload: React.FC<UploadProps> = ({
/** The confirmed favorites choice for retrying the current batch. */
const retryImportTakeoutFavorites = useRef(true);
/** The confirmed partner-sharing choice for retrying the current batch. */
- const retryIncludePartnerSharedFiles = useRef(false);
+ const retryIncludePartnerSharedFiles = useRef(true);
/**
* `true` if we've activated one hidden {@link Inputs} that allow the user
@@ -452,6 +460,7 @@ export const Upload: React.FC<UploadProps> = ({
if (electron) {
const upload = (collectionName: string, filePaths: string[]) => {
isPendingDesktopUpload.current = true;
+ pendingDesktopUploadConfirmationOptions.current = {};
pendingDesktopUploadCollectionName.current = collectionName;
setDesktopFilePaths(filePaths);
};
@@ -469,12 +478,18 @@ export const Upload: React.FC<UploadProps> = ({
filePaths,
zipItems,
preUploadSkippedFiles,
+ importTakeoutFavorites,
+ includePartnerSharedFiles,
} = pending;
log.info(
`Resuming pending of upload of ${filePaths.length + zipItems.length} items${collectionName ? " to collection " + collectionName : ""}`,
);
isPendingDesktopUpload.current = true;
+ pendingDesktopUploadConfirmationOptions.current = {
+ importTakeoutFavorites,
+ includePartnerSharedFiles,
+ };
pendingDesktopUploadCollectionName.current = collectionName;
setDesktopFilePaths(filePaths);
setDesktopZipItems(zipItems);
@@ -635,6 +650,9 @@ export const Upload: React.FC<UploadProps> = ({
if (isPendingDesktopUpload.current) {
isPendingDesktopUpload.current = false;
+ const confirmationOptions =
+ pendingDesktopUploadConfirmationOptions.current;
+ pendingDesktopUploadConfirmationOptions.current = {};
if (pendingDesktopUploadCollectionName.current) {
// Include hidden collections so watch folder syncs add
// files to existing hidden albums instead of creating new
@@ -644,12 +662,14 @@ export const Upload: React.FC<UploadProps> = ({
pendingDesktopUploadCollectionName.current,
includeHiddenCollections: true,
skipConfirmation: true,
+ ...confirmationOptions,
});
pendingDesktopUploadCollectionName.current = undefined;
} else {
uploadFilesToNewCollections("parent", {
includeHiddenCollections: true,
skipConfirmation: true,
+ ...confirmationOptions,
});
}
return;
@@ -874,7 +894,7 @@ export const Upload: React.FC<UploadProps> = ({
collection: Collection,
uploadItemAndPaths: UploadItemAndPath[],
importTakeoutFavorites: boolean,
- includePartnerSharedFiles = false,
+ includePartnerSharedFiles = true,
) => {
try {
preCollectionCreationAction();
@@ -927,6 +947,8 @@ export const Upload: React.FC<UploadProps> = ({
includeHiddenCollections,
createHidden,
skipConfirmation,
+ importTakeoutFavorites,
+ includePartnerSharedFiles,
}: NewCollectionsOptions = {},
) => {
const uploadItemAndPaths = uploadItemsAndPaths.current;
@@ -963,7 +985,8 @@ export const Upload: React.FC<UploadProps> = ({
uploadItemAndPaths,
collectionNameToUploadItems,
{ includeHiddenCollections, createHidden },
- true,
+ importTakeoutFavorites ?? true,
+ includePartnerSharedFiles ?? true,
);
return;
}
@@ -984,8 +1007,8 @@ export const Upload: React.FC<UploadProps> = ({
fileCount,
albumCount: collectionNameToUploadItems.size,
isTakeout,
- importFavorites: true,
- includePartnerSharedFiles: true,
+ importFavorites: importTakeoutFavorites ?? true,
+ includePartnerSharedFiles: includePartnerSharedFiles ?? true,
});
} catch (e) {
if (uploadItemsAndPaths.current !== uploadItemAndPaths) return;
@@ -999,7 +1022,7 @@ export const Upload: React.FC<UploadProps> = ({
collectionNameToUploadItems: Map<string, UploadItemAndPath[]>,
{ includeHiddenCollections, createHidden }: NewCollectionsOptions,
importTakeoutFavorites: boolean,
- includePartnerSharedFiles = false,
+ includePartnerSharedFiles = true,
) => {
preCollectionCreationAction();
let uploadItemsWithCollection: UploadItemWithCollection[] = [];
@@ -1153,7 +1176,7 @@ export const Upload: React.FC<UploadProps> = ({
retryImportTakeoutFavorites.current =
opts?.importTakeoutFavorites ?? true;
retryIncludePartnerSharedFiles.current =
- opts?.includePartnerSharedFiles ?? false;
+ opts?.includePartnerSharedFiles ?? true;
await preUploadAction();
if (
opts?.persistPendingUploads &&
@@ -1168,6 +1191,8 @@ export const Upload: React.FC<UploadProps> = ({
.map(({ uploadItem }) => uploadItem)
.filter((x) => x !== undefined),
preUploadSkippedFiles,
+ opts.importTakeoutFavorites ?? true,
+ opts.includePartnerSharedFiles ?? true,
);
}
const batchResult = await uploadManager.uploadItems(
@@ -1652,6 +1677,8 @@ const setPendingUploads = async (
collections: Collection[],
uploadItems: UploadItem[],
preUploadSkippedFiles: PreUploadSkippedFile[],
+ importTakeoutFavorites: boolean,
+ includePartnerSharedFiles: boolean,
) => {
let collectionName: string | undefined;
/* collection being one suggest one of two things
@@ -1686,6 +1713,8 @@ const setPendingUploads = async (
filePaths,
zipItems,
preUploadSkippedFiles,
+ importTakeoutFavorites,
+ includePartnerSharedFiles,
});
};
diff --git a/web/packages/base/types/ipc.ts b/web/packages/base/types/ipc.ts
index 96f790b651..dccca7e2c6 100644
--- a/web/packages/base/types/ipc.ts
+++ b/web/packages/base/types/ipc.ts
@@ -925,6 +925,10 @@ export interface PendingUploads {
* or they are hidden dot files.
*/
preUploadSkippedFiles?: PreUploadSkippedFile[];
+ /** Whether Takeout-favorited uploads should be added to Favorites. */
+ importTakeoutFavorites?: boolean;
+ /** Whether media originating from Google Photos partner sharing is uploaded. */
+ includePartnerSharedFiles?: boolean;
}
/**
diff --git a/web/packages/gallery/services/upload/upload-service.ts b/web/packages/gallery/services/upload/upload-service.ts
index 2aad3eb0fe..a1ba072f73 100644
--- a/web/packages/gallery/services/upload/upload-service.ts
+++ b/web/packages/gallery/services/upload/upload-service.ts
@@ -742,7 +742,7 @@ export const upload = async (
): Promise<UploadResult> => {
const {
abortIfCancelled,
- includePartnerSharedFiles,
+ includePartnerSharedFiles = true,
skipDuplicateAddToUploadCollection,
} = uploadContext;