at least its downloading now

6 files changed, 80 insertions, 68 deletions

diff --git a/module/FileDatabase.py b/module/FileDatabase.py
index 9e5417c75..818c6ed07 100644
--- a/module/FileDatabase.py
+++ b/module/FileDatabase.py
@@ -24,7 +24,6 @@ from shutil import move
 from threading import Lock
 from threading import RLock
 from threading import Thread
-from time import sleep
 from time import time
 import traceback
 
@@ -35,6 +34,7 @@ from module.PullEvents import UpdateEvent
 
 from module.PyPackage import PyPackage
 from module.PyFile import PyFile
+from module.PyFile import formatSize
 
 try:
     from pysqlite2 import dbapi2 as sqlite3
@@ -43,36 +43,6 @@ except:
 
 DB_VERSION = 2
 
-statusMap = {
-    "finished":    0,
-    "offline":     1,
-    "online":      2,
-    "queued":      3,
-    "checking":    4,
-    "waiting":     5,
-    "reconnected": 6,
-    "starting":    7,
-    "failed":      8,
-    "aborted":     9,
-    "decrypting":  10,
-    "custom":      11,
-    "downloading": 12,
-    "processing":  13,
-    "unknown":     14
-}
-
-def formatSize(size):
-    """formats size of bytes"""
-    size = int(size)
-    steps = 0
-    sizes = ["B", "KB", "MB", "GB", "TB"]
-
-    while size > 1000:
-        size /= 1024.0
-        steps += 1
-
-    return "%.2f %s" % (size, sizes[steps])
-
 ########################################################################
 class FileHandler:
     """Handles all request made to obtain information, 
diff --git a/module/PyFile.py b/module/PyFile.py
index bf72c6aba..62588e116 100644
--- a/module/PyFile.py
+++ b/module/PyFile.py
@@ -19,6 +19,7 @@
 
 from module.PullEvents import UpdateEvent
 from module.Progress import Progress
+
 from time import sleep
 from time import time
 
@@ -52,6 +53,7 @@ def formatSize(size):
 
     return "%.2f %s" % (size, sizes[steps])
 
+
 class PyFile():
     def __init__(self, manager, id, url, name, size, status, error, pluginname, package, order):
         self.m = manager
diff --git a/module/RequestFactory.py b/module/RequestFactory.py
index 9f93836f4..8bd27a275 100644
--- a/module/RequestFactory.py
+++ b/module/RequestFactory.py
@@ -19,6 +19,7 @@
 
 from threading import Lock
 from module.network.Request import Request
+from module.network.Browser import Browser
 from module.network.XdccRequest import XdccRequest
 from module.network.FtpRequest import FtpRequest
 from time import time
@@ -34,7 +35,7 @@ class RequestFactory():
     def getRequest(self, pluginName, account=None, type="HTTP"):
         self.lock.acquire()
         if type == "HTTP":
-            req = Request(interface=str(self.iface))
+            req = Browser()
             if account:
                 cj = self.getCookieJar(pluginName, account)
                 req.setCookieJar(cj)
diff --git a/module/network/Browser.py b/module/network/Browser.py
index d70cb3aba..3db2299f0 100644
--- a/module/network/Browser.py
+++ b/module/network/Browser.py
@@ -1,51 +1,73 @@
-from HTTPBase import HTTPBase
-from HTTPDownload import HTTPDownload
-from XDCCBase import XDCCDownload
-
 from random import randint
-
-import zlib
+from helper import *
+from os.path import join
+from logging import getLogger
 from cookielib import CookieJar
+import zlib
+
+from HTTPBase import HTTPBase
+from HTTPDownload import HTTPDownload
 from FTPBase import FTPDownload
+from XDCCBase import XDCCDownload
 
-class Browser():
+class Browser(object):
     def __init__(self, interface=None, cookieJar=CookieJar(), bucket=None, proxies={}):
+        self.log = getLogger("log")
+
         self.lastURL = None
         self.interface = interface
         self.cookieJar = cookieJar
         self.bucket = bucket
-        
+
         self.http = HTTPBase(interface=interface, proxies=proxies)
         self.setCookieJar(cookieJar)
         self.proxies = proxies
-    
+
     def setCookieJar(self, cookieJar):
         self.http.cookieJar = cookieJar
-    
+
+    def clearCookies(self):
+        pass #@TODO
+
     def clearReferer(self):
         self.lastURL = None
-    
+
     def getPage(self, url, get={}, post={}, referer=None, cookies=True, customHeaders={}):
         if not referer:
             referer = self.lastURL
         self.http.followRedirect = True
-        resp = self.http.getResponse(url, get=get, post=post, referer=referer, cookies=cookies, customHeaders=customHeaders)
+        resp = self.http.getResponse(url, get=get, post=post, referer=referer, cookies=cookies,
+                                     customHeaders=customHeaders)
         data = resp.read()
         try:
             if resp.info()["Content-Encoding"] == "gzip":
-                data = zlib.decompress(data, 16+zlib.MAX_WBITS)
+                data = zlib.decompress(data, 16 + zlib.MAX_WBITS)
             elif resp.info()["Content-Encoding"] == "deflate":
                 data = zlib.decompress(data, -zlib.MAX_WBITS)
         except:
             pass
+
+        try:
+            content_type = resp.info()["Content-Type"]
+            infos = [info.strip() for info in content_type.split(";")]
+            charset = None
+            for info in infos:
+                if info.startswith("charset"):
+                    none, charset = info.split("=")
+            if charset:
+                data = data.decode(charset)
+        except Exception, e:
+            self.log.debug("Could not decode charset: %s" % e)
+
         self.lastURL = resp.geturl()
         return data
-    
+
     def getRedirectLocation(self, url, get={}, post={}, referer=None, cookies=True, customHeaders={}):
         if not referer:
             referer = self.lastURL
         self.http.followRedirect = False
-        resp = self.http.getResponse(url, get=get, post=post, referer=referer, cookies=cookies, customHeaders=customHeaders)
+        resp = self.http.getResponse(url, get=get, post=post, referer=referer, cookies=cookies,
+                                     customHeaders=customHeaders)
         resp.close()
         self.lastURL = resp.geturl()
         location = None
@@ -54,26 +76,40 @@ class Browser():
         except:
             pass
         return location
-    
-    def httpDownload(self, url, filename, get={}, post={}, referer=None, cookies=True, customHeaders={}, chunks=1, resume=False):
+
+    def download(self, url, file_name, folder, get={}, post={}, ref=True, cookies=True, no_post_encode=False):
+        #@TODO
+
+        filename = join(folder, file_name)
+        d = self.httpDownload(url, filename, get, post)
+        waitFor(d)
+
+        return filename
+
+    def httpDownload(self, url, filename, get={}, post={}, referer=None, cookies=True, customHeaders={}, chunks=1,
+                     resume=False):
         if not referer:
             referer = self.lastURL
-        
-        dwnld = HTTPDownload(url, filename, get=get, post=post, referer=referer, cookies=cookies, customHeaders=customHeaders, bucket=self.bucket, interface=self.interface, proxies=self.proxies)
+
+        dwnld = HTTPDownload(url, filename, get=get, post=post, referer=referer, cookies=cookies,
+                             customHeaders=customHeaders, bucket=self.bucket, interface=self.interface,
+                             proxies=self.proxies)
         dwnld.cookieJar = self.cookieJar
-        
+
         d = dwnld.download(chunks=chunks, resume=resume)
         return d
-    
+
     def ftpDownload(self, url, filename, resume=False):
         dwnld = FTPDownload(url, filename, bucket=self.bucket, interface=self.interface, proxies=self.proxies)
-        
+
         d = dwnld.download(resume=resume)
         return d
-    
-    def xdccDownload(self, server, port, channel, bot, pack, filename, nick="pyload_%d" % randint(1000,9999), ident="pyload", real="pyloadreal"):
-        dwnld = XDCCDownload(server, port, channel, bot, pack, nick, ident, real, filename, bucket=self.bucket, interface=self.interface, proxies=self.proxies)
-        
+
+    def xdccDownload(self, server, port, channel, bot, pack, filename, nick="pyload_%d" % randint(1000, 9999),
+                     ident="pyload", real="pyloadreal"):
+        dwnld = XDCCDownload(server, port, channel, bot, pack, nick, ident, real, filename, bucket=self.bucket,
+                             interface=self.interface, proxies=self.proxies)
+
         d = dwnld.download()
         return d
 
@@ -86,8 +122,9 @@ if __name__ == "__main__":
     #print browser.getRedirectLocation("http://google.com/")
     #browser.getPage("https://encrypted.google.com/")
     #browser.getPage("http://google.com/search?q=bar")
-    
+
     browser.httpDownload("http://speedtest.netcologne.de/test_100mb.bin", "test_100mb.bin")
     from time import sleep
+
     while True:
         sleep(1)
\ No newline at end of file
diff --git a/module/network/HTTPDownload.py b/module/network/HTTPDownload.py
index 2b8c44a87..ebc8c8e65 100644
--- a/module/network/HTTPDownload.py
+++ b/module/network/HTTPDownload.py
@@ -105,7 +105,7 @@ class ChunkInfo():
 class WrappedHTTPDeferred(WrappedDeferred):
     pass
     
-class HTTPDownload():
+class HTTPDownload(object):
     def __init__(self, url, filename, get={}, post={}, referer=None, cookies=True, customHeaders={}, bucket=None, interface=None, proxies={}):
         self.url = url
         self.filename = filename
diff --git a/module/network/Request.py b/module/network/Request.py
index 9ac7d54aa..b0a8063ef 100755
--- a/module/network/Request.py
+++ b/module/network/Request.py
@@ -29,7 +29,7 @@ from module.plugins.Plugin import Abort
 from module.network.Browser import Browser
 from module.network.helper import waitFor
 
-class Request:
+class Request(object):
     def __init__(self, interface=None):
         self.browser = Browser(interface=interface)
         self.d = None
@@ -60,7 +60,8 @@ class Request:
         self.timeout = int(timeout)
     
     def setCookieJar(self, j):
-        self.cookieJar = j
+        #self.cookieJar = j
+        pass
     
     def addCookies(self):
         #@TODO
@@ -109,12 +110,6 @@ class Request:
             self.browser.clearReferer()
         
         self.d = self.browser.httpDownload(url, file_temp, get=get, post=post, cookies=cookies, chunks=1, resume=self.canContinue)
-        self.dl_time = property(lambda: self.d.startTime)
-        self.dl_finished = property(lambda: self.d.endTime)
-        self.dl_speed = property(lambda: self.d.speed)
-        self.dl_size = property(lambda: self.d.size)
-        self.dl = property(lambda: True if self.d.startTime and not self.d.endTime else False)
-        self.abort = property(self.d.getAbort, self.d.setAbort)
         
         waitFor(self.d)
         
@@ -132,6 +127,13 @@ class Request:
         
         return free_name
 
+    dl_time = property(lambda self: self.d.startTime)
+    dl_finished = property(lambda self: self.d.endTime)
+    dl_speed = property(lambda self: self.d.speed)
+    dl_size = property(lambda self: self.d.size)
+    dl = property(lambda self: True if self.d.startTime and not self.d.endTime else False)
+    abort = property(lambda self: self.d.getAbort, lambda self, value: self.d.setAbort(value))
+
     def get_speed(self):
         try:
             return self.dl_speed