diff --git a/build/build.xml b/build/build.xml index d55231686b..0c2f2b4cdb 100644 --- a/build/build.xml +++ b/build/build.xml @@ -145,17 +145,10 @@ - - + + - - - - - - - - + @@ -166,13 +159,6 @@ - - - - - - - @@ -180,6 +166,20 @@ + + + + + + + + + + + + + + @@ -201,17 +201,10 @@ - - + + - - - - - - - - + @@ -222,17 +215,10 @@ - - + + - - - - - - - - + @@ -242,6 +228,21 @@ + + + + + + + + + + + + + + + @@ -273,12 +274,17 @@ + + + + + \ No newline at end of file diff --git a/ressourcen/pluginressourcen/107__JDTrayIcon/plugins/JDTrayIcon.jar b/ressourcen/pluginressourcen/107__JDTrayIcon/plugins/JDTrayIcon.jar deleted file mode 100644 index 82a08b5312..0000000000 Binary files a/ressourcen/pluginressourcen/107__JDTrayIcon/plugins/JDTrayIcon.jar and /dev/null differ diff --git a/ressourcen/pluginressourcen/108__JDTrayLight/plugins/JDLightTray.jar b/ressourcen/pluginressourcen/108__JDTrayLight/plugins/JDLightTray.jar deleted file mode 100644 index 4a7a3b8677..0000000000 Binary files a/ressourcen/pluginressourcen/108__JDTrayLight/plugins/JDLightTray.jar and /dev/null differ diff --git a/ressourcen/pluginressourcen/118__JDLowSpeed/plugins/JDLowSpeed.jar b/ressourcen/pluginressourcen/118__JDLowSpeed/plugins/JDLowSpeed.jar deleted file mode 100644 index ffe527d910..0000000000 Binary files a/ressourcen/pluginressourcen/118__JDLowSpeed/plugins/JDLowSpeed.jar and /dev/null differ diff --git a/src/jd/JDInit.java b/src/jd/JDInit.java index 90da6e4c37..55b8cb1ba1 100644 --- a/src/jd/JDInit.java +++ b/src/jd/JDInit.java @@ -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|;)"); diff --git a/src/jd/plugins/host/IfolderRu.java b/src/jd/plugins/host/IfolderRu.java index 826a804870..bd143d7e2d 100644 --- a/src/jd/plugins/host/IfolderRu.java +++ b/src/jd/plugins/host/IfolderRu.java @@ -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) { } diff --git a/src/tests/utils/TestUtils.java b/src/tests/utils/TestUtils.java index 7d041be9f2..1f54f15082 100644 --- a/src/tests/utils/TestUtils.java +++ b/src/tests/utils/TestUtils.java @@ -37,9 +37,9 @@ import jd.utils.MacOSController; public abstract class TestUtils { private static JFrame FRAME; - + private static JDInit jdi; - + private static JDController jdc; /** @@ -87,12 +87,11 @@ public abstract class TestUtils { public static void log(String msg) { System.out.println(new Exception().getStackTrace()[1].toString() + " : " + msg); } - + public static void mainInit() { - if(JDUtilities.getController() != null) - return; - - new GuiRunnable() { + if (JDUtilities.getController() != null) return; + + new GuiRunnable() { @Override public Object runSave() { FRAME = new JFrame(); @@ -115,49 +114,44 @@ 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; - - jdi.loadPluginForDecrypt(); + if (DecryptPluginWrapper.getDecryptWrapper().size() > 0) return; + + jdi.loadPluginForDecrypt(); } - + public static void initHosts() { - if(JDUtilities.getPluginsForHost().size() > 0) - return; - - jdi.loadPluginForHost(); + if (JDUtilities.getPluginsForHost().size() > 0) return; + + jdi.loadPluginForHost(); } - + public static void initOptionalPlugins() { - if(OptionalPluginWrapper.getOptionalWrapper().size() > 0) - return; - - jdi.loadPluginOptional(); + if (OptionalPluginWrapper.getOptionalWrapper().size() > 0) return; + + jdi.loadPluginOptional(); } - + public static void initAllPlugins() { - initDecrypter(); - initHosts(); - initOptionalPlugins(); + initDecrypter(); + initHosts(); + initOptionalPlugins(); } - + public static void initGUI() { - if(SimpleGUI.CURRENTGUI != null) - return; - - new GuiRunnable() { + if (SimpleGUI.CURRENTGUI != null) return; + + new GuiRunnable() { @Override public Object runSave() { jdi.initGUI(jdc); @@ -167,11 +161,11 @@ public abstract class TestUtils { SimpleGUI.CURRENTGUI.setVisible(false); } - + public static void initControllers() { - jdi.initControllers(); + jdi.initControllers(); } - + public static void finishInit() { jdc.setInitStatus(JDController.INIT_STATUS_COMPLETE); JDUtilities.getController().fireControlEvent(new ControlEvent(new Object(), ControlEvent.CONTROL_INIT_COMPLETE, null));