mirroring bot - 2024/10/26

Author: updating-bot

svn_trunk/src/jd/plugins/AccountInfo.java

@@ -180,12 +180,8 @@ public boolean isExpired() {
         return expired;
     }
 
-    public void setAccountBalance(final long parseInt) {
-        this.account_accountBalance = Math.max(0, parseInt);
-    }
-
-    public void setAccountBalance(final String string) {
-        this.setAccountBalance((long) (Double.parseDouble(string) * 100));
+    public void setAccountBalance(final long num) {
+        this.account_accountBalance = Math.max(0, num);
     }
 
     public void setExpired(final boolean b) {

svn_trunk/src/jd/plugins/MultiHostHostData.java

@@ -45,19 +45,19 @@ public void setDomains(List<String> domains) {
         this.domains = domains;
     }
 
-    public Boolean getIsUnlimitedTraffic() {
+    public Boolean isUnlimitedTraffic() {
         return isUnlimitedTraffic;
     }
 
-    public void setIsUnlimitedTraffic(Boolean isUnlimitedTraffic) {
+    public void setUnlimitedTraffic(Boolean isUnlimitedTraffic) {
         this.isUnlimitedTraffic = isUnlimitedTraffic;
     }
 
-    public Boolean getIsUnlimitedLinks() {
+    public Boolean isUnlimitedLinks() {
         return isUnlimitedLinks;
     }
 
-    public void setIsUnlimitedLinks(Boolean isUnlimitedLinks) {
+    public void setUnlimitedLinks(Boolean isUnlimitedLinks) {
         this.isUnlimitedLinks = isUnlimitedLinks;
     }
 
@@ -157,12 +157,20 @@ public void setUnavailableUntilTimestamp(long unavailableUntilTimestamp) {
         this.unavailableUntilTimestamp = unavailableUntilTimestamp;
     }
 
+    public static List<MultiHostHostData> createFromMultiHostHostList(final List<MultiHostHost> sourcelist) {
+        final List<MultiHostHostData> ret = new ArrayList<MultiHostHostData>();
+        for (final MultiHostHost mhost : sourcelist) {
+            ret.add(createFromMultiHostHost(mhost));
+        }
+        return ret;
+    }
+
     public static MultiHostHostData createFromMultiHostHost(MultiHostHost source) {
         MultiHostHostData hostData = new MultiHostHostData();
         hostData.setName(source.getName());
         hostData.setDomains(source.getDomains());
-        hostData.setIsUnlimitedTraffic(source.isUnlimitedTraffic());
-        hostData.setIsUnlimitedLinks(source.isUnlimitedLinks());
+        hostData.setUnlimitedTraffic(source.isUnlimitedTraffic());
+        hostData.setUnlimitedLinks(source.isUnlimitedLinks());
         hostData.setLinksLeft(source.getLinksLeft());
         hostData.setLinksMax(source.getLinksMax());
         hostData.setTrafficLeft(source.getTrafficLeft());
@@ -187,8 +195,8 @@ public MultiHostHost toMultiHostHost() {
         host.setLinksMax(this.getLinksMax());
         host.setTrafficLeft(this.getTrafficLeft());
         host.setTrafficMax(this.getTrafficMax());
-        host.setUnlimitedTraffic(this.getIsUnlimitedTraffic());
-        host.setUnlimitedLinks(this.getIsUnlimitedLinks());
+        host.setUnlimitedTraffic(this.isUnlimitedTraffic());
+        host.setUnlimitedLinks(this.isUnlimitedLinks());
         host.setTrafficCalculationFactorPercent(this.getTrafficCalculationFactorPercent());
         host.setMaxChunks(this.getMaxChunks());
         host.setMaxDownloads(this.getMaxDownloads());

svn_trunk/src/jd/plugins/PluginForHost.java

@@ -153,6 +153,9 @@
 import org.jdownloader.plugins.SleepPluginProgress;
 import org.jdownloader.plugins.UserIOProgress;
 import org.jdownloader.plugins.WaitForAccountTrafficSkipReason;
+import org.jdownloader.plugins.WaitForAccountTrafficSkipReasonMultihostLinksRequired;
+import org.jdownloader.plugins.WaitForAccountTrafficSkipReasonMultihostTrafficRequired;
+import org.jdownloader.plugins.WaitingSkipReasonMultihostHostUnavailable;
 import org.jdownloader.plugins.accounts.AccountBuilderInterface;
 import org.jdownloader.plugins.config.AccountConfigInterface;
 import org.jdownloader.plugins.config.AccountJsonConfig;
@@ -1174,31 +1177,41 @@ public boolean enoughTrafficFor(final DownloadLink link, final Account account)
                 return false;
             }
             final MultihosterHostStatus status = mhost.getStatus();
-            if (status != MultihosterHostStatus.WORKING && status != MultihosterHostStatus.WORKING_UNSTABLE) {
-                /* Download of that host is currently not possible. */
+            if (mhost.getUnavailableTimeMillis() > 0) {
+                throw new ConditionalSkipReasonException(new WaitingSkipReasonMultihostHostUnavailable(account, link.getHost(), mhost.getUnavailableStatusText(), mhost.getUnavailableUntilTimestamp()));
+            } else if (status != MultihosterHostStatus.WORKING && status != MultihosterHostStatus.WORKING_UNSTABLE) {
+                /* Download of that host is permanently not possible. */
                 return false;
             } else if (!mhost.isUnlimitedLinks() && mhost.getLinksLeft() <= 0) {
                 /* Max limits link is reached -> Cannot download */
-                return false;
+                if (ai.isTrafficRefill()) {
+                    throw new ConditionalSkipReasonException(new WaitForAccountTrafficSkipReasonMultihostLinksRequired(account, link.getHost(), mhost.getLinksMax()));
+                } else {
+                    return false;
+                }
             }
             if (!mhost.isUnlimitedTraffic()) {
                 /* Traffic limit exists -> Check if enough traffic is left. */
                 final long host_TrafficLeft = Math.max(0, mhost.getTrafficLeft());
                 /* In some cases, individual hosts can have different traffic calculation values than 100%. */
                 trafficNeeded = (trafficNeeded * mhost.getTrafficCalculationFactorPercent()) / 100;
-                if (host_TrafficLeft < trafficNeeded) {
+                if (trafficNeeded > host_TrafficLeft) {
                     /* Not enough individual file host traffic */
-                    // TODO: Implement ConditionalSkipReasonException handling
-                    return false;
+                    if (ai.isTrafficRefill()) {
+                        final long howMuchTrafficIsMissing = trafficNeeded - host_TrafficLeft;
+                        throw new ConditionalSkipReasonException(new WaitForAccountTrafficSkipReasonMultihostTrafficRequired(account, link.getHost(), howMuchTrafficIsMissing));
+                    } else {
+                        return false;
+                    }
                 }
             }
         }
         if (!ai.isUnlimitedTraffic() && !ai.isSpecialTraffic()) {
             /* Check if enough traffic is left */
-            if (trafficLeft < trafficNeeded) {
+            if (trafficNeeded > trafficLeft) {
                 if (ai.isTrafficRefill()) {
-                    final long howMuchTrafficWeNeed = trafficNeeded - trafficLeft;
-                    throw new ConditionalSkipReasonException(new WaitForAccountTrafficSkipReason(account, howMuchTrafficWeNeed));
+                    final long howMuchTrafficIsMissing = trafficNeeded - trafficLeft;
+                    throw new ConditionalSkipReasonException(new WaitForAccountTrafficSkipReason(account, howMuchTrafficIsMissing));
                 } else {
                     return false;
                 }

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

@@ -21,6 +21,7 @@
 
 import jd.PluginWrapper;
 import jd.controlling.ProgressController;
+import jd.http.Browser;
 import jd.http.Request;
 import jd.nutils.encoding.Encoding;
 import jd.parser.Regex;
@@ -34,18 +35,30 @@
 import jd.plugins.PluginForDecrypt;
 import jd.plugins.PluginForHost;
 
-@DecrypterPlugin(revision = "$Revision: 48599 $", interfaceVersion = 3, names = { "files.fm" }, urls = { "https?://(?:\\w+\\.)?files\\.fm/u/[a-z0-9]+" })
+@DecrypterPlugin(revision = "$Revision: 50034 $", interfaceVersion = 3, names = { "files.fm" }, urls = { "https?://(?:\\w+\\.)?files\\.fm/u/[a-z0-9]+" })
 public class FilesFmFolder extends PluginForDecrypt {
     public FilesFmFolder(PluginWrapper wrapper) {
         super(wrapper);
     }
 
+    @Override
+    public Browser createNewBrowserInstance() {
+        final Browser br = super.createNewBrowserInstance();
+        prepBR(br);
+        return br;
+    }
+
+    public static void prepBR(final Browser br) {
+        br.setFollowRedirects(true);
+        /* Their html responses can be pretty big. */
+        br.setLoadLimit(br.getLoadLimit() * 10);
+    }
+
     public ArrayList<DownloadLink> decryptIt(final CryptedLink param, ProgressController progress) throws Exception {
         final ArrayList<DownloadLink> ret = new ArrayList<DownloadLink>();
         final PluginForHost hostplg = this.getNewPluginForHostInstance(this.getHost());
         /* 2016-03-10: They enforce https */
         final String folderID = new Regex(param.getCryptedUrl(), "([a-z0-9]+)$").getMatch(0);
-        br.setFollowRedirects(true);
         br.getPage("https://files.fm/u/" + folderID + "?view=gallery&items_only=true&index=0&count=10000");
         if (br.getHttpConnection().getResponseCode() == 404 || br.containsHTML(">This link does not contain any files|These files are deleted by the owner<|The expiry date of these files is over<|class=\"deleted_wrapper\"")) {
             throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND);

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

@@ -37,8 +37,10 @@
 import jd.plugins.Plugin;
 import jd.plugins.PluginException;
 import jd.plugins.PluginForDecrypt;
+import jd.plugins.PluginForHost;
+import jd.plugins.hoster.DirectHTTP;
 
-@DecrypterPlugin(revision = "$Revision: 50028 $", interfaceVersion = 3, names = { "luscious.net" }, urls = { "https?://(?:(?:www|members)\\.)?luscious\\.net/albums/([a-z0-9\\-_]+)_(\\d+)/?" })
+@DecrypterPlugin(revision = "$Revision: 50034 $", interfaceVersion = 3, names = { "luscious.net" }, urls = { "https?://(?:(?:www|members)\\.)?luscious\\.net/albums/([a-z0-9\\-_]+)_(\\d+)/?" })
 public class LusciousNetAlbum extends PluginForDecrypt {
     public LusciousNetAlbum(PluginWrapper wrapper) {
         super(wrapper);
@@ -116,23 +118,63 @@ public ArrayList<DownloadLink> decryptIt(final CryptedLink param, ProgressContro
             if (br.getHttpConnection().getResponseCode() == 404) {
                 throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND);
             }
+            final String title = albumSlug.replace("-", " ");
+            String[] thumbnails = br.getRegex("src=\"(https?://[^\"]+)\" class=\"\" loading=\"lazy\"").getColumn(0);
+            if (thumbnails == null || thumbnails.length == 0) {
+                thumbnails = br.getRegex("alt=\"\\d+\" src=\"(https?://[^\"]+)\"").getColumn(0);
+            }
+            final FilePackage fpFullsize = FilePackage.getInstance();
+            fpFullsize.setName(title);
+            final FilePackage fpThumbnails = FilePackage.getInstance();
+            fpThumbnails.setName(title + " - thumbnails");
+            for (final String urlThumbnail : thumbnails) {
+                /* Change thumbnail URL to a full size URL */
+                final String fullsizeUrl = urlThumbnail.replaceFirst("\\.315x0\\.jpg$", ".640x0.jpg");
+                /* This link may not always be available thus we will also add the original thumbnail link later. */
+                final DownloadLink directFullsize = this.createDownloadlink(DirectHTTP.createURLForThisPlugin(urlThumbnail));
+                /* We know that this link is online. */
+                directFullsize.setAvailable(true);
+                directFullsize._setFilePackage(fpFullsize);
+                ret.add(directFullsize);
+                if (fullsizeUrl.equals(urlThumbnail)) {
+                    /* Both links are the same -> No reason to add thumbnail separately. */
+                    continue;
+                }
+                final DownloadLink directThumbnail = this.createDownloadlink(DirectHTTP.createURLForThisPlugin(urlThumbnail));
+                /* We know that this link is online. */
+                directThumbnail.setAvailable(true);
+                directThumbnail._setFilePackage(fpThumbnails);
+                ret.add(directThumbnail);
+            }
             final String redirectURL = br.getRegex("\"(/download/r/\\d+/\\d+/?)\"").getMatch(0);
-            if (redirectURL == null) {
-                throw new PluginException(LinkStatus.ERROR_PLUGIN_DEFECT);
+            if (redirectURL != null) {
+                final Browser brc = br.cloneBrowser();
+                brc.setFollowRedirects(false);
+                brc.getPage(redirectURL);
+                /* Typically redirects to external file hoster 9cloud.us. */
+                final String redirect = brc.getRedirectLocation();
+                if (redirect == null) {
+                    throw new PluginException(LinkStatus.ERROR_PLUGIN_DEFECT);
+                }
+                final PluginForHost plg = this.getNewPluginForHostInstance("9cloud.us");
+                final DownloadLink link = this.createDownloadlink(redirect);
+                if (plg.canHandle(redirect)) {
+                    link.setHost(plg.getHost());
+                    link.setDefaultPlugin(plg);
+                    /**
+                     * For 9cloud.us we cannot find any filenames as long as any free download limit is reached which is often the case.
+                     * </br>
+                     * To counter that, we'll just set a filename here including the available status as we know that that file is online.
+                     */
+                    link.setName(title + ".zip");
+                    link.setAvailable(true);
+                }
+                link._setFilePackage(fpFullsize);
+                ret.add(link);
             }
-            final Browser brc = br.cloneBrowser();
-            brc.setFollowRedirects(false);
-            brc.getPage(redirectURL);
-            /* Typically redirects to external file hoster 9cloud.us. */
-            final String redirect = brc.getRedirectLocation();
-            if (redirect == null) {
+            if (ret.isEmpty()) {
                 throw new PluginException(LinkStatus.ERROR_PLUGIN_DEFECT);
             }
-            final DownloadLink link = this.createDownloadlink(redirect);
-            /* Set temporary filename */
-            link.setName(albumSlug + ".zip");
-            // link.setAvailable(true);
-            ret.add(link);
         }
         return ret;
     }

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

@@ -38,7 +38,7 @@
 import jd.plugins.hoster.MegaDpUa;
 import jd.plugins.hoster.YoutubeDashV2;
 
-@DecrypterPlugin(revision = "$Revision: 47516 $", interfaceVersion = 3, names = {}, urls = {})
+@DecrypterPlugin(revision = "$Revision: 50033 $", interfaceVersion = 3, names = {}, urls = {})
 @PluginDependencies(dependencies = { MegaDpUa.class })
 public class MegaDpUaFolder extends PluginForDecrypt {
     public MegaDpUaFolder(PluginWrapper wrapper) {
@@ -78,7 +78,7 @@ public static String[] buildAnnotationUrls(final List<String[]> pluginDomains) {
     public ArrayList<DownloadLink> decryptIt(final CryptedLink param, ProgressController progress) throws Exception {
         final ArrayList<DownloadLink> ret = new ArrayList<DownloadLink>();
         final Regex video = new Regex(param.getCryptedUrl(), TYPE_VIDEO);
-        if (video.matches()) {
+        if (video.patternFind()) {
             final String videoID = video.getMatch(0);
             ret.add(this.createDownloadlink(YoutubeDashV2.generateContentURL(videoID)));
         } else {

svn_trunk/src/jd/plugins/hoster/File4GoCom.java

@@ -38,7 +38,7 @@
 import jd.plugins.LinkStatus;
 import jd.plugins.PluginException;
 
-@HostPlugin(revision = "$Revision: 50028 $", interfaceVersion = 3, names = { "file4go.net" }, urls = { "https?://(?:www\\.)?file4go\\.(?:net|com)/[^/]+/([a-zA-Z0-9_=]+)" })
+@HostPlugin(revision = "$Revision: 50033 $", interfaceVersion = 3, names = { "file4go.net" }, urls = { "https?://(?:www\\.)?file4go\\.(?:net|com)/[^/]+/([a-zA-Z0-9_=]+)" })
 public class File4GoCom extends antiDDoSForHost {
     public File4GoCom(PluginWrapper wrapper) {
         super(wrapper);
@@ -88,6 +88,7 @@ public AvailableStatus requestFileInformation(final DownloadLink link) throws Ex
             }
             /* Fix file extension */
             weakFilename = weakFilename.replaceFirst("-mp4$", ".mp4");
+            weakFilename = this.correctOrApplyFileNameExtension(weakFilename, ".mp4", null);
             link.setName(weakFilename);
         }
         br.setCookie(getHost(), "animesonline", "1");
@@ -107,9 +108,9 @@ public AvailableStatus requestFileInformation(final DownloadLink link) throws Ex
         if (filename == null) {
             filename = br.getRegex("<div id=\"titulo_a\">\\s*(.*?)\\s*</div>").getMatch(0);
         }
-        String filesize = br.getRegex("(?i)>\\s*Tamanho\\s*:\\s*</b>\\s*(.*?)\\s*</span>").getMatch(0);
+        String filesize = br.getRegex(">\\s*Tamanho\\s*:\\s*</b>\\s*(.*?)\\s*</span>").getMatch(0);
         if (filesize == null) {
-            filesize = br.getRegex("(?i)<b>File size\\s*:\\s*</b>\\s*([^<>\"]+)\\s*</").getMatch(0);
+            filesize = br.getRegex("<b>File size\\s*:\\s*</b>\\s*([^<>\"]+)\\s*</").getMatch(0);
         }
         if (filename == null) {
             throw new PluginException(LinkStatus.ERROR_PLUGIN_DEFECT);
@@ -143,7 +144,7 @@ public void handleFree(final DownloadLink link) throws Exception, PluginExceptio
                 throw new PluginException(LinkStatus.ERROR_PLUGIN_DEFECT);
             }
             submitForm(form);
-            if (br.containsHTML("(?i)REMOVED DMCA\\!")) {
+            if (br.containsHTML("REMOVED DMCA\\!")) {
                 /* 2023-01-24 */
                 throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND);
             }
@@ -267,7 +268,7 @@ public AccountInfo fetchAccountInfo(final Account account) throws Exception {
         final AccountInfo ai = new AccountInfo();
         login(account, true);
         ai.setUnlimitedTraffic();
-        final String expire = br.getRegex("(?i)>\\s*Premium Stop: (\\d{4}/\\d{2}/\\d{2} \\d{2}:\\d{2}:\\d{2}) </b>").getMatch(0);
+        final String expire = br.getRegex(">\\s*Premium Stop: (\\d{4}/\\d{2}/\\d{2} \\d{2}:\\d{2}:\\d{2}) </b>").getMatch(0);
         if (expire == null) {
             final String lang = System.getProperty("user.language");
             if ("de".equalsIgnoreCase(lang)) {
@@ -302,9 +303,9 @@ public void handlePremium(final DownloadLink link, final Account account) throws
     }
 
     private String getDllink(final Browser br) {
-        String dllink = br.getRegex("(?i)href=\"(https?://[^\"]+)\">\\s*Download").getMatch(0);
+        String dllink = br.getRegex("href=\"(https?://[^\"]+)\">\\s*Download").getMatch(0);
         if (dllink == null) {
-            dllink = br.getRegex("(?i)class\\s*=\\s*\"novobotao download\"[^>]*href\\s*=\\s*\"([^\"]+)\">").getMatch(0);
+            dllink = br.getRegex("class\\s*=\\s*\"novobotao download\"[^>]*href\\s*=\\s*\"([^\"]+)\">").getMatch(0);
         }
         return dllink;
     }