JDownloader2/jdownloader
1
0
Fork 0
mirror of https://github.com/mirror/jdownloader.git synced 2024-11-27 05:50:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build>full

Browse Source 
added content-range 1-3/* support

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

Former-commit-id: 5a0d2e3da40cbe147ebc425cd3369fcb214d2257
This commit is contained in:
coalado 2016-06-15 16:06:14 +00:00
parent 02f1317622
commit 9948fb2d3f
3 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -61,8 +61,6 @@
<classpathentry kind="lib" path="ressourcen/libs/UPNP/seamless-util.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/UPNP/seamless-xml.jar"/>
<classpathentry kind="lib" path="/AppWorkUtils/libs/proxyVole.jar" sourcepath="/ProxyVole"/>
<classpathentry kind="lib" path="ressourcen/libs/htmlunit-core-js.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/js.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/laf/syntheticaAluOxide.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/laf/syntheticaBlueLight.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/laf/syntheticaClassy.jar"/>
@ -76,5 +74,7 @@
<classpathentry kind="lib" path="/AppWorkUtils/libs/svgSalamander.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/image4j.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/Filters.jar" sourcepath="ressourcen/code-ressourcen/Filter_src.zip"/>
<classpathentry kind="lib" path="ressourcen/libs/htmlunit-core-js.jar"/>
<classpathentry kind="lib" path="ressourcen/libs/js.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

72
src/jd/plugins/PluginForHost.java
View File

@ -45,34 +45,6 @@ import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.SwingConstants;
import jd.PluginWrapper;
import jd.captcha.JACMethod;
import jd.config.SubConfiguration;
import jd.controlling.accountchecker.AccountCheckerThread;
import jd.controlling.captcha.CaptchaSettings;
import jd.controlling.captcha.SkipException;
import jd.controlling.downloadcontroller.DiskSpaceManager.DISKSPACERESERVATIONRESULT;
import jd.controlling.downloadcontroller.DiskSpaceReservation;
import jd.controlling.downloadcontroller.DownloadWatchDog;
import jd.controlling.downloadcontroller.ExceptionRunnable;
import jd.controlling.downloadcontroller.SingleDownloadController;
import jd.controlling.downloadcontroller.SingleDownloadController.WaitingQueueItem;
import jd.controlling.downloadcontroller.SingleDownloadControllerThreadGroup;
import jd.controlling.linkchecker.LinkChecker;
import jd.controlling.linkcollector.LinkCollector;
import jd.controlling.linkcrawler.CheckableLink;
import jd.controlling.linkcrawler.CrawledLink;
import jd.controlling.linkcrawler.LinkCrawlerThread;
import jd.controlling.packagecontroller.AbstractNode;
import jd.http.Browser;
import jd.nutils.Formatter;
import jd.nutils.JDHash;
import jd.plugins.DownloadLink.AvailableStatus;
import jd.plugins.download.DownloadInterface;
import jd.plugins.download.DownloadInterfaceFactory;
import jd.plugins.download.DownloadLinkDownloadable;
import jd.plugins.download.Downloadable;
import org.appwork.exceptions.WTFException;
import org.appwork.storage.JSonStorage;
import org.appwork.storage.config.JsonConfig;
@ -153,6 +125,34 @@ import org.jdownloader.statistics.StatsManager;
import org.jdownloader.translate._JDT;
import org.jdownloader.updatev2.UpdateController;
import jd.PluginWrapper;
import jd.captcha.JACMethod;
import jd.config.SubConfiguration;
import jd.controlling.accountchecker.AccountCheckerThread;
import jd.controlling.captcha.CaptchaSettings;
import jd.controlling.captcha.SkipException;
import jd.controlling.downloadcontroller.DiskSpaceManager.DISKSPACERESERVATIONRESULT;
import jd.controlling.downloadcontroller.DiskSpaceReservation;
import jd.controlling.downloadcontroller.DownloadWatchDog;
import jd.controlling.downloadcontroller.ExceptionRunnable;
import jd.controlling.downloadcontroller.SingleDownloadController;
import jd.controlling.downloadcontroller.SingleDownloadController.WaitingQueueItem;
import jd.controlling.downloadcontroller.SingleDownloadControllerThreadGroup;
import jd.controlling.linkchecker.LinkChecker;
import jd.controlling.linkcollector.LinkCollector;
import jd.controlling.linkcrawler.CheckableLink;
import jd.controlling.linkcrawler.CrawledLink;
import jd.controlling.linkcrawler.LinkCrawlerThread;
import jd.controlling.packagecontroller.AbstractNode;
import jd.http.Browser;
import jd.nutils.Formatter;
import jd.nutils.JDHash;
import jd.plugins.DownloadLink.AvailableStatus;
import jd.plugins.download.DownloadInterface;
import jd.plugins.download.DownloadInterfaceFactory;
import jd.plugins.download.DownloadLinkDownloadable;
import jd.plugins.download.Downloadable;
/**
* Dies ist die Oberklasse fuer alle Plugins, die von einem Anbieter Dateien herunterladen koennen
*
@ -164,14 +164,13 @@ public abstract class PluginForHost extends Plugin {
private static final Pattern[] PATTERNS = new Pattern[] {
/**
* these patterns should split filename and fileextension (extension must include the
* point)
*/
// multipart rar archives
Pattern.compile("(.*)(\\.pa?r?t?\\.?[0-9]+.*?\\.rar$)", Pattern.CASE_INSENSITIVE),
// normal files with extension
Pattern.compile("(.*)(\\..*?$)", Pattern.CASE_INSENSITIVE) };
/**
* these patterns should split filename and fileextension (extension must include the point)
*/
// multipart rar archives
Pattern.compile("(.*)(\\.pa?r?t?\\.?[0-9]+.*?\\.rar$)", Pattern.CASE_INSENSITIVE),
// normal files with extension
Pattern.compile("(.*)(\\..*?$)", Pattern.CASE_INSENSITIVE) };
private LazyHostPlugin lazyP = null;
/**
@ -463,6 +462,7 @@ public abstract class PluginForHost extends Plugin {
}
@Override
@Deprecated
public SubConfiguration getPluginConfig() {
return SubConfiguration.getConfig(lazyP.getHost());
}

1
src/org/jdownloader/captcha/v2/challenge/recaptcha/v2/phantomjs/Recaptcha2FallbackChallengeViaPhantomJS.java
View File

@ -124,6 +124,7 @@ public final class Recaptcha2FallbackChallengeViaPhantomJS extends AbstractRecap
if (this.logger == null) {
this.logger = LOGGER;
}
this.load();
}