diff options
32 files changed, 42 insertions, 43 deletions
diff --git a/module/plugins/Plugin.py b/module/Plugin.py index 7b726c3ac..7b726c3ac 100644 --- a/module/plugins/Plugin.py +++ b/module/Plugin.py diff --git a/module/plugins/BluehostTo.py b/module/plugins/BluehostTo.py index 1ecd47122..eff8ebcd8 100644 --- a/module/plugins/BluehostTo.py +++ b/module/plugins/BluehostTo.py @@ -4,7 +4,7 @@ import re import time -from Plugin import Plugin +from module.Plugin import Plugin class BluehostTo(Plugin): diff --git a/module/plugins/CCF.py b/module/plugins/CCF.py index d7792dce4..ba5b1c77d 100644 --- a/module/plugins/CCF.py +++ b/module/plugins/CCF.py @@ -7,7 +7,7 @@ import re import tempfile import urllib2 -from Plugin import Plugin +from module.Plugin import Plugin from module.network.MultipartPostHandler import MultipartPostHandler class CCF(Plugin): @@ -57,4 +57,4 @@ class CCF(Plugin): self.links.append(tempdlc_name) - return True
\ No newline at end of file + return True diff --git a/module/plugins/DDLMusicOrg.py b/module/plugins/DDLMusicOrg.py index 06dbfb31c..e34e6fbde 100644 --- a/module/plugins/DDLMusicOrg.py +++ b/module/plugins/DDLMusicOrg.py @@ -4,7 +4,7 @@ import re from time import sleep -from Plugin import Plugin +from module.Plugin import Plugin class DDLMusicOrg(Plugin): diff --git a/module/plugins/DepositfilesCom.py b/module/plugins/DepositfilesCom.py index b2f6db29c..6c5748096 100644 --- a/module/plugins/DepositfilesCom.py +++ b/module/plugins/DepositfilesCom.py @@ -3,7 +3,7 @@ import re import urllib -from Plugin import Plugin +from module.Plugin import Plugin class DepositfilesCom(Plugin): diff --git a/module/plugins/FilefactoryCom.py b/module/plugins/FilefactoryCom.py index 65f79390d..ff069b20f 100644 --- a/module/plugins/FilefactoryCom.py +++ b/module/plugins/FilefactoryCom.py @@ -3,7 +3,7 @@ import re import urllib -from Plugin import Plugin +from module.Plugin import Plugin from time import time class FilefactoryCom(Plugin): diff --git a/module/plugins/FourChanOrg.py b/module/plugins/FourChanOrg.py index 383785951..e3b00c1f7 100644 --- a/module/plugins/FourChanOrg.py +++ b/module/plugins/FourChanOrg.py @@ -3,7 +3,7 @@ import re -from Plugin import Plugin +from module.Plugin import Plugin class FourChanOrg(Plugin): diff --git a/module/plugins/GigasizeCom.py b/module/plugins/GigasizeCom.py index e9404263c..e22fe8593 100644 --- a/module/plugins/GigasizeCom.py +++ b/module/plugins/GigasizeCom.py @@ -6,7 +6,7 @@ import re import tempfile from time import time -from Plugin import Plugin +from module.Plugin import Plugin class GigasizeCom(Plugin): diff --git a/module/plugins/HoerbuchIn.py b/module/plugins/HoerbuchIn.py index 02d3a79e7..ae7ae9774 100644 --- a/module/plugins/HoerbuchIn.py +++ b/module/plugins/HoerbuchIn.py @@ -3,7 +3,7 @@ import re -from Plugin import Plugin +from module.Plugin import Plugin class HoerbuchIn(Plugin): diff --git a/module/plugins/HotfileCom.py b/module/plugins/HotfileCom.py index 10a8fd5a8..7ae432c78 100644 --- a/module/plugins/HotfileCom.py +++ b/module/plugins/HotfileCom.py @@ -4,7 +4,7 @@ import re import urllib from time import time -from Plugin import Plugin +from module.Plugin import Plugin class HotfileCom(Plugin): diff --git a/module/plugins/LixIn.py b/module/plugins/LixIn.py index ee7d99a62..d7ef6521d 100644 --- a/module/plugins/LixIn.py +++ b/module/plugins/LixIn.py @@ -3,7 +3,7 @@ import re -from Plugin import Plugin +from module.Plugin import Plugin class LixIn(Plugin): diff --git a/module/plugins/MegauploadCom.py b/module/plugins/MegauploadCom.py index bcafec83f..3736503c0 100644 --- a/module/plugins/MegauploadCom.py +++ b/module/plugins/MegauploadCom.py @@ -5,7 +5,7 @@ import os import re import tempfile -from Plugin import Plugin +from module.Plugin import Plugin class MegauploadCom(Plugin): diff --git a/module/plugins/MyvideoDe.py b/module/plugins/MyvideoDe.py index 3f7ce915b..5e2eb0b39 100644 --- a/module/plugins/MyvideoDe.py +++ b/module/plugins/MyvideoDe.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import re -from Plugin import Plugin +from module.Plugin import Plugin class MyvideoDe(Plugin): diff --git a/module/plugins/NetloadIn.py b/module/plugins/NetloadIn.py index 21fba5aa3..b9fb4cfed 100644 --- a/module/plugins/NetloadIn.py +++ b/module/plugins/NetloadIn.py @@ -8,7 +8,7 @@ from time import time from time import sleep import hashlib -from Plugin import Plugin +from module.Plugin import Plugin class NetloadIn(Plugin): diff --git a/module/plugins/OneKhDe.py b/module/plugins/OneKhDe.py index 15c3a6872..5f24b543a 100644 --- a/module/plugins/OneKhDe.py +++ b/module/plugins/OneKhDe.py @@ -4,7 +4,7 @@ import re from module.unescape import unescape -from Plugin import Plugin +from module.Plugin import Plugin class OneKhDe(Plugin): diff --git a/module/plugins/RSDF.py b/module/plugins/RSDF.py index c2406d6e0..50fca9b1f 100644 --- a/module/plugins/RSDF.py +++ b/module/plugins/RSDF.py @@ -4,7 +4,7 @@ import base64 import binascii -from Plugin import Plugin +from module.Plugin import Plugin class RSDF(Plugin): diff --git a/module/plugins/RSLayerCom.py b/module/plugins/RSLayerCom.py index e470c1748..20cadbe18 100644 --- a/module/plugins/RSLayerCom.py +++ b/module/plugins/RSLayerCom.py @@ -4,7 +4,7 @@ import re from module.unescape import unescape -from Plugin import Plugin +from module.Plugin import Plugin class RSLayerCom(Plugin): diff --git a/module/plugins/RapidshareCom.py b/module/plugins/RapidshareCom.py index 08b7bdea4..e2602bdd6 100644 --- a/module/plugins/RapidshareCom.py +++ b/module/plugins/RapidshareCom.py @@ -4,7 +4,7 @@ import re from time import time -from Plugin import Plugin +from module.Plugin import Plugin import hashlib class RapidshareCom(Plugin): diff --git a/module/plugins/RelinkUs.py b/module/plugins/RelinkUs.py index 31f592759..4bfa5a18b 100644 --- a/module/plugins/RelinkUs.py +++ b/module/plugins/RelinkUs.py @@ -3,7 +3,7 @@ import re -from Plugin import Plugin +from module.Plugin import Plugin class RelinkUs(Plugin): diff --git a/module/plugins/ShareonlineBiz.py b/module/plugins/ShareonlineBiz.py index cb7030e87..a798ccefa 100644 --- a/module/plugins/ShareonlineBiz.py +++ b/module/plugins/ShareonlineBiz.py @@ -7,7 +7,7 @@ import tempfile from time import time from base64 import b64decode -from Plugin import Plugin +from module.Plugin import Plugin class ShareonlineBiz(Plugin): diff --git a/module/plugins/ShragleCom.py b/module/plugins/ShragleCom.py index bcf650d69..c0cc9de72 100644 --- a/module/plugins/ShragleCom.py +++ b/module/plugins/ShragleCom.py @@ -4,7 +4,7 @@ import re import time -from Plugin import Plugin +from module.Plugin import Plugin class ShragleCom(Plugin): @@ -69,4 +69,4 @@ class ShragleCom(Plugin): return True def proceed(self, url, location): - self.req.download(url, location, {'fileID': self.fileID, 'dlSession': self.dlSession, 'userID': self.userID, 'password': self.password, 'lang': self.lang})
\ No newline at end of file + self.req.download(url, location, {'fileID': self.fileID, 'dlSession': self.dlSession, 'userID': self.userID, 'password': self.password, 'lang': self.lang}) diff --git a/module/plugins/StealthTo.py b/module/plugins/StealthTo.py index c904a07c3..855aae001 100644 --- a/module/plugins/StealthTo.py +++ b/module/plugins/StealthTo.py @@ -3,7 +3,7 @@ import re -from Plugin import Plugin +from module.Plugin import Plugin class StealthTo(Plugin): diff --git a/module/plugins/StorageTo.py b/module/plugins/StorageTo.py index 14cb657d9..dbff844ad 100644 --- a/module/plugins/StorageTo.py +++ b/module/plugins/StorageTo.py @@ -4,7 +4,7 @@ import re from time import time -from Plugin import Plugin +from module.Plugin import Plugin class StorageTo(Plugin): diff --git a/module/plugins/UploadedTo.py b/module/plugins/UploadedTo.py index e00d72f51..bcb0a7008 100644 --- a/module/plugins/UploadedTo.py +++ b/module/plugins/UploadedTo.py @@ -3,7 +3,7 @@ import re from time import time -from Plugin import Plugin +from module.Plugin import Plugin import hashlib class UploadedTo(Plugin): diff --git a/module/plugins/XupIn.py b/module/plugins/XupIn.py index 6b1f3be73..d044f2389 100644 --- a/module/plugins/XupIn.py +++ b/module/plugins/XupIn.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import re -from Plugin import Plugin +from module.Plugin import Plugin class XupIn(Plugin): diff --git a/module/plugins/YoupornCom.py b/module/plugins/YoupornCom.py index fb0f4131d..e501954da 100644 --- a/module/plugins/YoupornCom.py +++ b/module/plugins/YoupornCom.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import re -from Plugin import Plugin +from module.Plugin import Plugin class YoupornCom(Plugin): @@ -59,4 +59,4 @@ class YoupornCom(Plugin): if re.search(r"(.*invalid video_id.*)", self.html) != None: return False else: - return True
\ No newline at end of file + return True diff --git a/module/plugins/YoutubeChannel.py b/module/plugins/YoutubeChannel.py index 4958d1db5..27a4ff8a7 100644 --- a/module/plugins/YoutubeChannel.py +++ b/module/plugins/YoutubeChannel.py @@ -3,7 +3,7 @@ import re -from Plugin import Plugin +from module.Plugin import Plugin class YoutubeChannel(Plugin): diff --git a/module/plugins/YoutubeCom.py b/module/plugins/YoutubeCom.py index 7428f532d..c93c662d1 100644 --- a/module/plugins/YoutubeCom.py +++ b/module/plugins/YoutubeCom.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import re -from Plugin import Plugin +from module.Plugin import Plugin class YoutubeCom(Plugin): diff --git a/module/plugins/ZippyshareCom.py b/module/plugins/ZippyshareCom.py index 61408f925..0c638087b 100644 --- a/module/plugins/ZippyshareCom.py +++ b/module/plugins/ZippyshareCom.py @@ -3,7 +3,7 @@ import re import urllib -from Plugin import Plugin +from module.Plugin import Plugin class ZippyshareCom(Plugin): diff --git a/module/plugins/ZshareNet.py b/module/plugins/ZshareNet.py index 33667605f..08f28a35c 100644 --- a/module/plugins/ZshareNet.py +++ b/module/plugins/ZshareNet.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import re -from Plugin import Plugin +from module.Plugin import Plugin class ZshareNet(Plugin): diff --git a/pyLoadCli.py b/pyLoadCli.py index 49e656e93..fd65e04da 100755 --- a/pyLoadCli.py +++ b/pyLoadCli.py @@ -336,7 +336,7 @@ if __name__ == "__main__": pipe = subprocess.PIPE subprocess.Popen("./pyLoadCore.py", stdout=pipe, stderr=pipe) print "Starting pyLoad Core" - sleep(0.5) + sleep(1) cli = pyLoadCli("127.0.0.1", config.get("remote", "port"), config.get("remote", "password")) if len(extraparams) == 3: diff --git a/pyLoadCore.py b/pyLoadCore.py index f913eb493..c4c5dd9f0 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -145,16 +145,15 @@ class Core(object): def create_plugin_index(self): for file_handler in glob(self.plugin_folder + sep + '*.py') + glob(self.plugin_folder + sep + 'DLC.pyc'): - if file_handler != self.plugin_folder + sep + "Plugin.py": - plugin_pattern = "" - plugin_file = basename(file_handler).replace('.pyc', '').replace('.py', '') - for line in open(file_handler, "r").readlines(): - if "props['pattern']" in line: - plugin_pattern = line.split("r\"")[1].split("\"")[0] - break - if plugin_pattern != "": - self.plugins_avaible[plugin_file] = plugin_pattern - self.logger.debug(plugin_file + _(" added")) + plugin_pattern = "" + plugin_file = basename(file_handler).replace('.pyc', '').replace('.py', '') + for line in open(file_handler, "r").readlines(): + if "props['pattern']" in line: + plugin_pattern = line.split("r\"")[1].split("\"")[0] + break + if plugin_pattern != "": + self.plugins_avaible[plugin_file] = plugin_pattern + self.logger.debug(plugin_file + _(" added")) self.logger.info(_("created index of plugins")) def read_links(self): |