Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/Account.py
	module/plugins/AccountManager.py
	module/plugins/Hook.py
	module/plugins/OCR.py
	module/plugins/Plugin.py
	module/plugins/PluginManager.py
	module/plugins/ReCaptcha.py
	module/plugins/accounts/Ftp.py
	module/plugins/accounts/Http.py
	module/plugins/internal/MultiHoster.py
	module/plugins/ocr/GigasizeCom.py
	module/plugins/ocr/LinksaveIn.py
	module/plugins/ocr/NetloadIn.py
	module/plugins/ocr/ShareonlineBiz.py

1 files changed, 13 insertions, 29 deletions

diff --git a/module/plugins/hoster/Ftp.py b/module/plugins/hoster/Ftp.py
index af9191a4d..8de3f4f47 100644
--- a/module/plugins/hoster/Ftp.py
+++ b/module/plugins/hoster/Ftp.py
@@ -1,39 +1,24 @@
 # -*- coding: utf-8 -*-
 
-"""
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License,
-    or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-    See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-    @author: jeix
-    @author: mkaay
-"""
-from urlparse import urlparse
-from urllib import quote, unquote
 import pycurl
 import re
 
+from urllib import quote, unquote
+from urlparse import urlparse
+
 from module.plugins.Hoster import Hoster
 
 
 class Ftp(Hoster):
     __name__ = "Ftp"
-    __version__ = "0.41"
-    __pattern__ = r'(ftps?|sftp)://(.*?:.*?@)?.*?/.*'  # ftp://user:password@ftp.server.org/path/to/file
     __type__ = "hoster"
+    __version__ = "0.41"
+
     __description__ = """Download from ftp directory"""
     __author_name__ = ("jeix", "mkaay", "zoidberg")
     __author_mail__ = ("jeix@hasnomail.com", "mkaay@mkaay.de", "zoidberg@mujmail.cz")
 
+
     def setup(self):
         self.chunkLimit = -1
         self.resumeDownload = True
@@ -53,7 +38,7 @@ class Ftp(Hoster):
 
             if netloc in servers:
                 self.logDebug("Logging on to %s" % netloc)
-                self.req.addAuth(self.account.accounts[netloc]["password"])
+                self.req.addAuth(self.account.accounts[netloc]['password'])
             else:
                 for pwd in pyfile.package().password.splitlines():
                     if ":" in pwd:
@@ -70,21 +55,20 @@ class Ftp(Hoster):
         self.req.http.c.setopt(pycurl.NOBODY, 0)
         self.logDebug(self.req.http.header)
 
-        found = re.search(r"Content-Length:\s*(\d+)", response)
-        if found:
-            pyfile.size = int(found.group(1))
+        m = re.search(r"Content-Length:\s*(\d+)", response)
+        if m:
+            pyfile.size = int(m.group(1))
             self.download(pyfile.url)
         else:
-            #Naive ftp directory listing          
+            #Naive ftp directory listing
             if re.search(r'^25\d.*?"', self.req.http.header, re.M):
                 pyfile.url = pyfile.url.rstrip('/')
-                pkgname = "/".join((pyfile.package().name, urlparse(pyfile.url).path.rpartition('/')[2]))
+                pkgname = "/".join(pyfile.package().name, urlparse(pyfile.url).path.rpartition('/')[2])
                 pyfile.url += '/'
                 self.req.http.c.setopt(48, 1)  # CURLOPT_DIRLISTONLY
                 response = self.load(pyfile.url, decode=False)
                 links = [pyfile.url + quote(x) for x in response.splitlines()]
                 self.logDebug("LINKS", links)
-                self.core.api.addPackage(pkgname, links, 1)
-                #self.core.files.addLinks(links, pyfile.package().id)
+                self.core.api.addPackage(pkgname, links)
             else:
                 self.fail("Unexpected server response")