Merge pull request #1 from pyload/stable

sync stable

1 files changed, 6 insertions, 5 deletions

diff --git a/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py
index d6c5c86cc..366adef14 100644
--- a/module/plugins/crypter/FourChanOrg.py
+++ b/module/plugins/crypter/FourChanOrg.py
@@ -3,6 +3,7 @@
 # Based on 4chandl by Roland Beermann (https://gist.github.com/enkore/3492599)
 
 import re
+import urlparse
 
 from module.plugins.Crypter import Crypter
 
@@ -10,11 +11,11 @@ from module.plugins.Crypter import Crypter
 class FourChanOrg(Crypter):
     __name__    = "FourChanOrg"
     __type__    = "crypter"
-    __version__ = "0.30"
+    __version__ = "0.31"
 
     __pattern__ = r'http://(?:www\.)?boards\.4chan\.org/\w+/res/(\d+)'
-    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
-                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
+    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
     __description__ = """4chan.org folder decrypter plugin"""
     __license__     = "GPLv3"
@@ -23,5 +24,5 @@ class FourChanOrg(Crypter):
 
     def decrypt(self, pyfile):
         pagehtml = self.load(pyfile.url)
-        images = set(re.findall(r'(images\.4chan\.org/[^/]*/src/[^"<]*)', pagehtml))
-        self.urls = ["http://" + image for image in images]
+        images = set(re.findall(r'(images\.4chan\.org/[^/]*/src/[^"<]+)', pagehtml))
+        self.urls = [urlparse.urljoin("http://", image) for image in images]