mirroring bot - 2024/10/17

Author: updating-bot

svn_trunk/src/jd/plugins/AccountInfo.java

@@ -551,24 +551,21 @@ public List<String> setMultiHostSupportV2(final PluginForHost multiHostPlugin, f
                 }
                 best.add(plugin);
             }
-            if (best.size() > 1) {
-                unassignedMultiHostSupport.add(maindomainCleaned);
-                if (logger != null) {
-                    logger.warning("Found more than one possible plugins for one domain: " + maindomainCleaned);
-                    logger.log(new Exception("DEBUG: " + maindomainCleaned));
-                }
-                continue cleanListLoop;
-            } else if (best.size() == 0 && skippedByPluginAllowHandleEntries.size() == 0) {
-                unassignedMultiHostSupport.add(maindomainCleaned);
-                continue cleanListLoop;
-            }
             final LazyHostPlugin finalplugin;
             if (best.size() == 1) {
                 finalplugin = best.get(0);
-            } else {
+            } else if (skippedByPluginAllowHandleEntries.size() == plugins.size()) {
                 /* Take first result of fallback list. */
                 finalplugin = plugins.iterator().next();
                 mhost.setStatus(MultihosterHostStatus.DEACTIVATED_JDOWNLOADER_NOT_ALLOWED_BY_ORIGINAL_PLUGIN);
+            } else {
+                /* Too many results and/or all results are for offline domains */
+                unassignedMultiHostSupport.add(maindomainCleaned);
+                if (best.size() > 1 && logger != null) {
+                    logger.warning("Found more than one possible plugins for one domain: " + maindomainCleaned);
+                    logger.log(new Exception("DEBUG: " + maindomainCleaned));
+                }
+                continue cleanListLoop;
             }
             final boolean hostIsWorkingAccordingToMultihost = mhost.getStatus() == MultihosterHostStatus.WORKING || mhost.getStatus() == MultihosterHostStatus.WORKING_UNSTABLE;
             final boolean printNonWorkingHosts = true;

svn_trunk/src/jd/plugins/MultiHostHost.java

@@ -225,7 +225,10 @@ public boolean canDownload(final DownloadLink link) {
         }
     }
 
-    /** Returns custom set status text. Typically used to describe why this host is currently not working. */
+    /**
+     * Returns custom set status text. </br>
+     * Typically used to describe why this host is currently not working but can also be used as an informative field.
+     */
     public String getStatusText() {
         return statusText;
     }

svn_trunk/src/jd/plugins/PluginForHost.java

@@ -16,12 +16,12 @@
 package jd.plugins.decrypter;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
 import org.appwork.storage.TypeRef;
-import org.appwork.utils.StringUtils;
 import org.appwork.utils.parser.UrlQuery;
 import org.jdownloader.scripting.JavaScriptEngineFactory;
 
@@ -40,7 +40,7 @@
 import jd.plugins.PluginForDecrypt;
 import jd.plugins.hoster.AllDebridCom;
 
-@DecrypterPlugin(revision = "$Revision: 49909 $", interfaceVersion = 3, names = {}, urls = {})
+@DecrypterPlugin(revision = "$Revision: 49981 $", interfaceVersion = 3, names = {}, urls = {})
 public class AlldebridComFolder extends PluginForDecrypt {
     public AlldebridComFolder(PluginWrapper wrapper) {
         super(wrapper);
@@ -91,75 +91,79 @@ public ArrayList<DownloadLink> decryptIt(final CryptedLink param, ProgressContro
         query.appendEncoded("agent", AllDebridCom.agent_raw);
         query.appendEncoded("apikey", AllDebridCom.getStoredApiKey(account));
         query.appendEncoded("id", magnetID);
-        br.getPage(AllDebridCom.api_base + "/magnet/status?" + query.toString());
+        /* When "jd" parameter is supplied, information which is unnecessary for JD will be excluded from json response. */
+        query.appendEncoded("jd", "");
+        br.getPage(AllDebridCom.api_base_41 + "/magnet/status?" + query.toString());
         final Map<String, Object> entries = restoreFromString(br.getRequest().getHtmlCode(), TypeRef.MAP);
         if (entries.containsKey("error")) {
             throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND);
         }
         final Map<String, Object> magnet = (Map<String, Object>) JavaScriptEngineFactory.walkJson(entries, "data/magnets");
         final String torrentName = (String) magnet.get("filename");
         final String torrentNameEscaped = Pattern.quote(torrentName);
-        final List<Map<String, Object>> resourcelist = (List<Map<String, Object>>) magnet.get("links");
+        final List<Map<String, Object>> resourcelist = (List<Map<String, Object>>) magnet.get("files");
         if (resourcelist == null || resourcelist.isEmpty()) {
             /* Probably unfinished torrent download */
             throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND);
         }
-        final ArrayList<DownloadLink> ret = new ArrayList<DownloadLink>();
         final String folderRoot = torrentName;
         final FilePackage fpRoot = FilePackage.getInstance();
         fpRoot.setName(folderRoot);
-        for (final Map<String, Object> resource : resourcelist) {
-            final String url = resource.get("link").toString();
-            final String filename = resource.get("filename").toString();
-            final DownloadLink dl = this.createDownloadlink(url);
-            dl.setName(filename);
-            dl.setDownloadSize(((Number) resource.get("size")).longValue());
-            final boolean isSpecialRar = filename.matches("^" + torrentNameEscaped + "(\\.rar|\\.part\\d+\\.rar)$");
-            if (isSpecialRar) {
-                dl.setRelativeDownloadFolderPath(folderRoot);
-                dl._setFilePackage(fpRoot);
-            } else {
-                /* Check whether or not this file goes into a deeper subfolder level. */
-                String filePath = getFilePath((List<Object>) resource.get("files"), "");
-                /* Path is full path with filename at the end -> Remove that */
-                filePath = filePath.replaceAll("/" + Pattern.quote(filename) + "$", "");
-                if (!StringUtils.isEmpty(filePath)) {
-                    /* File that goes into (nested) subfolder. */
-                    dl.setRelativeDownloadFolderPath(folderRoot + filePath);
-                    final FilePackage nestedFilePackage = FilePackage.getInstance();
-                    nestedFilePackage.setName(folderRoot + filePath);
-                    dl._setFilePackage(nestedFilePackage);
-                } else {
-                    /* File that is in the root of the torrent main folder (named after torrent name). */
-                    dl.setRelativeDownloadFolderPath(folderRoot);
-                    dl._setFilePackage(fpRoot);
-                }
-            }
-            dl.setAvailable(true);
-            ret.add(dl);
-        }
+        final ArrayList<DownloadLink> ret = new ArrayList<DownloadLink>();
+        crawlRecursive(ret, new HashMap<String, FilePackage>(), resourcelist, torrentNameEscaped, torrentName);
         return ret;
     }
 
-    /** Recursive function which returns the complete path to a file inside nested json arrays. */
-    private String getFilePath(final List<Object> subfolderList, String path) {
-        if (subfolderList.isEmpty()) {
+    private List<DownloadLink> crawlRecursive(final List<DownloadLink> results, final Map<String, FilePackage> fps, Object o, final String torrentNameEscaped, final String path) {
+        if (o == null) {
             return null;
         }
-        final Map<String, Object> entries = (Map<String, Object>) subfolderList.get(0);
-        final Object subfolderNameO = entries.get("n");
-        if (subfolderNameO == null) {
-            return null;
-        }
-        final String subfolderName = (String) subfolderNameO;
-        path += "/" + subfolderName;
-        final Object nextSubFolderLevel = entries.get("e");
-        if (nextSubFolderLevel == null) {
-            /* We've reached the end */
-            return path;
+        if (o instanceof List) {
+            for (final Object resourceO : (List<Object>) o) {
+                this.crawlRecursive(results, fps, resourceO, torrentNameEscaped, path);
+            }
+            return results;
         } else {
-            /* Go deeper */
-            return this.getFilePath((List<Object>) nextSubFolderLevel, path);
+            final Map<String, Object> resource = (Map<String, Object>) o;
+            final String url = (String) resource.get("l");
+            final String name = resource.get("n").toString();
+            if (url != null) {
+                /* Single file */
+                final String folderRoot = new Regex(path, "^([^/]+)").getMatch(0);
+                final DownloadLink dl = this.createDownloadlink(url);
+                dl.setName(name);
+                dl.setDownloadSize(((Number) resource.get("s")).longValue());
+                final boolean isSpecialRar = name.matches("^" + torrentNameEscaped + "(\\.rar|\\.part\\d+\\.rar)$");
+                if (isSpecialRar) {
+                    FilePackage fpRoot = fps.get(folderRoot);
+                    if (fpRoot == null) {
+                        fpRoot = FilePackage.getInstance();
+                        fpRoot.setName(folderRoot);
+                        fps.put(folderRoot, fpRoot);
+                    }
+                    dl.setRelativeDownloadFolderPath(folderRoot);
+                    dl._setFilePackage(fpRoot);
+                } else {
+                    /* Remove filename from path. */
+                    final String filePath = path.replaceAll("/" + Pattern.quote(name) + "$", "");
+                    /* File that goes into (nested) subfolder. */
+                    dl.setRelativeDownloadFolderPath(filePath);
+                    FilePackage nestedFilePackage = fps.get(filePath);
+                    if (nestedFilePackage == null) {
+                        nestedFilePackage = FilePackage.getInstance();
+                        nestedFilePackage.setName(filePath);
+                        fps.put(filePath, nestedFilePackage);
+                    }
+                    dl._setFilePackage(nestedFilePackage);
+                }
+                dl.setAvailable(true);
+                results.add(dl);
+            } else {
+                final List<Map<String, Object>> nextSubFolderLevel = (List<Map<String, Object>>) resource.get("e");
+                /* Go deeper */
+                return this.crawlRecursive(results, fps, nextSubFolderLevel, torrentNameEscaped, path + "/" + name);
+            }
         }
+        return results;
     }
 }

svn_trunk/src/jd/plugins/decrypter/AlldebridComFolder.java

@@ -17,6 +17,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import org.appwork.utils.formatter.SizeFormatter;
 
@@ -25,15 +26,17 @@
 import jd.http.Browser;
 import jd.http.URLConnectionAdapter;
 import jd.nutils.encoding.Encoding;
+import jd.parser.Regex;
 import jd.plugins.CryptedLink;
 import jd.plugins.DecrypterPlugin;
 import jd.plugins.DownloadLink;
+import jd.plugins.FilePackage;
 import jd.plugins.LinkStatus;
 import jd.plugins.PluginException;
 import jd.plugins.PluginForDecrypt;
 import jd.plugins.hoster.DirectHTTP;
 
-@DecrypterPlugin(revision = "$Revision: 49497 $", interfaceVersion = 3, names = {}, urls = {})
+@DecrypterPlugin(revision = "$Revision: 49975 $", interfaceVersion = 3, names = {}, urls = {})
 public class GrosfichiersComFolder extends PluginForDecrypt {
     public GrosfichiersComFolder(PluginWrapper wrapper) {
         super(wrapper);
@@ -43,6 +46,7 @@ public GrosfichiersComFolder(PluginWrapper wrapper) {
     public Browser createNewBrowserInstance() {
         final Browser br = super.createNewBrowserInstance();
         br.setFollowRedirects(true);
+        br.setCookie(getHost(), "gf_lg", "en");
         return br;
     }
 
@@ -75,6 +79,12 @@ public static String[] buildAnnotationUrls(final List<String[]> pluginDomains) {
     }
 
     public ArrayList<DownloadLink> decryptIt(final CryptedLink param, ProgressController progress) throws Exception {
+        final Regex urlinfo = new Regex(param.getCryptedUrl(), this.getSupportedLinks());
+        final String folderID = urlinfo.getMatch(0);
+        if (folderID.toLowerCase(Locale.ENGLISH).equals(folderID)) {
+            /* Lowercase string -> Must be invalid e.g. https://www.grosfichiers.com/css */
+            throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND);
+        }
         final ArrayList<DownloadLink> ret = new ArrayList<DownloadLink>();
         URLConnectionAdapter con = null;
         try {
@@ -96,9 +106,20 @@ public ArrayList<DownloadLink> decryptIt(final CryptedLink param, ProgressContro
         }
         final String thispath = br._getURL().getPath();
         final String[] links = br.getRegex("(/[A-Za-z0-9]+_[A-Za-z0-9]+)\"").getColumn(0);
+        /*
+         * Folders can be offline but still contain the file information so let's determine the offline status here and use it later in case
+         * the files' information is still available.
+         */
+        final boolean isOffline = br.containsHTML(">\\s*Sorry, the files are no longer available");
         if (links == null || links.length == 0) {
-            throw new PluginException(LinkStatus.ERROR_PLUGIN_DEFECT);
+            if (isOffline) {
+                throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND);
+            } else {
+                throw new PluginException(LinkStatus.ERROR_PLUGIN_DEFECT);
+            }
         }
+        final FilePackage fp = FilePackage.getInstance();
+        fp.setName(folderID);
         final List<String> pathsWithoutDupes = new ArrayList<String>();
         for (final String path : links) {
             if (!path.equals(thispath) && !pathsWithoutDupes.contains(path)) {
@@ -127,7 +148,12 @@ public ArrayList<DownloadLink> decryptIt(final CryptedLink param, ProgressContro
                 final String filename = filenames[i];
                 direct.setName(Encoding.htmlDecode(filename).trim());
             }
-            direct.setAvailable(true);
+            if (isOffline) {
+                direct.setAvailable(false);
+            } else {
+                direct.setAvailable(true);
+            }
+            direct._setFilePackage(fp);
             ret.add(direct);
         }
         if (ret.isEmpty()) {