Changeset 1043

Timestamp:

12/29/09 07:40:52 (8 months ago)

Author:

gazpachoking

Message:

Implements gzip handling from #292 fixes #292 #345

Location:

trunk/flexget/plugins

Files:

• output_deluge.py (modified) (1 diff)
• output_download.py (modified) (3 diffs)

trunk/flexget/plugins/output_deluge.py

@@ -289 +289 @@
             def on_fail(result, feed, entry):
                 log.info("%s was not added to deluge! %s" % (entry['title'], result))
-                # TODO: Need to figure out how to fail entries properly from here.
                 feed.fail(entry, "Could not be added to deluge")
 

trunk/flexget/plugins/output_download.py

@@ -6 +6 @@
 import shutil
 import filecmp
+import zlib
 from flexget.plugin import *
 from sqlalchemy import Column, String, Integer, DateTime
@@ -177 +178 @@
         mimetype = f.headers.gettype()
 
+        if f.headers.get('content-encoding') in ('gzip', 'x-gzip', 'deflate'):
+            decompressor = zlib.decompressobj(15 + 32)
+        else:
+            decompressor = None
+
         # generate temp file, with random md5 sum .. 
         # url alone is not random enough, it has happened that there are two entries with same url
@@ -194 +200 @@
         try:
             while 1:
-                data = f.read(buffer_size)
+                if decompressor:
+                    data = decompressor.decompress(f.read(buffer_size))
+                else:
+                    data = f.read(buffer_size)
                 if not data:
                     log.debug('wrote file %s' % datafile)