mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-27 07:44:20 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1048 from dominiksitar/master

Browse Source 
Fixed issue #968
This commit is contained in:
cyian-1756
2018-11-27 14:05:02 -05:00
committed by GitHub
parent 6b50ab115e 27efe06a32
commit 5c6edbcd4d
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,6 +171,10 @@ public class TumblrRipper extends AlbumRipper {
HttpStatusException status = (HttpStatusException)cause; HttpStatusException status = (HttpStatusException)cause;
if (status.getStatusCode() == HttpURLConnection.HTTP_UNAUTHORIZED && !useDefaultApiKey) { if (status.getStatusCode() == HttpURLConnection.HTTP_UNAUTHORIZED && !useDefaultApiKey) {
retry = true; retry = true;
} else if (status.getStatusCode() == 404) {
LOGGER.error("No user or album found!");
sendUpdate(STATUS.NO_ALBUM_OR_USER, "Album or user doesn't exist!");
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");

11
src/main/java/com/rarchives/ripme/ui/MainWindow.java
View File

@@ -1404,6 +1404,17 @@ public final class MainWindow implements Runnable, RipStatusHandler {
case TOTAL_BYTES: case TOTAL_BYTES:
// Update total bytes // Update total bytes
break; break;
case NO_ALBUM_OR_USER:
if (LOGGER.isEnabledFor(Level.ERROR)) {
appendLog((String) msg.getObject(), Color.RED);
}
stopButton.setEnabled(false);
statusProgress.setValue(0);
statusProgress.setVisible(false);
openButton.setVisible(false);
pack();
statusWithColor("Error: " + msg.getObject(), Color.RED);
break;
} }
} }

3
src/main/java/com/rarchives/ripme/ui/RipStatusMessage.java
View File

@@ -15,7 +15,8 @@ public class RipStatusMessage {
DOWNLOAD_WARN("Download problem"), DOWNLOAD_WARN("Download problem"),
TOTAL_BYTES("Total bytes"), TOTAL_BYTES("Total bytes"),
COMPLETED_BYTES("Completed bytes"), COMPLETED_BYTES("Completed bytes"),
RIP_ERRORED("Rip Errored"); RIP_ERRORED("Rip Errored"),
NO_ALBUM_OR_USER("No album or user");
String value; String value;
STATUS(String value) { STATUS(String value) {