Lomanic
/
BarInsta
mirror of https://github.com/KokaKiwi/BarInsta
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix checkDownloaded to check for both with and without username

This commit is contained in:
junhuicoding 2021-04-03 04:05:00 +08:00
parent f0167f2d93
commit f9816ec335
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/awais/instagrabber/utils/DownloadUtils.java
View File

@ -212,14 +212,13 @@ public final class DownloadUtils {
username = user.getUsername(); username = user.getUsername();
} }
final File downloadDir = getDownloadDir(null, "@" + username, true); final File downloadDir = getDownloadDir(null, "@" + username, true);
final String usernamePrepend = Utils.settingsHelper.getBoolean(Constants.DOWNLOAD_PREPEND_USER_NAME)
&& user != null ? username : "";
switch (media.getMediaType()) { switch (media.getMediaType()) {
case MEDIA_TYPE_IMAGE: case MEDIA_TYPE_IMAGE:
case MEDIA_TYPE_VIDEO: { case MEDIA_TYPE_VIDEO: {
final String url = ResponseBodyUtils.getImageUrl(media); final String url = ResponseBodyUtils.getImageUrl(media);
final File file = getDownloadSaveFile(downloadDir, media.getCode(), url, usernamePrepend); final File file = getDownloadSaveFile(downloadDir, media.getCode(), url, "");
checkList.add(file.exists()); final File usernamePrependedFile = getDownloadSaveFile(downloadDir, media.getCode(), url, username);
checkList.add(file.exists() || usernamePrependedFile.exists());
break; break;
} }
case MEDIA_TYPE_SLIDER: case MEDIA_TYPE_SLIDER:
@ -228,8 +227,9 @@ public final class DownloadUtils {
final Media child = sliderItems.get(i); final Media child = sliderItems.get(i);
if (child == null) continue; if (child == null) continue;
final String url = ResponseBodyUtils.getImageUrl(child); final String url = ResponseBodyUtils.getImageUrl(child);
final File file = getDownloadChildSaveFile(downloadDir, media.getCode(), i + 1, url, usernamePrepend); final File file = getDownloadChildSaveFile(downloadDir, media.getCode(), i + 1, url, "");
checkList.add(file.exists()); final File usernamePrependedFile = getDownloadChildSaveFile(downloadDir, media.getCode(), i + 1, url, username);
checkList.add(file.exists() || usernamePrependedFile.exists());
} }
break; break;
default: default: