JDownloader2/jdownloader
1
0
Fork 0
mirror of https://github.com/mirror/jdownloader.git synced 2025-03-03 18:10:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Greeny 2009-06-15 09:50:33 +00:00
parent 781e8cd9f7
commit 90782ef2c6
7 changed files with 91 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
build/build.xml
View File

@ -145,17 +145,10 @@
<attribute name="Created-By" value="JD-Team" />
</manifest>
<mkdir dir="${dist}/pluginressourcen/128__JDTray/plugins" />
<jar jarfile="${dist}/pluginressourcen/128__JDTray/plugins/JDTray.jar" manifest="Manifest.MF">
<mkdir dir="${dist}/pluginressourcen/100__JDChat/plugins" />
<jar jarfile="${dist}/pluginressourcen/100__JDChat/plugins/JDChat.jar" manifest="Manifest.MF">
<fileset dir="${cls}">
<include name="jd/plugins/optional/jdtrayicon/**" />
</fileset>
</jar>
<mkdir dir="${dist}/pluginressourcen/105__JDScheduler/plugins" />
<jar jarfile="${dist}/pluginressourcen/105__JDScheduler/plugins/schedule.jar" manifest="Manifest.MF">
<fileset dir="${cls}">
<include name="jd/plugins/optional/schedule/**" />
<include name="jd/plugins/optional/jdchat/**" />
</fileset>
</jar>
@ -166,13 +159,6 @@
</fileset>
</jar>
<mkdir dir="${dist}/pluginressourcen/100__JDChat/plugins" />
<jar jarfile="${dist}/pluginressourcen/100__JDChat/plugins/JDChat.jar" manifest="Manifest.MF">
<fileset dir="${cls}">
<include name="jd/plugins/optional/jdchat/**" />
</fileset>
</jar>
<mkdir dir="${dist}/pluginressourcen/104__JDRemoteControl/plugins" />
<jar jarfile="${dist}/pluginressourcen/104__JDRemoteControl/plugins/JDRemoteControl.jar" manifest="Manifest.MF">
<fileset dir="${cls}">
@ -180,6 +166,20 @@
</fileset>
</jar>
<mkdir dir="${dist}/pluginressourcen/105__JDScheduler/plugins" />
<jar jarfile="${dist}/pluginressourcen/105__JDScheduler/plugins/schedule.jar" manifest="Manifest.MF">
<fileset dir="${cls}">
<include name="jd/plugins/optional/schedule/**" />
</fileset>
</jar>
<mkdir dir="${dist}/pluginressourcen/106__JDShutdown/plugins" />
<jar jarfile="${dist}/pluginressourcen/106__JDShutdown/plugins/JDShutdown.jar" manifest="Manifest.MF">
<fileset dir="${cls}">
<include name="jd/plugins/optional/JDShutdown*" />
</fileset>
</jar>
<mkdir dir="${dist}/pluginressourcen/117__JDHttpLiveScripter/plugins" />
<jar jarfile="${dist}/pluginressourcen/117__JDHttpLiveScripter/plugins/JDHTTPLiveHeaderScripter.jar" manifest="Manifest.MF">
<fileset dir="${cls}">
@ -201,17 +201,10 @@
</fileset>
</jar>
<mkdir dir="${dist}/pluginressourcen/123__JDUnrar/plugins" />
<jar jarfile="${dist}/pluginressourcen/123__JDUnrar/plugins/JDUnrar.jar" manifest="Manifest.MF">
<mkdir dir="${dist}/pluginressourcen/121__JDWatchFolder/plugins" />
<jar jarfile="${dist}/pluginressourcen/121__JDWatchFolder/plugins/JDFolderWatch.jar" manifest="Manifest.MF">
<fileset dir="${cls}">
<include name="jd/plugins/optional/jdunrar/**" />
</fileset>
</jar>
<mkdir dir="${dist}/pluginressourcen/127__JDHJMerge/plugins" />
<jar jarfile="${dist}/pluginressourcen/127__JDHJMerge/plugins/JDHJMerge.jar" manifest="Manifest.MF">
<fileset dir="${cls}">
<include name="jd/plugins/optional/hjsplit/**" />
<include name="jd/plugins/optional/JDFolderWatch*" />
</fileset>
</jar>
@ -222,17 +215,10 @@
</fileset>
</jar>
<mkdir dir="${dist}/pluginressourcen/121__JDWatchFolder/plugins" />
<jar jarfile="${dist}/pluginressourcen/121__JDWatchFolder/plugins/JDFolderWatch.jar" manifest="Manifest.MF">
<mkdir dir="${dist}/pluginressourcen/123__JDUnrar/plugins" />
<jar jarfile="${dist}/pluginressourcen/123__JDUnrar/plugins/JDUnrar.jar" manifest="Manifest.MF">
<fileset dir="${cls}">
<include name="jd/plugins/optional/JDFolderWatch*" />
</fileset>
</jar>
<mkdir dir="${dist}/pluginressourcen/106__JDShutdown/plugins" />
<jar jarfile="${dist}/pluginressourcen/106__JDShutdown/plugins/JDShutdown.jar" manifest="Manifest.MF">
<fileset dir="${cls}">
<include name="jd/plugins/optional/JDShutdown*" />
<include name="jd/plugins/optional/jdunrar/**" />
</fileset>
</jar>
@ -242,6 +228,21 @@
<include name="jd/plugins/optional/JDPremiumCollector*" />
</fileset>
</jar>
<mkdir dir="${dist}/pluginressourcen/127__JDHJMerge/plugins" />
<jar jarfile="${dist}/pluginressourcen/127__JDHJMerge/plugins/JDHJMerge.jar" manifest="Manifest.MF">
<fileset dir="${cls}">
<include name="jd/plugins/optional/hjsplit/**" />
</fileset>
</jar>
<mkdir dir="${dist}/pluginressourcen/128__JDTray/plugins" />
<jar jarfile="${dist}/pluginressourcen/128__JDTray/plugins/JDTray.jar" manifest="Manifest.MF">
<fileset dir="${cls}">
<include name="jd/plugins/optional/jdtrayicon/**" />
</fileset>
</jar>
</target>
<target name="sign">
@ -273,12 +274,17 @@
<delete file="${dist}/JDownloader.jar" failonerror="no" />
<move file="${dist}/JDownloader_obfuscated.jar" tofile="${dist}/JDownloader.jar" />
</target>
<target name="standardBuild" depends="compile,jar,jarOptionals,jarWebupdater,jarHostService">
</target>
<target name="hostservice" depends="compile,jar,jarHostService">
</target>
<target name="dlcEnabledBuild" depends="standardBuild,cryptContainer,sign">
</target>
<target name="signedBuild" depends="standardBuild,sign">
</target>
</project>

BIN
ressourcen/pluginressourcen/107__JDTrayIcon/plugins/JDTrayIcon.jar
View File

Binary file not shown.

BIN
ressourcen/pluginressourcen/108__JDTrayLight/plugins/JDLightTray.jar
View File

Binary file not shown.

BIN
ressourcen/pluginressourcen/118__JDLowSpeed/plugins/JDLowSpeed.jar
View File

Binary file not shown.

21
src/jd/JDInit.java
View File

@ -335,8 +335,6 @@ public class JDInit {
new DecryptPluginWrapper("redirect.musicalmente.info", "MusicalmenteInfo", "http://[\\w\\.]*?redirect\\.musicalmente\\.info/.+");
new DecryptPluginWrapper("music-base.ws", "MusicBaseWs", "http://[\\w\\.]*?music-base\\.ws/dl\\.php.*?c=[\\w]+");
new DecryptPluginWrapper("myref.de", "MyRef", "http://[\\w\\.]*?myref\\.de(/){0,1}\\?\\d{0,10}");
// new DecryptPluginWrapper("myspace.com", "MySpaceCom",
// "http://[\\w\\.]*?myspace\\.(com|de)/.+");
new DecryptPluginWrapper("myup.cc", "Myupcc", "http://[\\w\\.]*?myup\\.cc/link-[\\w]+\\.html");
new DecryptPluginWrapper("myvideo.de", "MyvideoDe", "http://[\\w\\.]*?myvideo\\.de/watch/[0-9]+/");
new DecryptPluginWrapper("netfolder.in", "NetfolderIn", "http://[\\w\\.]*?netfolder\\.in/folder\\.php\\?folder_id\\=[\\w]{7}|http://[\\w\\.]*?netfolder\\.in/[\\w]{7}/.*?");
@ -456,7 +454,6 @@ public class JDInit {
// Decrypter from Extern
new DecryptPluginWrapper("rapidlibrary.com", "RapidLibrary", "http://rapidlibrary\\.com/download_file_i\\.php\\?.+");
}
public void loadPluginForHost() {
@ -489,6 +486,11 @@ public class JDInit {
new HostPluginWrapper("Uploader.pl", "UploaderPl", "http://[\\w\\.]*?uploader\\.pl/\\?d=[A-F0-9]+", PluginWrapper.LOAD_ON_INIT);
new HostPluginWrapper("CZShare.com", "CZShareCom", "http://[\\w\\.]*?czshare\\.com/(files/\\d+/[\\w_]+|\\d+/[\\w_]+/[^\\s]+|download_file\\.php\\?id=\\d+&file=[^\\s]+)", PluginWrapper.LOAD_ON_INIT);
new HostPluginWrapper("4FreeLoad.net", "FourFreeLoadNet", "http://[\\w\\.]*?4freeload\\.net/download\\.php\\?id=[A-Fa-f0-9]+", PluginWrapper.LOAD_ON_INIT);
new HostPluginWrapper("HotFile.com", "HotFileCom", "http://[\\w\\.]*?hotfile\\.com/dl/\\d+/[0-9a-zA-Z]+/", PluginWrapper.LOAD_ON_INIT);
new HostPluginWrapper("Data.hu", "DataHu", "http://[\\w\\.]*?data.hu/get/.+/.+", PluginWrapper.LOAD_ON_INIT);
new HostPluginWrapper("OdSiebie.com", "Odsiebiecom", "http://[\\w\\.]*?odsiebie\\.com/(pokaz|pobierz)/\\d+---[\\w]+", PluginWrapper.LOAD_ON_INIT);
new HostPluginWrapper("Uploading.com", "UploadingCom", "http://[\\w\\.]*?uploading\\.com/files/\\w+/.+", PluginWrapper.LOAD_ON_INIT);
new HostPluginWrapper("SendSpace.com", "SendspaceCom", "http://[\\w\\.]*?sendspace\\.com/file/[0-9a-zA-Z]+", PluginWrapper.LOAD_ON_INIT);
// Free Hoster
new HostPluginWrapper("FreakShare.net", "Freaksharenet", "http://[\\w\\.]*?freakshare\\.net/file(s/|/)[\\w]+/(.*)");
@ -497,24 +499,18 @@ public class JDInit {
new HostPluginWrapper("AxiFile.com", "AxiFileCom", "http://[\\w\\.]*?axifile\\.com/\\?\\d+");
new HostPluginWrapper("CShare.de", "SwoopshareCom", "http://[\\w\\.]*?cshare.de/file/.*");
new HostPluginWrapper("ClipFish.de", "ClipfishDe", "http://[\\w\\.]*?pg\\d+\\.clipfish\\.de/media/.+?\\.flv");
new HostPluginWrapper("Data.hu", "DataHu", "http://[\\w\\.]*?data.hu/get/.+/.+", PluginWrapper.LOAD_ON_INIT);
new HostPluginWrapper("DataUp.de", "Dataupde", "http://[\\w\\.]*?dataup\\.de/\\d+/(.*)");
new HostPluginWrapper("Dump.ru", "DumpRu", "http://[\\w\\.]*?dump\\.ru/file/[0-9]+");
new HostPluginWrapper("4Shared.com", "FourSharedCom", "http://[\\w\\.]*?4shared.com/file/\\d+?/.*");
new HostPluginWrapper("FastShare.org", "FastShareorg", "http://[\\w\\.]*?fastshare\\.org/download/(.*)");
new HostPluginWrapper("FileBase.To", "FileBaseTo", "http://[\\w\\.]*?filebase\\.to/files/\\d{1,}/.*");
// new HostPluginWrapper("FileMojo.Com", "FileMojoCom",
// "http://[\\w\\.]*?filemojo\\.com/(\\d+(/.+)?|l\\.php\\?flink=\\d+)");
new HostPluginWrapper("Files.To", "FilesTo", "http://[\\w\\.]*?files\\.to/get/[0-9]+/[\\w]+");
new HostPluginWrapper("File-Upload.net", "FileUploadnet", "((http://[\\w\\.]*?file-upload\\.net/(member/){0,1}download-\\d+/(.*?).html)|(http://[\\w\\.]*?file-upload\\.net/(view-\\d+/(.*?).html|member/view_\\d+_(.*?).html))|(http://[\\w\\.]*?file-upload\\.net/member/data3\\.php\\?user=(.*?)&name=(.*)))");
new HostPluginWrapper("GoogleGroups.com", "GoogleGroups", "http://[\\w\\.]*?googlegroups.com/web/.*");
new HostPluginWrapper("HTTP Links", "HTTPAllgemein", "https?viajd://[\\d\\w\\.:\\-@]*/.*\\.(jdu|otrkey|ac3|3gp|7zip|7z|aiff|aif|aifc|au|avi|bin|bz2|ccf|cue|divx|dlc|doc|docx|dot|exe|flv|gif|gz|iso|java|jpg|jpeg|mkv|mp2|mp3|mp4|mov|movie|mpe|mpeg|mpg|msi|msu|nfo|png|pdf|ppt|pptx|pps|ppz|pot|qt|rar|r\\d+|\\d+|rsdf|rtf|snd|sfv|tar|tif|tiff|viv|vivo|wav|wmv|xla|xls|zip|ts)");
new HostPluginWrapper("ImageFap.com", "ImageFap", "http://[\\w\\.]*?imagefap.com/image.php\\?id=.*(&pgid=.*&gid=.*&page=.*)?");
new HostPluginWrapper("MediaFire.Com", "MediafireCom", "http://[\\w\\.]*?mediafire\\.com/(download\\.php\\?.+|\\?.+|file/.+)");
// new HostPluginWrapper("MySpace.Com", "MySpaceCom", "myspace://.+");
new HostPluginWrapper("MyVideo.de", "MyVideo", "http://[\\w\\.]*?myvideo.*?/.*?/\\d+\\.flv");
new HostPluginWrapper("OdSiebie.com", "Odsiebiecom", "http://[\\w\\.]*?odsiebie\\.com/(pokaz|pobierz)/\\d+---[\\w]+", PluginWrapper.LOAD_ON_INIT);
new HostPluginWrapper("Przeslij.net", "Przeslijnet", "http://www[\\d]?\\.przeslij\\.net/download\\.php\\?file=(.*)");
new HostPluginWrapper("R-b-a.De", "RbaDe", "http://[\\w\\.]*?r-b-a\\.de/download\\.php\\?FILE=(\\d+)-(\\d)\\.mp3&PATH=(\\d)");
new HostPluginWrapper("Roms.Zophar.Net", "RomsZopharNet", "http://[\\w\\.]*?roms\\.zophar\\.net/download-file/[0-9]{1,}");
@ -527,8 +523,6 @@ public class JDInit {
new HostPluginWrapper("UploadService.info", "UploadServiceinfo", "http://[\\w\\.]*?uploadservice\\.info/file/[\\w]+\\.html");
new HostPluginWrapper("UploadStube.de", "UploadStube", "http://[\\w\\.]*?uploadstube\\.de/download\\.php\\?file=.*");
new HostPluginWrapper("Xup.In", "XupIn", "http://[\\w\\.]*?xup\\.in/dl,\\d+/?.+?");
// new HostPluginWrapper("xup.raidrush.ws", "XupInRaidrush",
// "http://xup.raidrush.ws/.*?/");
new HostPluginWrapper("YouPorn.Com", "YouPornCom", "http://download\\.youporn\\.com/download/\\d+.*");
new HostPluginWrapper("YourFiles.Biz", "YourFilesBiz", "http://[\\w\\.]*?yourfiles\\.(biz|to)/\\?d=[\\w]+");
new HostPluginWrapper("YourFileSender.com", "YourFileSendercom", "http://[\\w\\.]*?yourfilesender\\.com/v/\\d+/(.*?\\.html)");
@ -541,7 +535,6 @@ public class JDInit {
new HostPluginWrapper("Vimeo.com", "VimeoCom", "http://[\\w\\.]*?vimeo\\.com/[0-9]+");
new HostPluginWrapper("Self-Load.com", "SelfLoadCom", "http://[\\w\\.]*?self-load\\.com/\\d+/.+");
new HostPluginWrapper("Plikus.pl", "PlikusPl", "http://[\\w\\.]*?plikus\\.pl/zobacz_plik-.*?-\\d+\\.html");
new HostPluginWrapper("Uploading.com", "UploadingCom", "http://[\\w\\.]*?uploading\\.com/files/\\w+/.+", PluginWrapper.LOAD_ON_INIT);
new HostPluginWrapper("KewlShare.com", "KewlshareCom", "http://[\\w\\.]*?kewlshare\\.com/dl/[\\w]+/.*");
new HostPluginWrapper("ShareBomb.com", "ShareBombCom", "http://[\\w\\.]*?sharebomb\\.com/[0-9]+.*");
new HostPluginWrapper("Load.to", "LoadTo", "http://(\\w*\\.)?load\\.to/[\\?d=]?[\\w]+.*");
@ -549,11 +542,9 @@ public class JDInit {
new HostPluginWrapper("ZetShare.com", "ZetshareCom", "http://[\\w\\.]*?zetshare\\.com/(download/|url/)?download\\.php\\?file=[0-9a-zA-Z]+");
new HostPluginWrapper("Filezzz.com", "FilezzzCom", "http://[\\w\\.]*?filezzz\\.com/download/[0-9]+/");
new HostPluginWrapper("SaveFile.com", "SavefileCom", "http://[\\w\\.]*?savefile\\.com/files/[0-9]+");
new HostPluginWrapper("SendSpace.com", "SendspaceCom", "http://[\\w\\.]*?sendspace\\.com/file/[0-9a-zA-Z]+", PluginWrapper.LOAD_ON_INIT);
new HostPluginWrapper("SpeedyShare.com", "SpeedyShareCom", "http://[\\w\\.]*?speedyshare\\.com/[0-9]+.*");
new HostPluginWrapper("FileShaker.com", "FileshakerCom", "http://[\\w\\.]*?fileshaker\\.com/.+");
new HostPluginWrapper("ADrive.com", "AdriveCom", "http://[\\w\\.].*?adrive\\.com/public/[0-9a-zA-Z]+.*");
new HostPluginWrapper("HotFile.com", "HotFileCom", "http://[\\w\\.]*?hotfile\\.com/dl/\\d+/[0-9a-zA-Z]+/", PluginWrapper.LOAD_ON_INIT);
new HostPluginWrapper("Przeklej.pl", "PrzeklejPl", "http://[\\w\\.]*?przeklej\\.pl/(d/\\w+/|\\d+|plik/)[^\\s]+");
new HostPluginWrapper("Wrzuta.pl", "WrzutaPl", "http://[\\w\\.]*?wrzuta\\.pl/(audio|film|obraz)/\\w+.+");
new HostPluginWrapper("FileFactory.pl", "FileFactoryPl", "http://[\\w\\.]*?filefactory\\.pl/showfile-\\d+.+");
@ -581,8 +572,6 @@ public class JDInit {
new HostPluginWrapper("Uploadline.com", "UploadlineCom", "http://[\\w\\.]*?uploadline\\.com/\\d+/.+");
new HostPluginWrapper("Biggerupload.com", "BiggeruploadCom", "http://[\\w\\.]*?biggerupload\\.com/[\\w]+/?.*");
new HostPluginWrapper("Ziddu.com", "ZidduCom", "http://[\\w\\.]*?ziddu\\.com/((download/\\d+/.*?\\.html)|(download\\.php\\?uid=[\\w%]+)|downloadfile/\\d+/.*?\\.html)");
// new HostPluginWrapper("FilesDump.com", "FilesDumpCom",
// "http://.*?filesdump\\.com/file/[a-f0-9]+/.*?");
new HostPluginWrapper("UpMusic.in", "UpMusicIn", "http://[\\w\\.]*?upmusic\\.in/[a-z0-9]+.*?");
new HostPluginWrapper("SuperShare.pl", "SuperSharePl", "http://[\\w\\.]*?supershare\\.pl/\\?d=[A-F0-9]+");
new HostPluginWrapper("FileFront.com", "FileFrontCom", "http://files.filefront\\.com/[^\\s]+/;\\d+(;/fileinfo.html|;)");

19
src/jd/plugins/host/IfolderRu.java
View File

@ -35,12 +35,17 @@ public class IfolderRu extends PluginForHost {
super(wrapper);
}
// @Override
@Override
public String getAGBLink() {
return ("http://ifolder.ru/agreement");
}
// @Override
@Override
public String getCoder() {
return "Void";
}
@Override
public AvailableStatus requestFileInformation(DownloadLink downloadLink) throws PluginException, IOException, InterruptedException {
this.setBrowserExclusive();
br.getPage(downloadLink.getDownloadURL());
@ -55,7 +60,7 @@ public class IfolderRu extends PluginForHost {
return AvailableStatus.TRUE;
}
// @Override
@Override
public void handleFree(DownloadLink downloadLink) throws Exception {
boolean do_download = false;
requestFileInformation(downloadLink);
@ -112,22 +117,22 @@ public class IfolderRu extends PluginForHost {
dl.startDownload();
}
// @Override
@Override
public void reset() {
}
// @Override
@Override
public String getVersion() {
return getVersion("$Revision$");
}
// @Override
@Override
public int getMaxSimultanFreeDownloadNum() {
/* Tested up to 10 parallel downloads */
return 10;
}
// @Override
@Override
public void resetDownloadlink(DownloadLink link) {
}

20
src/tests/utils/TestUtils.java
View File

@ -89,8 +89,7 @@ public abstract class TestUtils {
}
public static void mainInit() {
if(JDUtilities.getController() != null)
return;
if (JDUtilities.getController() != null) return;
new GuiRunnable<Object>() {
@Override
@ -115,34 +114,30 @@ public abstract class TestUtils {
JDTheme.setTheme("default");
jdi = new JDInit(null);
jdi = new JDInit();
jdi.init();
if (jdi.loadConfiguration() == null) {
UserIO.getInstance().requestMessageDialog("JDownloader cannot create the config files. Make sure, that JD_HOME/config/ exists and is writeable");
}
jdc = jdi.initController();
JDUtilities.getConfiguration();
jdc = JDController.getInstance();
}
public static void initDecrypter() {
if(DecryptPluginWrapper.getDecryptWrapper().size() > 0)
return;
if (DecryptPluginWrapper.getDecryptWrapper().size() > 0) return;
jdi.loadPluginForDecrypt();
}
public static void initHosts() {
if(JDUtilities.getPluginsForHost().size() > 0)
return;
if (JDUtilities.getPluginsForHost().size() > 0) return;
jdi.loadPluginForHost();
}
public static void initOptionalPlugins() {
if(OptionalPluginWrapper.getOptionalWrapper().size() > 0)
return;
if (OptionalPluginWrapper.getOptionalWrapper().size() > 0) return;
jdi.loadPluginOptional();
}
@ -154,8 +149,7 @@ public abstract class TestUtils {
}
public static void initGUI() {
if(SimpleGUI.CURRENTGUI != null)
return;
if (SimpleGUI.CURRENTGUI != null) return;
new GuiRunnable<Object>() {
@Override