Merge pull request #123 from ente-io/fix-zip-upload

fix non google takeout zip upload
This commit is contained in:
Abhinav Kumar 2022-12-21 07:16:27 +05:30 committed by GitHub
commit 0e7ded20a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -15,11 +15,12 @@ export const getSavedFilePaths = (type: FILE_PATH_TYPE) => {
};
export async function getZipEntryAsElectronFile(
zipName: string,
zip: StreamZip.StreamZipAsync,
entry: StreamZip.ZipEntry
): Promise<ElectronFile> {
return {
path: entry.name,
path: path.join(zipName, entry.name),
name: path.basename(entry.name),
size: entry.size,
lastModified: entry.time,
@ -58,6 +59,7 @@ export const getElectronFilesFromGoogleZip = async (filePath: string) => {
const zip = new StreamZip.async({
file: filePath,
});
const zipName = path.basename(filePath, '.zip');
const entries = await zip.entries();
const files: ElectronFile[] = [];
@ -65,7 +67,7 @@ export const getElectronFilesFromGoogleZip = async (filePath: string) => {
for (const entry of Object.values(entries)) {
const basename = path.basename(entry.name);
if (entry.isFile && basename.length > 0 && basename[0] !== '.') {
files.push(await getZipEntryAsElectronFile(zip, entry));
files.push(await getZipEntryAsElectronFile(zipName, zip, entry));
}
}