Merge branch 'stable' into 0.4.10

Conflicts:
	pyload/plugin/crypter/FilecryptCc.py
	pyload/plugin/hoster/Ftp.py
	pyload/plugin/hoster/UpleaCom.py
	pyload/plugin/hoster/UploadedTo.py
	pyload/plugin/internal/BasePlugin.py
	pyload/plugin/internal/SimpleHoster.py

3 files changed, 19 insertions, 9 deletions

diff --git a/pyload/plugin/hoster/Ftp.py b/pyload/plugin/hoster/Ftp.py
index 86049df04..1ebfdebd0 100644
--- a/pyload/plugin/hoster/Ftp.py
+++ b/pyload/plugin/hoster/Ftp.py
@@ -12,7 +12,7 @@ from pyload.plugin.Hoster import Hoster
 class Ftp(Hoster):
     __name    = "Ftp"
     __type    = "hoster"
-    __version = "0.49"
+    __version = "0.50"
 
     __pattern = r'(?:ftps?|sftp)://([\w.-]+(:[\w.-]+)?@)?[\w.-]+(:\d+)?/.+'
 
diff --git a/pyload/plugin/hoster/UpleaCom.py b/pyload/plugin/hoster/UpleaCom.py
index 46462e94a..fe2aa036e 100644
--- a/pyload/plugin/hoster/UpleaCom.py
+++ b/pyload/plugin/hoster/UpleaCom.py
@@ -10,24 +10,31 @@ from pyload.plugin.internal.XFSHoster import XFSHoster
 class UpleaCom(XFSHoster):
     __name    = "UpleaCom"
     __type    = "hoster"
-    __version = "0.06"
+    __version = "0.10"
 
     __pattern = r'https?://(?:www\.)?uplea\.com/dl/\w{15}'
 
     __description = """Uplea.com hoster plugin"""
     __license     = "GPLv3"
-    __authors     = [("Redleon", "")]
+    __authors     = [("Redleon", None),
+                     ("GammaC0de", None)]
 
 
-    NAME_PATTERN = r'class="agmd size18">(?P<N>.+?)<'
-    SIZE_PATTERN = r'size14">(?P<S>[\d.,]+) (?P<U>[\w^_])</span>'
+    DISPOSITION = False  #@TODO: Remove in 0.4.10
 
+    HOSTER_DOMAIN = "uplea.com"
+
+    SIZE_REPLACEMENTS = [('ko','KB'), ('mo','MB'), ('go','GB'), ('Ko','KB'), ('Mo','MB'), ('Go','GB')]
+
+    NAME_PATTERN    = r'<span class="gold-text">(?P<N>.+?)</span>'
+    SIZE_PATTERN    = r'<span class="label label-info agmd">(?P<S>[\d.,]+) (?P<U>[\w^_]+?)</span>'
     OFFLINE_PATTERN = r'>You followed an invalid or expired link'
 
-    LINK_PATTERN = r'"(http?://\w+\.uplea\.com/anonym/.*?)"'
+    LINK_PATTERN = r'"(https?://\w+\.uplea\.com/anonym/.*?)"'
 
-    WAIT_PATTERN = r'timeText:([\d.]+),'
-    STEP_PATTERN = r'<a href="(/step/.+)">'
+    PREMIUM_ONLY_PATTERN = r'You need to have a Premium subscription to download this file'
+    WAIT_PATTERN         = r'timeText: ?([\d.]+),'
+    STEP_PATTERN         = r'<a href="(/step/.+)">'
 
 
     def setup(self):
@@ -45,6 +52,7 @@ class UpleaCom(XFSHoster):
 
         m = re.search(self.WAIT_PATTERN, self.html)
         if m:
+            self.logDebug(_("Waiting %s seconds") % m.group(1))
             self.wait(m.group(1), True)
             self.retry()
 
diff --git a/pyload/plugin/hoster/UploadedTo.py b/pyload/plugin/hoster/UploadedTo.py
index c8b201ec6..308b7c1ca 100644
--- a/pyload/plugin/hoster/UploadedTo.py
+++ b/pyload/plugin/hoster/UploadedTo.py
@@ -11,7 +11,7 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster
 class UploadedTo(SimpleHoster):
     __name    = "UploadedTo"
     __type    = "hoster"
-    __version = "0.86"
+    __version = "0.87"
 
     __pattern = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)'
     __config  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -27,6 +27,8 @@ class UploadedTo(SimpleHoster):
 
     URL_REPLACEMENTS = [(__pattern + ".*", r'http://uploaded.net/file/\g<ID>')]
 
+    TEMP_OFFLINE_PATTERN = r'<title>uploaded\.net - Maintenance'
+
     LINK_PREMIUM_PATTERN = r'<div class="tfree".*\s*<form method="post" action="(.+?)"'
 
     WAIT_PATTERN   = r'Current waiting period: <span>(\d+)'