Skip to content

fix: allow duplicate downloads by unique filenames #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sinkaroid wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: allow duplicate downloads by unique filenames #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 32 additions & 5 deletions src/components/HOC/enhanceSaveImage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,25 @@ const enhanceSaveImage = (WrappedComponent) => {
});
};

getUniqueFilePath = async (imagesDir, fileName) => {
const lastDotIndex = fileName.lastIndexOf('.');
const hasExt = lastDotIndex > 0;
const baseName = hasExt ? fileName.slice(0, lastDotIndex) : fileName;
const ext = hasExt ? fileName.slice(lastDotIndex) : '';

let candidateName = fileName;
let candidatePath = `${imagesDir}/${candidateName}`;
let counter = 1;

while (await RNFetchBlob.fs.exists(candidatePath)) {
candidateName = `${baseName}_${counter}${ext}`;
candidatePath = `${imagesDir}/${candidateName}`;
counter += 1;
}

return { filePath: candidatePath, fileName: candidateName };
};

saveImage = async ({
imageUrls,
imageIndex,
Expand Down Expand Up @@ -177,9 +196,11 @@ const enhanceSaveImage = (WrappedComponent) => {
saveImageSettings,
imageIndex || index,
);
const { filePath: targetPath, fileName: targetFileName } =
await this.getUniqueFilePath(imagesDir, fileName);
try {
const res = await RNFetchBlob.config({
path: `${imagesDir}/${fileName}`,
path: targetPath,
}).fetch('GET', url, {
referer: 'http://www.pixiv.net',
});
Expand All @@ -188,19 +209,25 @@ const enhanceSaveImage = (WrappedComponent) => {
try {
await CameraRoll.saveToCameraRoll(filePath);
this.showToast(
i18n.formatString(i18n.saveImageSuccess, fileName),
i18n.formatString(i18n.saveImageSuccess, targetFileName),
);
} catch (err) {
this.showToast(i18n.formatString(i18n.saveImageError, fileName));
this.showToast(
i18n.formatString(i18n.saveImageError, targetFileName),
);
}
} else if (Platform.OS === 'android') {
this.showToast(i18n.formatString(i18n.saveImageSuccess, fileName));
this.showToast(
i18n.formatString(i18n.saveImageSuccess, targetFileName),
);
try {
await RNFetchBlob.fs.scanFile([{ path: filePath }]);
} catch (err) {}
}
} catch (err) {
this.showToast(i18n.formatString(i18n.saveImageError, fileName));
this.showToast(
i18n.formatString(i18n.saveImageError, targetFileName),
);
}
});
return null;
Expand Down