49 files changed, 27 insertions, 50 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 331d13144..9d2cf98f9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -58,10 +58,17 @@ copyright = u'2011, pyLoad Team'
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-# The short X.Y version.
-version = '0.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.8'
+""" [[[cog
+from pavement import options
+v = options.version.split(".")
+cog.outl("version = '%s'" % ".".join(v[:2]))
+cog.outl("release = '%s'" % ".".join(v))
+]]]"""
+version = '0.4'
+release = '0.4.9'
+# [[[end]]]
+
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/locale/cs/LC_MESSAGES/django.mo b/locale/cs/LC_MESSAGES/django.mo
index 7889c0e50..3d771c127 100755..100644
--- a/locale/cs/LC_MESSAGES/django.mo
+++ b/locale/cs/LC_MESSAGES/django.mo
diff --git a/locale/cs/LC_MESSAGES/pyLoad.mo b/locale/cs/LC_MESSAGES/pyLoad.mo
index 421570b2e..a0c01d4e9 100755..100644
--- a/locale/cs/LC_MESSAGES/pyLoad.mo
+++ b/locale/cs/LC_MESSAGES/pyLoad.mo
diff --git a/locale/cs/LC_MESSAGES/pyLoadCli.mo b/locale/cs/LC_MESSAGES/pyLoadCli.mo
index 70ac7298c..6f8b94b67 100755..100644
--- a/locale/cs/LC_MESSAGES/pyLoadCli.mo
+++ b/locale/cs/LC_MESSAGES/pyLoadCli.mo
diff --git a/locale/cs/LC_MESSAGES/pyLoadGui.mo b/locale/cs/LC_MESSAGES/pyLoadGui.mo
index 57c55ed78..c913703f1 100755..100644
--- a/locale/cs/LC_MESSAGES/pyLoadGui.mo
+++ b/locale/cs/LC_MESSAGES/pyLoadGui.mo
diff --git a/locale/cs/LC_MESSAGES/setup.mo b/locale/cs/LC_MESSAGES/setup.mo
index d6345e871..786cad671 100755..100644
--- a/locale/cs/LC_MESSAGES/setup.mo
+++ b/locale/cs/LC_MESSAGES/setup.mo
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index 5bfaf2ed2..017f373dc 100755..100644
--- a/locale/de/LC_MESSAGES/django.mo
+++ b/locale/de/LC_MESSAGES/django.mo
diff --git a/locale/de/LC_MESSAGES/pyLoad.mo b/locale/de/LC_MESSAGES/pyLoad.mo
index d8f88dd43..e1e29cebc 100755..100644
--- a/locale/de/LC_MESSAGES/pyLoad.mo
+++ b/locale/de/LC_MESSAGES/pyLoad.mo
diff --git a/locale/de/LC_MESSAGES/pyLoadCli.mo b/locale/de/LC_MESSAGES/pyLoadCli.mo
index e46503121..e46503121 100755..100644
--- a/locale/de/LC_MESSAGES/pyLoadCli.mo
+++ b/locale/de/LC_MESSAGES/pyLoadCli.mo
diff --git a/locale/de/LC_MESSAGES/pyLoadGui.mo b/locale/de/LC_MESSAGES/pyLoadGui.mo
index 1b8c49545..8ead8383c 100755..100644
--- a/locale/de/LC_MESSAGES/pyLoadGui.mo
+++ b/locale/de/LC_MESSAGES/pyLoadGui.mo
diff --git a/locale/de/LC_MESSAGES/setup.mo b/locale/de/LC_MESSAGES/setup.mo
index 296c1af14..80ca3553e 100755..100644
--- a/locale/de/LC_MESSAGES/setup.mo
+++ b/locale/de/LC_MESSAGES/setup.mo
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index cbf0b84e3..899597735 100755..100644
--- a/locale/es/LC_MESSAGES/django.mo
+++ b/locale/es/LC_MESSAGES/django.mo
diff --git a/locale/es/LC_MESSAGES/pyLoad.mo b/locale/es/LC_MESSAGES/pyLoad.mo
index af7a8d103..90aa70f1d 100755..100644
--- a/locale/es/LC_MESSAGES/pyLoad.mo
+++ b/locale/es/LC_MESSAGES/pyLoad.mo
diff --git a/locale/es/LC_MESSAGES/pyLoadCli.mo b/locale/es/LC_MESSAGES/pyLoadCli.mo
index 0557e9903..f969ad0d1 100755..100644
--- a/locale/es/LC_MESSAGES/pyLoadCli.mo
+++ b/locale/es/LC_MESSAGES/pyLoadCli.mo
diff --git a/locale/es/LC_MESSAGES/pyLoadGui.mo b/locale/es/LC_MESSAGES/pyLoadGui.mo
index 4df97803c..a4944783f 100755..100644
--- a/locale/es/LC_MESSAGES/pyLoadGui.mo
+++ b/locale/es/LC_MESSAGES/pyLoadGui.mo
diff --git a/locale/es/LC_MESSAGES/setup.mo b/locale/es/LC_MESSAGES/setup.mo
index 8c134802f..87c4dd811 100755..100644
--- a/locale/es/LC_MESSAGES/setup.mo
+++ b/locale/es/LC_MESSAGES/setup.mo
diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index 1527be56a..b7b2a3fb5 100755..100644
--- a/locale/fr/LC_MESSAGES/django.mo
+++ b/locale/fr/LC_MESSAGES/django.mo
diff --git a/locale/fr/LC_MESSAGES/pyLoad.mo b/locale/fr/LC_MESSAGES/pyLoad.mo
index 3ea85094a..95fd73cae 100755..100644
--- a/locale/fr/LC_MESSAGES/pyLoad.mo
+++ b/locale/fr/LC_MESSAGES/pyLoad.mo
diff --git a/locale/fr/LC_MESSAGES/pyLoadCli.mo b/locale/fr/LC_MESSAGES/pyLoadCli.mo
index 460641599..460641599 100755..100644
--- a/locale/fr/LC_MESSAGES/pyLoadCli.mo
+++ b/locale/fr/LC_MESSAGES/pyLoadCli.mo
diff --git a/locale/fr/LC_MESSAGES/pyLoadGui.mo b/locale/fr/LC_MESSAGES/pyLoadGui.mo
index 321f59aac..001412ddf 100755..100644
--- a/locale/fr/LC_MESSAGES/pyLoadGui.mo
+++ b/locale/fr/LC_MESSAGES/pyLoadGui.mo
diff --git a/locale/fr/LC_MESSAGES/setup.mo b/locale/fr/LC_MESSAGES/setup.mo
index 0e921923c..89cb21969 100755..100644
--- a/locale/fr/LC_MESSAGES/setup.mo
+++ b/locale/fr/LC_MESSAGES/setup.mo
diff --git a/locale/it/LC_MESSAGES/django.mo b/locale/it/LC_MESSAGES/django.mo
index 9c8495c33..57858c8a6 100755..100644
--- a/locale/it/LC_MESSAGES/django.mo
+++ b/locale/it/LC_MESSAGES/django.mo
diff --git a/locale/it/LC_MESSAGES/pyLoad.mo b/locale/it/LC_MESSAGES/pyLoad.mo
index 63497824a..07b1c01c5 100755..100644
--- a/locale/it/LC_MESSAGES/pyLoad.mo
+++ b/locale/it/LC_MESSAGES/pyLoad.mo
diff --git a/locale/it/LC_MESSAGES/pyLoadCli.mo b/locale/it/LC_MESSAGES/pyLoadCli.mo
index 158fd317a..158fd317a 100755..100644
--- a/locale/it/LC_MESSAGES/pyLoadCli.mo
+++ b/locale/it/LC_MESSAGES/pyLoadCli.mo
diff --git a/locale/it/LC_MESSAGES/pyLoadGui.mo b/locale/it/LC_MESSAGES/pyLoadGui.mo
index 99acfd3d5..cd1cbdf73 100755..100644
--- a/locale/it/LC_MESSAGES/pyLoadGui.mo
+++ b/locale/it/LC_MESSAGES/pyLoadGui.mo
diff --git a/locale/it/LC_MESSAGES/setup.mo b/locale/it/LC_MESSAGES/setup.mo
index 79eb3b189..e13b99bc9 100755..100644
--- a/locale/it/LC_MESSAGES/setup.mo
+++ b/locale/it/LC_MESSAGES/setup.mo
diff --git a/locale/nl/LC_MESSAGES/pyLoad.mo b/locale/nl/LC_MESSAGES/pyLoad.mo
index bbaf45adf..7c52dee71 100755..100644
--- a/locale/nl/LC_MESSAGES/pyLoad.mo
+++ b/locale/nl/LC_MESSAGES/pyLoad.mo
diff --git a/locale/nl/LC_MESSAGES/pyLoadCli.mo b/locale/nl/LC_MESSAGES/pyLoadCli.mo
index c414cfea4..c414cfea4 100755..100644
--- a/locale/nl/LC_MESSAGES/pyLoadCli.mo
+++ b/locale/nl/LC_MESSAGES/pyLoadCli.mo
diff --git a/locale/nl/LC_MESSAGES/pyLoadGui.mo b/locale/nl/LC_MESSAGES/pyLoadGui.mo
index 26a9100b8..8bbc9385f 100755..100644
--- a/locale/nl/LC_MESSAGES/pyLoadGui.mo
+++ b/locale/nl/LC_MESSAGES/pyLoadGui.mo
diff --git a/locale/pl/LC_MESSAGES/django.mo b/locale/pl/LC_MESSAGES/django.mo
index 3b109b550..fae662552 100755..100644
--- a/locale/pl/LC_MESSAGES/django.mo
+++ b/locale/pl/LC_MESSAGES/django.mo
diff --git a/locale/pl/LC_MESSAGES/pyLoad.mo b/locale/pl/LC_MESSAGES/pyLoad.mo
index 5f5357983..31ea1e162 100755..100644
--- a/locale/pl/LC_MESSAGES/pyLoad.mo
+++ b/locale/pl/LC_MESSAGES/pyLoad.mo
diff --git a/locale/pl/LC_MESSAGES/pyLoadCli.mo b/locale/pl/LC_MESSAGES/pyLoadCli.mo
index 565f26e3a..565f26e3a 100755..100644
--- a/locale/pl/LC_MESSAGES/pyLoadCli.mo
+++ b/locale/pl/LC_MESSAGES/pyLoadCli.mo
diff --git a/locale/pl/LC_MESSAGES/pyLoadGui.mo b/locale/pl/LC_MESSAGES/pyLoadGui.mo
index 66e44aae6..bbfcb176e 100755..100644
--- a/locale/pl/LC_MESSAGES/pyLoadGui.mo
+++ b/locale/pl/LC_MESSAGES/pyLoadGui.mo
diff --git a/locale/pl/LC_MESSAGES/setup.mo b/locale/pl/LC_MESSAGES/setup.mo
index fd5cbf0f9..c8303602c 100755..100644
--- a/locale/pl/LC_MESSAGES/setup.mo
+++ b/locale/pl/LC_MESSAGES/setup.mo
diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo
index c44484b2e..2fdf540b0 100755..100644
--- a/locale/pt_BR/LC_MESSAGES/django.mo
+++ b/locale/pt_BR/LC_MESSAGES/django.mo
diff --git a/locale/pt_BR/LC_MESSAGES/pyLoad.mo b/locale/pt_BR/LC_MESSAGES/pyLoad.mo
index 18733dea3..2e8a1e5b3 100755..100644
--- a/locale/pt_BR/LC_MESSAGES/pyLoad.mo
+++ b/locale/pt_BR/LC_MESSAGES/pyLoad.mo
diff --git a/locale/pt_BR/LC_MESSAGES/pyLoadCli.mo b/locale/pt_BR/LC_MESSAGES/pyLoadCli.mo
index 9415ee797..2ca834196 100755..100644
--- a/locale/pt_BR/LC_MESSAGES/pyLoadCli.mo
+++ b/locale/pt_BR/LC_MESSAGES/pyLoadCli.mo
diff --git a/locale/pt_BR/LC_MESSAGES/pyLoadGui.mo b/locale/pt_BR/LC_MESSAGES/pyLoadGui.mo
index 0cce0ff5a..28fe26252 100755..100644
--- a/locale/pt_BR/LC_MESSAGES/pyLoadGui.mo
+++ b/locale/pt_BR/LC_MESSAGES/pyLoadGui.mo
diff --git a/locale/pt_BR/LC_MESSAGES/setup.mo b/locale/pt_BR/LC_MESSAGES/setup.mo
index a6a04e9ac..c64d0f23c 100755..100644
--- a/locale/pt_BR/LC_MESSAGES/setup.mo
+++ b/locale/pt_BR/LC_MESSAGES/setup.mo
diff --git a/locale/ru/LC_MESSAGES/django.mo b/locale/ru/LC_MESSAGES/django.mo
index db3df29c8..0a1394f21 100755..100644
--- a/locale/ru/LC_MESSAGES/django.mo
+++ b/locale/ru/LC_MESSAGES/django.mo
diff --git a/locale/ru/LC_MESSAGES/pyLoad.mo b/locale/ru/LC_MESSAGES/pyLoad.mo
index 2e4813beb..156a1bc44 100755..100644
--- a/locale/ru/LC_MESSAGES/pyLoad.mo
+++ b/locale/ru/LC_MESSAGES/pyLoad.mo
diff --git a/locale/ru/LC_MESSAGES/pyLoadCli.mo b/locale/ru/LC_MESSAGES/pyLoadCli.mo
index 7c43a8865..adbb5e141 100755..100644
--- a/locale/ru/LC_MESSAGES/pyLoadCli.mo
+++ b/locale/ru/LC_MESSAGES/pyLoadCli.mo
diff --git a/locale/ru/LC_MESSAGES/pyLoadGui.mo b/locale/ru/LC_MESSAGES/pyLoadGui.mo
index 998faf9b6..11d4328c0 100755..100644
--- a/locale/ru/LC_MESSAGES/pyLoadGui.mo
+++ b/locale/ru/LC_MESSAGES/pyLoadGui.mo
diff --git a/locale/ru/LC_MESSAGES/setup.mo b/locale/ru/LC_MESSAGES/setup.mo
index 237d26e59..fb1201628 100755..100644
--- a/locale/ru/LC_MESSAGES/setup.mo
+++ b/locale/ru/LC_MESSAGES/setup.mo
diff --git a/module/config/default.conf b/module/config/default.conf
index b63a06b4c..335ca10fe 100644
--- a/module/config/default.conf
+++ b/module/config/default.conf
@@ -24,7 +24,7 @@ log - "Log":
 	int log_size : "Size in kb" = 100
 	bool log_rotate : "Log Rotate" = True
 general - "General":
-	en;de;fr;it;es;nl;sv;ru;pl;cs;pt_BR language : "Language" = en
+	en;de;fr;it;es;nl;sv;ru;pl;cs;sr;pt_BR language : "Language" = en
 	folder download_folder : "Download Folder" = Downloads
 	bool debug_mode : "Debug Mode" = False
 	bool checksum : "Use Checksum" = False
diff --git a/module/database/FileDatabase.py b/module/database/FileDatabase.py
index d4514c710..f1c917b0a 100644
--- a/module/database/FileDatabase.py
+++ b/module/database/FileDatabase.py
@@ -194,7 +194,6 @@ class FileHandler:
         e = RemoveEvent("file", id, "collector" if not f.package().queue else "queue")
         
         oldorder = f.order
-        package = f.package
 
         if id in self.core.threadManager.processingIds():
             self.cache[id].abortDownload()
@@ -212,7 +211,7 @@ class FileHandler:
                         
         pyfiles = self.cache.values()
         for pyfile in pyfiles:
-            if pyfile.packageid == package and pyfile.order > oldorder:
+            if pyfile.packageid == pid and pyfile.order > oldorder:
                 pyfile.order -= 1
                 pyfile.notifyChange()
 
@@ -576,11 +575,6 @@ class FileHandler:
         """ restart all failed links """
         self.db.restartFailed()
 
-    @lock
-    @change
-    def fixPackageOrder(self, queue=0):
-        self.db.fixPackageOrder(queue)
-
 class FileMethods():
     @style.queue
     def filecount(self, queue):
@@ -883,41 +877,10 @@ class FileMethods():
         self.c.execute("DELETE FROM links WHERE status IN (0,4)")
         self.c.execute("DELETE FROM packages WHERE NOT EXISTS(SELECT 1 FROM links WHERE packages.id=links.package)")
 
-
     @style.queue
     def restartFailed(self):
         self.c.execute("UPDATE links SET status=3,error='' WHERE status IN (8, 9)")
 
-
-    @style.queue
-    def fixPackageOrder(self, queue=0):
-        found = 0
-        order = 0
-        i = 0
-        self.c.execute("SELECT count(*) FROM packages WHERE queue = ?", (queue, ))
-        count = self.c.fetchone()[0]
-        if count == 0:
-            return
-        while order < count:
-            self.c.execute("SELECT id FROM packages WHERE packageorder = ? AND queue = ?", (i, queue))
-            all = self.c.fetchall()
-            if len(all) == 0:
-                i += 1
-            elif len(all) == 1:
-                self.c.execute("UPDATE packages SET packageorder=? WHERE id = ?", (order,  all[0][0]))
-                order += 1
-                i += 1
-            elif len(all) > 1:
-                self.c.execute("UPDATE packages SET packageorder=? WHERE id = ?", (order,  all[0][0]))
-                order += 1
-                i += len(all)
-                del all[0]
-                self.c.execute("UPDATE packages SET packageorder=packageorder+? WHERE packageorder >= ? AND queue=?", (len(all), order,  queue))
-                for r in all:
-                    self.c.execute("UPDATE packages SET packageorder=? WHERE id = ?", order, r[0])
-                    order += 1
-
-
     @style.queue
     def findDuplicates(self, id, folder, filename):
         """ checks if filename exists with different id and same package """
diff --git a/module/setup.py b/module/setup.py
index 85b33b1ee..91153fc82 100644
--- a/module/setup.py
+++ b/module/setup.py
@@ -454,9 +454,9 @@ class Setup():
             info += ")"
         elif bool:
             if default == self.yes:
-                info = _("[y]/n")
+                info = "([%s]/%s)" % (self.yes, self.no)
             else:
-                info = _("y/[n]")
+                info = "(%s/[%s])" % (self.yes, self.no)
         else:
             info = "[%s]" % default
 
@@ -488,7 +488,12 @@ class Setup():
                     print _("Passwords did not match.").decode("utf-8")
 
         while True:
-            input = raw_input(qst + " %s: " % info)
+            try:
+                input = raw_input(qst + " %s: " % info)
+            except KeyboardInterrupt:
+                print "\nSetup interrupted"
+                exit()
+
             input = input.decode(sys.stdin.encoding)
 
             if input.strip() == "":
@@ -496,10 +501,10 @@ class Setup():
 
             if bool:
                 # yes, true,t are inputs for booleans with value true
-                if input.lower().strip() in [self.yes, _("yes"), _("true"), _("t")]:
+                if input.lower().strip() in [self.yes, _("yes"), _("true"), _("t"), "yes"]:
                     return True
                 # no, false,f are inputs for booleans with value false
-                elif input.lower().strip() in [self.no, _("no"), _("false"), _("f")]:
+                elif input.lower().strip() in [self.no, _("no"), _("false"), _("f"), "no"]:
                     return False
                 else:
                     print _("Invalid Input")
diff --git a/pavement.py b/pavement.py
index e2ac10b81..cd52b6f1a 100644
--- a/pavement.py
+++ b/pavement.py
@@ -3,6 +3,7 @@
 
 from paver.easy import *
 from paver.setuputils import setup
+from paver.doctools import cog
 
 import sys
 import re
@@ -83,6 +84,9 @@ options(
         dir="env",
         python="python2",
         virtual="virtualenv2",
+    ),
+    cog=Bunch(
+    	pattern="*.py",
     )
 )
 
@@ -91,6 +95,7 @@ xargs = ["--from-code=utf-8", "--copyright-holder=pyLoad Team", "--package-name=
          "--package-version=%s" % options.version, "--msgid-bugs-address='bugs@pyload.org'"]
 
 @task
+@needs('cog')
 def html():
     """Build html documentation"""
     module = path("docs") / "module"
diff --git a/pyLoadCore.py b/pyLoadCore.py
index bada63e55..99d8642bd 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -472,9 +472,6 @@ class Core(object):
 
         self.files = FileHandler(self)
         self.db.manager = self.files #ugly?
-        
-        self.files.fixPackageOrder(0)
-        self.files.fixPackageOrder(1)
 
     def init_webserver(self):
         if self.config['webinterface']['activated']: