JDownloader2/jdownloader
1
0
Fork 0
mirror of https://github.com/mirror/jdownloader.git synced 2024-12-02 17:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build>full

Browse Source 
git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@48176 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: b59b443fa3c3ded4cefc325cbce1d2b8fa405119
This commit is contained in:
jiaz 2023-08-17 15:24:19 +00:00
parent 628077cb01
commit d03388b10e
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/jd/plugins/hoster/AllDebridCom.java
View File

@ -26,27 +26,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.WeakHashMap;
import org.appwork.net.protocol.http.HTTPConstants;
import org.appwork.storage.TypeRef;
import org.appwork.storage.config.annotations.AboutConfig;
import org.appwork.storage.config.annotations.DefaultBooleanValue;
import org.appwork.uio.ConfirmDialogInterface;
import org.appwork.uio.UIOManager;
import org.appwork.utils.Application;
import org.appwork.utils.StringUtils;
import org.appwork.utils.formatter.SizeFormatter;
import org.appwork.utils.formatter.TimeFormatter;
import org.appwork.utils.os.CrossSystem;
import org.appwork.utils.swing.dialog.ConfirmDialog;
import org.jdownloader.gui.IconKey;
import org.jdownloader.gui.views.downloads.columns.ETAColumn;
import org.jdownloader.images.AbstractIcon;
import org.jdownloader.plugins.PluginTaskID;
import org.jdownloader.plugins.config.PluginConfigInterface;
import org.jdownloader.plugins.config.PluginJsonConfig;
import org.jdownloader.plugins.controller.LazyPlugin;
import org.jdownloader.scripting.JavaScriptEngineFactory;
import jd.PluginWrapper;
import jd.config.Property;
import jd.controlling.AccountController;
@ -76,6 +55,27 @@ import jd.plugins.download.DownloadInterface;
import jd.plugins.download.DownloadLinkDownloadable;
import jd.plugins.download.HashInfo;
import org.appwork.net.protocol.http.HTTPConstants;
import org.appwork.storage.TypeRef;
import org.appwork.storage.config.annotations.AboutConfig;
import org.appwork.storage.config.annotations.DefaultBooleanValue;
import org.appwork.uio.ConfirmDialogInterface;
import org.appwork.uio.UIOManager;
import org.appwork.utils.Application;
import org.appwork.utils.StringUtils;
import org.appwork.utils.formatter.SizeFormatter;
import org.appwork.utils.formatter.TimeFormatter;
import org.appwork.utils.os.CrossSystem;
import org.appwork.utils.swing.dialog.ConfirmDialog;
import org.jdownloader.gui.IconKey;
import org.jdownloader.gui.views.downloads.columns.ETAColumn;
import org.jdownloader.images.AbstractIcon;
import org.jdownloader.plugins.PluginTaskID;
import org.jdownloader.plugins.config.PluginConfigInterface;
import org.jdownloader.plugins.config.PluginJsonConfig;
import org.jdownloader.plugins.controller.LazyPlugin;
import org.jdownloader.scripting.JavaScriptEngineFactory;
@HostPlugin(revision = "$Revision$", interfaceVersion = 3, names = { "alldebrid.com" }, urls = { "https?://alldebrid\\.com/f/([A-Za-z0-9\\-_]+)" })
public class AllDebridCom extends PluginForHost {
public AllDebridCom(PluginWrapper wrapper) {
@ -381,7 +381,7 @@ public class AllDebridCom extends PluginForHost {
final String newAuth = br.getHeaders().getHeader(HTTPConstants.HEADER_REQUEST_AUTHORIZATION).getValue();
if (!StringUtils.equals(oldAuth, newAuth)) {
/* Previous download-attempt already successfully ran through this handling so we don't need to do this here again. */
throw exceptionOnDownloadAndSuccess;
throw (PluginException) exceptionOnDownloadAndSuccess.fillInStackTrace();
}
logger.info("Performing auth blocked login");
final String check_url = api_base + "/user/verif?agent=" + agent_raw + "&token=" + token;
@ -427,12 +427,12 @@ public class AllDebridCom extends PluginForHost {
if (throwThisException) {
throw e;
} else {
throw exceptionOnFailure;
throw (AccountUnavailableException) exceptionOnFailure.fillInStackTrace();
}
}
if (StringUtils.isEmpty(apikey)) {
logger.warning("Failed for unknown reasons");
throw exceptionOnFailure;
throw (AccountUnavailableException) exceptionOnFailure.fillInStackTrace();
}
logger.info("Using new apikey: " + apikey);
account.setProperty(PROPERTY_apikey, apikey);
@ -440,7 +440,7 @@ public class AllDebridCom extends PluginForHost {
if (link == null) {
throw new AccountUnavailableException("Retry after blocked login has been cleared", 5 * 1000);
} else {
throw exceptionOnDownloadAndSuccess;
throw (PluginException) exceptionOnDownloadAndSuccess.fillInStackTrace();
}
}
}
@ -493,7 +493,7 @@ public class AllDebridCom extends PluginForHost {
/** See https://docs.alldebrid.com/v4/#all-errors */
private Map<String, Object> handleErrors(final Account account, final DownloadLink link) throws PluginException, Exception {
/* 2020-03-25: E.g. {"status": "error", "error": {"code": "AUTH_BAD_APIKEY","message": "The auth apikey is invalid"}} */
Map<String, Object> entries = restoreFromString(br.getRequest().getHtmlCode(), TypeRef.HASHMAP);
Map<String, Object> entries = restoreFromString(br.getRequest().getHtmlCode(), TypeRef.MAP);
final String status = (String) entries.get("status");
if (!"error".equalsIgnoreCase(status)) {
return entries;