diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-08-01 13:10:51 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-08-01 13:10:51 +0200 |
| commit | af6cf761c6d873648fa0ffdb4cc9f2f1a032dd3d (patch) | |
| tree | 518e26cd3f11299ab3dd6755ae5a877216a24ee9 /module/plugins | |
| parent | webif config fix (diff) | |
| download | pyload-af6cf761c6d873648fa0ffdb4cc9f2f1a032dd3d.tar.xz | |
some fixes
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/Hook.py | 2 | ||||
| -rw-r--r-- | module/plugins/Plugin.py | 1 | ||||
| -rw-r--r-- | module/plugins/hooks/ExternalScripts.py | 5 | ||||
| -rw-r--r-- | module/plugins/hoster/BasePlugin.py | 7 |
4 files changed, 5 insertions, 10 deletions
diff --git a/module/plugins/Hook.py b/module/plugins/Hook.py index 7adbe2bbd..35be45b30 100644 --- a/module/plugins/Hook.py +++ b/module/plugins/Hook.py @@ -25,7 +25,7 @@ class Hook(): __version__ = "0.2" __type__ = "hook" __threaded__ = [] - __config__ = [] + __config__ = [ ("name", "type", "desc" , "default") ] __description__ = """interface for hook""" __author_name__ = ("mkaay", "RaNaN") __author_mail__ = ("mkaay@mkaay.de", "RaNaN@pyload.org") diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py index 1d3fb4309..5a53b4e47 100644 --- a/module/plugins/Plugin.py +++ b/module/plugins/Plugin.py @@ -57,6 +57,7 @@ class Plugin(object): __version__ = "0.4" __pattern__ = None __type__ = "hoster" + __config__ = [ ("name", "type", "desc" , "default") ] __description__ = """Base Plugin""" __author_name__ = ("RaNaN", "spoob", "mkaay") __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org", "mkaay@mkaay.de") diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py index c4bc76c82..a876618c3 100644 --- a/module/plugins/hooks/ExternalScripts.py +++ b/module/plugins/hooks/ExternalScripts.py @@ -28,6 +28,7 @@ class ExternalScripts(Hook): __name__ = "ExternalScripts" __version__ = "0.1" __description__ = """run external scripts""" + __config__ = [ ("activated", "bool", "Activated" , "True") ] __author_name__ = ("mkaay", "RaNaN", "spoob") __author_mail__ = ("mkaay@mkaay.de", "ranan@pyload.org", "spoob@pyload.org") @@ -77,8 +78,8 @@ class ExternalScripts(Hook): try: out = subprocess.Popen([join(self.folder, 'download_finished', script), pyfile.plugin.__name__, pyfile.url, pyfile.name, \ join(self.core.config['general']['download_folder'], pyfile.package().folder, pyfile.name)], stdout=subprocess.PIPE) - except Exception, e: - print e + except: + pass def packageFinished(self, pypack): for script in self.scripts['package_finished']: diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py index b64e826f8..09545d493 100644 --- a/module/plugins/hoster/BasePlugin.py +++ b/module/plugins/hoster/BasePlugin.py @@ -16,13 +16,6 @@ class BasePlugin(Hoster): def process(self, pyfile): """main function""" - #debug stuff - - res = self.decryptCaptcha("http://www.google.com/recaptcha/api/image?c=03AHJ_VusNo91yuOYR22VR2J2XUl4x8fqcKbKato005zKhc10DT8FmIP4WQwK_5QkJZVRdCNWDPSlASuS12Y30qMjBguJpYA9fztHKFE8Lp2FGOrl6EnMcgTeyx_6FuVpMstX_XRuhusH-Z6H3Tchsj077ptyDMOPFrg") - print res - - #end - if pyfile.url.startswith("http://"): pyfile.name = re.findall("([^\/=]+)", pyfile.url)[-1] |