From 90782ef2c60e905c66c23efd2f4f75c9248b42e9 Mon Sep 17 00:00:00 2001 From: Greeny Date: Mon, 15 Jun 2009 09:50:33 +0000 Subject: [PATCH] git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@6234 ebf7c1c2-ba36-0410-9fe8-c592906822b4 --- build/build.xml | 80 ++++++++++-------- .../107__JDTrayIcon/plugins/JDTrayIcon.jar | Bin 15268 -> 0 bytes .../108__JDTrayLight/plugins/JDLightTray.jar | Bin 14265 -> 0 bytes .../118__JDLowSpeed/plugins/JDLowSpeed.jar | Bin 8402 -> 0 bytes src/jd/JDInit.java | 21 ++--- src/jd/plugins/host/IfolderRu.java | 19 +++-- src/tests/utils/TestUtils.java | 68 +++++++-------- 7 files changed, 91 insertions(+), 97 deletions(-) delete mode 100644 ressourcen/pluginressourcen/107__JDTrayIcon/plugins/JDTrayIcon.jar delete mode 100644 ressourcen/pluginressourcen/108__JDTrayLight/plugins/JDLightTray.jar delete mode 100644 ressourcen/pluginressourcen/118__JDLowSpeed/plugins/JDLowSpeed.jar 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 82a08b5312afb1e5403cf0860938b24b80038456..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15268 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 diff --git a/ressourcen/pluginressourcen/118__JDLowSpeed/plugins/JDLowSpeed.jar b/ressourcen/pluginressourcen/118__JDLowSpeed/plugins/JDLowSpeed.jar deleted file mode 100644 index ffe527d910b8ca35ac8977d1e5b7bed9f64d9488..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8402 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 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));