pyLoad 0.3

9 files changed, 8 insertions, 16 deletions

diff --git a/module/file_list.py b/module/file_list.py
index 4e69bfdef..1c4c4776b 100644
--- a/module/file_list.py
+++ b/module/file_list.py
@@ -29,6 +29,7 @@ import cPickle
 import re
 import module.Plugin
 from operator import concat
+from operator import attrgetter
 from os import sep
 from time import sleep
 
@@ -150,10 +151,7 @@ class File_List(object):
         return info
     
     def continueAborted(self):
-        for pypack in self.data["queue"]:
-            for pyfile in pypack.files:
-                if pyfile.status.type == "aborted":
-                    self.packager.resetFileStatus(pyfile.id)
+        [[self.packager.resetFileStatus(x.id) for x in p.files if x.status.type == "aborted"] for p in self.data["queue"]]
     
     class pyLoadCollector():
         def __init__(collector, file_list):
@@ -176,8 +174,7 @@ class File_List(object):
             for pypack in (collector.file_list.data["packages"] + collector.file_list.data["queue"]):
                 for pyf in pypack.files:
                     ids.append(pyf.id)
-            for pyfile in collector.file_list.data["collector"]:
-                ids.append(pyfile.id)
+            ids += map(attrgetter("id"), collector.file_list.data["collector"])
             id = 1
             while id in ids:
                 id += 1
@@ -241,9 +238,8 @@ class File_List(object):
             """
                 returns a free id
             """
-            ids = []
-            for pypack in (packager.file_list.data["packages"] + packager.file_list.data["queue"]):
-                ids.append(pypack.data["id"])
+            ids = [ pypack.data["id"] for pypack in packager.file_list.data["packages"] + packager.file_list.data["queue"]]
+            
             id = 1
             while id in ids:
                 id += 1
@@ -347,9 +343,8 @@ class File_List(object):
         
         def getPackageFiles(packager, id):
             key, n, pypack = packager._getPackageFromID(id)
-            ids = []
-            for pyfile in pypack.files:
-                ids.append(pyfile.id)
+            ids = map(attrgetter("id"), pypack.files)
+            
             return ids
         
         def addFileToPackage(packager, id, pyfile):
diff --git a/module/web/media/default/img/status_None.png b/module/web/media/default/img/status_None.png
new file mode 100644
index 000000000..293b13f77
--- /dev/null
+++ b/module/web/media/default/img/status_None.png
diff --git a/module/web/media/default/img/stop.png b/module/web/media/default/img/status_aborted.png
index 0cfd58596..0cfd58596 100644
--- a/module/web/media/default/img/stop.png
+++ b/module/web/media/default/img/status_aborted.png
diff --git a/module/web/media/default/img/clock_play.png b/module/web/media/default/img/status_downloading.png
index fb4ebc850..fb4ebc850 100644
--- a/module/web/media/default/img/clock_play.png
+++ b/module/web/media/default/img/status_downloading.png
diff --git a/module/web/media/default/img/status_failed.png b/module/web/media/default/img/status_failed.png
new file mode 100644
index 000000000..0cfd58596
--- /dev/null
+++ b/module/web/media/default/img/status_failed.png
diff --git a/module/web/media/default/img/accept.png b/module/web/media/default/img/status_finished.png
index 89c8129a4..89c8129a4 100644
--- a/module/web/media/default/img/accept.png
+++ b/module/web/media/default/img/status_finished.png
diff --git a/module/web/media/default/img/clock_red.png b/module/web/media/default/img/status_waiting.png
index 2842cc338..2842cc338 100644
--- a/module/web/media/default/img/clock_red.png
+++ b/module/web/media/default/img/status_waiting.png
diff --git a/module/web/media/img/favicon.ico b/module/web/media/img/favicon.ico
new file mode 100644
index 000000000..58b1f4b89
--- /dev/null
+++ b/module/web/media/img/favicon.ico
diff --git a/module/web/pyload/views.py b/module/web/pyload/views.py
index d72dca56c..ea9d5f1be 100644
--- a/module/web/pyload/views.py
+++ b/module/web/pyload/views.py
@@ -75,10 +75,7 @@ def home(request):
 def queue(request):
     queue = settings.PYLOAD.get_queue()
     for pack in queue:
-        children = []
-        for child in settings.PYLOAD.get_package_files(pack["id"]):
-            children.append(settings.PYLOAD.get_file_info(child))
-        pack["children"] = children
+        pack["children"] = map(settings.PYLOAD.get_file_info, settings.PYLOAD.get_package_files(pack["id"]))
     return render_to_response(join(settings.TEMPLATE, 'queue.html'), RequestContext(request, {'content': queue}, [status_proc]))