mirroring bot - 2025/07/31

Author: updating-bot

svn_trunk/src/jd/controlling/downloadcontroller/DownloadWatchDog.java

@@ -91,6 +91,8 @@
 import org.jdownloader.controlling.hosterrule.HosterRuleControllerListener;
 import org.jdownloader.gui.IconKey;
 import org.jdownloader.gui.translate._GUI;
+import org.jdownloader.gui.views.downloads.action.ResetSettings;
+import org.jdownloader.gui.views.downloads.action.ResetSettings.DeleteMode;
 import org.jdownloader.images.AbstractIcon;
 import org.jdownloader.logging.LogController;
 import org.jdownloader.plugins.ConditionalSkipReason;
@@ -1996,6 +1998,11 @@ public boolean isHighPriority() {
     }
 
     public void reset(final List<DownloadLink> resetLinks) {
+        final ResetSettings settings = new ResetSettings();
+        reset(resetLinks, settings);
+    }
+
+    public void reset(final List<DownloadLink> resetLinks, final ResetSettings settings) {
         if (resetLinks == null || resetLinks.size() == 0) {
             return;
         }
@@ -2007,10 +2014,10 @@ public void execute(DownloadSession currentSession) {
                     currentSession.getForcedLinks().removeAll(resetLinks);
                 }
                 for (final DownloadLink link : resetLinks) {
-                    SingleDownloadController con = link.getDownloadLinkController();
+                    final SingleDownloadController con = link.getDownloadLinkController();
                     if (con == null) {
                         /* link has no/no alive singleDownloadController, so reset it now */
-                        resetLink(link, currentSession);
+                        resetLink(link, currentSession, settings);
                     } else {
                         /* link has a running singleDownloadController, abort it and reset it after */
                         con.getJobsAfterDetach().add(new DownloadWatchDogJob() {
@@ -2021,7 +2028,7 @@ public void interrupt() {
                             @Override
                             public void execute(DownloadSession currentSession) {
                                 /* now we can reset the link */
-                                resetLink(link, currentSession);
+                                resetLink(link, currentSession, settings);
                             }
 
                             @Override
@@ -2089,7 +2096,7 @@ private List<PluginForHost> getPluginsFromHistory(DownloadLink link, DownloadLin
         return new ArrayList<PluginForHost>(plugins);
     }
 
-    private void resetLink(DownloadLink link, DownloadSession session) {
+    private void resetLink(DownloadLink link, DownloadSession session, ResetSettings settings) {
         if (link.getDownloadLinkController() != null) {
             throw new IllegalStateException("Link is in progress! cannot reset!");
         }
@@ -2100,7 +2107,12 @@ private void resetLink(DownloadLink link, DownloadSession session) {
                 container.invalidate();
             }
         }
-        deleteFile(link, DeleteOption.NULL);
+        final DeleteMode dm = settings.getDeleteMode();
+        if (dm == DeleteMode.MOVE_TO_TRASH) {
+            deleteFile(link, DeleteOption.RECYCLE);
+        } else {
+            deleteFile(link, DeleteOption.NULL);
+        }
         unSkipLink(link, session);
         final List<PluginForHost> plugins = getPluginsFromHistory(link, history);
         link.reset(plugins);

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

@@ -52,7 +52,7 @@
 import jd.plugins.components.PluginJSonUtils;
 import jd.plugins.hoster.DeviantArtCom;
 
-@DecrypterPlugin(revision = "$Revision: 51022 $", interfaceVersion = 3, names = {}, urls = {})
+@DecrypterPlugin(revision = "$Revision: 51286 $", interfaceVersion = 3, names = {}, urls = {})
 public class DeviantArtComCrawler extends PluginForDecrypt {
     public DeviantArtComCrawler(PluginWrapper wrapper) {
         super(wrapper);
@@ -334,7 +334,7 @@ private ArrayList<DownloadLink> crawlArt(final CryptedLink param, final Account
             /* Pass item to hosterplugin straight away. */
             return ret;
         }
-        hosterplugin.requestFileInformation(mainlink, account, false);
+        hosterplugin.requestFileInformation(mainlink, account);
         mainlink.setAvailable(true);
         if (!DeviantArtCom.isImage(mainlink)) {
             /* Item is not an image item -> No need to look for more image items. */

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

@@ -18,121 +18,32 @@
 import java.util.ArrayList;
 
 import jd.PluginWrapper;
-import jd.config.SubConfiguration;
 import jd.controlling.ProgressController;
-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.utils.JDUtilities;
 
-@DecrypterPlugin(revision = "$Revision: 49222 $", interfaceVersion = 2, names = { "sta.sh" }, urls = { "https?://(?:www\\.)?sta\\.sh/(zip/)?[a-z0-9]+" })
+@DecrypterPlugin(revision = "$Revision: 51281 $", interfaceVersion = 2, names = { "sta.sh" }, urls = { "https?://(?:www\\.)?sta\\.sh/(zip/)?[a-z0-9]+" })
 public class StaShDecrypter extends PluginForDecrypt {
     public StaShDecrypter(PluginWrapper wrapper) {
         super(wrapper);
     }
 
-    private final String  INVALIDLINKS           = "https?://(www\\.)?sta\\.sh/(muro|writer|login)";
-    private final String  TYPE_ZIP               = "https?://(www\\.)?sta\\.sh/zip/[a-z0-9]+";
-    private static String FORCEHTMLDOWNLOAD      = "FORCEHTMLDOWNLOAD";
-    private static String USE_LINKID_AS_FILENAME = "USE_LINKID_AS_FILENAME";
-    private static String DOWNLOAD_ZIP           = "DOWNLOAD_ZIP";
-
     public ArrayList<DownloadLink> decryptIt(CryptedLink param, ProgressController progress) throws Exception {
-        ArrayList<DownloadLink> decryptedLinks = new ArrayList<DownloadLink>();
-        final String parameter = param.toString();
-        if (parameter.matches(TYPE_ZIP)) {
-            final DownloadLink link = createDownloadlink(parameter);
-            link.setProperty("iszip", true);
-            link.setProperty("directlink", parameter);
-            decryptedLinks.add(link);
-            return decryptedLinks;
-        }
-        JDUtilities.getPluginForHost("sta.sh");
-        final SubConfiguration cfg = SubConfiguration.getConfig("sta.sh");
-        final boolean force_html_dl = cfg.getBooleanProperty(FORCEHTMLDOWNLOAD, false);
-        final boolean linkid_as_filename = cfg.getBooleanProperty(USE_LINKID_AS_FILENAME, false);
-        final String main_linkid = new Regex(parameter, "sta\\.sh/(.+)").getMatch(0);
-        final DownloadLink main = createDownloadlink(parameter);
-        if (parameter.matches(INVALIDLINKS)) {
-            decryptedLinks.add(this.createOfflinelink(parameter));
-            return decryptedLinks;
-        }
-        br.getPage(parameter);
-        if (this.br.getHttpConnection().getResponseCode() == 404) {
-            decryptedLinks.add(this.createOfflinelink(parameter));
-            return decryptedLinks;
-        }
-        final String linkid_general = new Regex(parameter, "([a-z0-9]+)$").getMatch(0);
-        String fpName = br.getRegex("name=\"og:title\" content=\"([^<>\"]*?)\"").getMatch(0);
-        if (fpName == null) {
-            /* Fallback */
-            fpName = linkid_general;
-        }
-        fpName = Encoding.htmlDecode(fpName.trim());
-        if (this.br.containsHTML("dev\\-metainfo\\-details\\-client\\-link")) {
-            /* We should have one or multiple pictures. */
-            final String[][] picdata = br.getRegex("class=\"thumb\" href=\"(https?://(www\\.)?sta\\.sh/[a-z0-9]+)\" title=\"([^<>\"]*?)\"").getMatches();
-            if (picdata == null || picdata.length == 0) {
-                decryptedLinks.add(main);
-                return decryptedLinks;
-            }
-            for (final String singleLinkData[] : picdata) {
-                final String url = singleLinkData[0];
-                final String linkid = new Regex(url, "sta\\.sh/(.+)").getMatch(0);
-                String name = Encoding.htmlDecode(singleLinkData[2]);
-                final DownloadLink dl = createDownloadlink(url);
-                /* Obey user setting */
-                if (linkid_as_filename) {
-                    name = linkid;
-                }
-                if (force_html_dl) {
-                    dl.setName(name + ".html");
-                    dl.setAvailable(true);
-                } else {
-                    dl.setName(name);
-                    dl.setAvailable(true);
-                }
-                decryptedLinks.add(dl);
-            }
-        } else {
-            /* These URLs will go back into the decrypter. */
-            final String[] URLs = this.br.getRegex("href=\"(https?://sta\\.sh/[a-z0-9]{10,})\"").getColumn(0);
-            for (final String url : URLs) {
-                if (url.contains(linkid_general)) {
-                    /* Fail-safe to prevent infinite loops! */
-                    continue;
-                } else {
-                    decryptedLinks.add(this.createDownloadlink(url));
-                }
-            }
+        final ArrayList<DownloadLink> ret = new ArrayList<DownloadLink>();
+        final String contenturl = param.getCryptedUrl().replaceFirst("(?i)http://", "https://");
+        br.getPage(contenturl);
+        if (br.getHttpConnection().getResponseCode() == 404) {
+            throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND);
         }
-        /* Download zip if it exists and user wants it. */
-        final String zipLink = br.getRegex("\"(/zip/[a-z0-9]+)\"").getMatch(0);
-        if (cfg.getBooleanProperty(DOWNLOAD_ZIP, false) && zipLink != null) {
-            final DownloadLink zip = createDownloadlink(parameter);
-            zip.setProperty("iszip", true);
-            zip.setProperty("directlink", zipLink);
-            String zip_filename;
-            if (linkid_as_filename) {
-                zip_filename = main_linkid;
-            } else {
-                zip_filename = fpName;
-            }
-            if (force_html_dl) {
-                zip.setName(zip_filename + ".html");
-            } else {
-                zip.setName(zip_filename + ".zip");
-            }
-            zip.setAvailable(true);
-            decryptedLinks.add(zip);
+        final String redirect = br.getRedirectLocation();
+        if (redirect == null) {
+            throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND);
         }
-        final FilePackage fp = FilePackage.getInstance();
-        fp.setName(fpName);
-        fp.addLinks(decryptedLinks);
-        return decryptedLinks;
+        ret.add(this.createDownloadlink(redirect));
+        return ret;
     }
 }

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

@@ -0,0 +1,123 @@
+//jDownloader - Downloadmanager
+//Copyright (C) 2009  JD-Team support@jdownloader.org
+//
+//This program is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+//
+//This program is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//GNU General Public License for more details.
+//
+//You should have received a copy of the GNU General Public License
+//along with this program.  If not, see <http://www.gnu.org/licenses/>.
+package jd.plugins.decrypter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.appwork.storage.TypeRef;
+
+import com.formdev.flatlaf.util.StringUtils;
+
+import jd.PluginWrapper;
+import jd.controlling.ProgressController;
+import jd.http.Browser;
+import jd.parser.Regex;
+import jd.plugins.Account;
+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: 51287 $", interfaceVersion = 3, names = {}, urls = {})
+public class ThreeCatCat extends PluginForDecrypt {
+    public ThreeCatCat(PluginWrapper wrapper) {
+        super(wrapper);
+    }
+
+    @Override
+    public Browser createNewBrowserInstance() {
+        final Browser br = super.createNewBrowserInstance();
+        br.setFollowRedirects(true);
+        return br;
+    }
+
+    public static List<String[]> getPluginDomains() {
+        final List<String[]> ret = new ArrayList<String[]>();
+        // each entry in List<String[]> will result in one PluginForDecrypt, Plugin.getHost() will return String[0]->main domain
+        ret.add(new String[] { "3cat.cat" });
+        return ret;
+    }
+
+    public static String[] getAnnotationNames() {
+        return buildAnnotationNames(getPluginDomains());
+    }
+
+    @Override
+    public String[] siteSupportedNames() {
+        return buildSupportedNames(getPluginDomains());
+    }
+
+    public static String[] getAnnotationUrls() {
+        return buildAnnotationUrls(getPluginDomains());
+    }
+
+    public static String[] buildAnnotationUrls(final List<String[]> pluginDomains) {
+        final List<String> ret = new ArrayList<String>();
+        for (final String[] domains : pluginDomains) {
+            ret.add("https?://(?:www\\.)?" + buildHostsPatternPart(domains) + "/.+/(audio|video)/(\\d+)/");
+        }
+        return ret.toArray(new String[0]);
+    }
+
+    public ArrayList<DownloadLink> decryptIt(final CryptedLink param, ProgressController progress) throws Exception {
+        final ArrayList<DownloadLink> ret = new ArrayList<DownloadLink>();
+        final String contenturl = param.getCryptedUrl();
+        final Regex urlinfo = new Regex(contenturl, this.getSupportedLinks());
+        final String mediaType = urlinfo.getMatch(0);
+        final String mediaID = urlinfo.getMatch(1);
+        br.getPage("https://dinamics.ccma.cat/pvideo/media.jsp?media=" + mediaType + "&version=0s&idint=" + mediaID);
+        if (br.getHttpConnection().getResponseCode() == 404) {
+            throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND);
+        }
+        final Map<String, Object> entries = restoreFromString(br.getRequest().getHtmlCode(), TypeRef.MAP);
+        final Map<String, Object> info = (Map<String, Object>) entries.get("informacio");
+        final Map<String, Object> images = (Map<String, Object>) entries.get("imatges");
+        final Map<String, Object> media = (Map<String, Object>) entries.get("media");
+        final String title = info.get("titol_complet").toString();
+        final String description = (String) info.get("descripcio");
+        /* Add thumbnail */
+        final String thumbnail = images.get("url").toString();
+        ret.add(this.createDownloadlink(DirectHTTP.createURLForThisPlugin(thumbnail)));
+        /* Add video qualities */
+        final List<Map<String, Object>> qualities = (List<Map<String, Object>>) media.get("url");
+        for (final Map<String, Object> quality : qualities) {
+            final String url = quality.get("file").toString();
+            ret.add(this.createDownloadlink(DirectHTTP.createURLForThisPlugin(url)));
+        }
+        final FilePackage fp = FilePackage.getInstance();
+        fp.setName(title);
+        if (!StringUtils.isEmpty(description)) {
+            fp.setComment(description);
+        }
+        fp.setPackageKey(this.getHost() + ":/" + mediaType + "/" + mediaID);
+        for (final DownloadLink result : ret) {
+            result._setFilePackage(fp);
+            result.setAvailable(true);
+        }
+        return ret;
+    }
+
+    @Override
+    public boolean hasCaptcha(CryptedLink link, Account acc) {
+        return false;
+    }
+}