Fix https://github.com/pyload/pyload/issues/1472

1 files changed, 7 insertions, 14 deletions

diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py
index d54ed47eb..384168030 100644
--- a/module/plugins/crypter/UploadedToFolder.py
+++ b/module/plugins/crypter/UploadedToFolder.py
@@ -9,11 +9,10 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 class UploadedToFolder(SimpleCrypter):
     __name__    = "UploadedToFolder"
     __type__    = "crypter"
-    __version__ = "0.42"
+    __version__ = "0.43"
 
-    __pattern__ = r'http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<ID>\w+)'
-    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
-                   ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+    __pattern__ = r'https?://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/\w+'
+    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
     __description__ = """UploadedTo decrypter plugin"""
@@ -21,17 +20,11 @@ class UploadedToFolder(SimpleCrypter):
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
-    PLAIN_PATTERN = r'<small class="date"><a href="([\w/]+)" onclick='
-    NAME_PATTERN = r'<title>(?P<N>.+?)<'
+    NAME_PATTERN         = r'<title>(?P<N>.+?)<'
+    OFFLINE_PATTERN      = r'>Page not found'
+    TEMP_OFFLINE_PATTERN = r'<title>uploaded\.net - Maintenance'
 
-
-    def getLinks(self):
-        m = re.search(self.PLAIN_PATTERN, self.html)
-        if m is None:
-            self.error(_("PLAIN_PATTERN not found"))
-
-        plain_link = urlparse.urljoin("http://uploaded.net/", m.group(1))
-        return self.load(plain_link).split('\n')[:-1]
+    LINK_PATTERN = r'<h2><a href="(.+?)"'
 
 
 getInfo = create_getInfo(UploadedToFolder)