mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-29 08:40:37 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1069 from cyian-1756/tumblrDoubleMessageFix

Browse Source 
Fixed minor issue where if a user didn't exist tumblr ripper would output error message twice
This commit is contained in:
cyian-1756
2018-11-27 14:12:09 -05:00
committed by GitHub
parent 5c6edbcd4d ddeb5b6b88
commit 36d9703a9c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java
View File

@@ -130,7 +130,8 @@ public class TumblrRipper extends AlbumRipper {
@Override @Override
public void rip() throws IOException { public void rip() throws IOException {
String[] mediaTypes; String[] mediaTypes;
boolean exceededRateLimit = false; // If true the rip loop won't be run
boolean shouldStopRipping = false;
if (albumType == ALBUM_TYPE.POST) { if (albumType == ALBUM_TYPE.POST) {
mediaTypes = new String[] { "post" }; mediaTypes = new String[] { "post" };
} else { } else {
@@ -142,7 +143,7 @@ public class TumblrRipper extends AlbumRipper {
break; break;
} }
if (exceededRateLimit) { if (shouldStopRipping) {
break; break;
} }
offset = 0; offset = 0;
@@ -151,7 +152,7 @@ public class TumblrRipper extends AlbumRipper {
break; break;
} }
if (exceededRateLimit) { if (shouldStopRipping) {
break; break;
} }
@@ -174,11 +175,12 @@ public class TumblrRipper extends AlbumRipper {
} else if (status.getStatusCode() == 404) { } else if (status.getStatusCode() == 404) {
LOGGER.error("No user or album found!"); LOGGER.error("No user or album found!");
sendUpdate(STATUS.NO_ALBUM_OR_USER, "Album or user doesn't exist!"); sendUpdate(STATUS.NO_ALBUM_OR_USER, "Album or user doesn't exist!");
shouldStopRipping = true;
break; break;
} else if (status.getStatusCode() == 429) { } else if (status.getStatusCode() == 429) {
LOGGER.error("Tumblr rate limit has been exceeded"); LOGGER.error("Tumblr rate limit has been exceeded");
sendUpdate(STATUS.DOWNLOAD_ERRORED,"Tumblr rate limit has been exceeded"); sendUpdate(STATUS.DOWNLOAD_ERRORED,"Tumblr rate limit has been exceeded");
exceededRateLimit = true; shouldStopRipping = true;
break; break;
} }
} }