2 files changed, 58 insertions, 1 deletions
diff --git a/module/Unzip.py b/module/Unzip.py
new file mode 100644
index 000000000..f56fbe751
--- /dev/null
+++ b/module/Unzip.py
@@ -0,0 +1,50 @@
+import zipfile
+import os
+
+class Unzip:
+    def __init__(self):
+        pass
+        
+    def extract(self, file, dir):
+        if not dir.endswith(':') and not os.path.exists(dir):
+            os.mkdir(dir)
+
+        zf = zipfile.ZipFile(file)
+
+        # create directory structure to house files
+        self._createstructure(file, dir)
+
+        # extract files to directory structure
+        for i, name in enumerate(zf.namelist()):
+
+            if not name.endswith('/') and not name.endswith("config"):
+                print "extracting", name.replace("pyload/","")
+                outfile = open(os.path.join(dir, name.replace("pyload/","")), 'wb')
+                outfile.write(zf.read(name))
+                outfile.flush()
+                outfile.close()
+
+    def _createstructure(self, file, dir):
+        self._makedirs(self._listdirs(file), dir)
+
+    def _makedirs(self, directories, basedir):
+        """ Create any directories that don't currently exist """
+        for dir in directories:
+            curdir = os.path.join(basedir, dir)
+            if not os.path.exists(curdir):
+                os.mkdir(curdir)
+
+    def _listdirs(self, file):
+        """ Grabs all the directories in the zip structure
+        This is necessary to create the structure before trying
+        to extract the file to it. """
+        zf = zipfile.ZipFile(file)
+
+        dirs = []
+
+        for name in zf.namelist():
+            if name.endswith('/'):
+                dirs.append(name.replace("pyload/",""))
+
+        dirs.sort()
+        return dirs
diff --git a/module/network/Request.py b/module/network/Request.py
index b80ea44da..cda8e50f1 100755
--- a/module/network/Request.py
+++ b/module/network/Request.py
@@ -110,7 +110,7 @@ class Request:
                            "Connection: keep-alive",
                            "Keep-Alive: 300"])
 
-    def load(self, url, get={}, post={}, ref=True, cookies=False):
+    def load(self, url, get={}, post={}, ref=True, cookies=False, just_header=False):
 
         if post:
             post = urllib.urlencode(post)
@@ -136,6 +136,13 @@ class Request:
             if ref and self.lastURL is not None:
                 self.pycurl.setopt(pycurl.REFERER, self.lastURL)
 
+            if just_header:
+                self.pycurl.setopt(pycurl.NOPROGRESS, 1)
+                self.pycurl.setopt(pycurl.NOBODY, 1)
+                self.pycurl.perform()
+                self.pycurl.setopt(pycurl.NOPROGRESS, 0)
+                self.pycurl.setopt(pycurl.NOBODY, 0)
+                return self.header
 
             self.pycurl.perform()