beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source 
fix non google takeout zip upload
This commit is contained in:
Abhinav Kumar 2022-12-21 07:16:27 +05:30 committed by GitHub
parent 35b0c8e06d ebcf54d58e
commit 0e7ded20a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/services/upload.ts
View file

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