Rev2059, Fix download test, boost priority on request by 15, Adjust default priorities

src/Config.py

@@ -10,7 +10,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.5.4"
-        self.rev = 2058
+        self.rev = 2059
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"

src/Test/TestSiteDownload.py

@@ -35,8 +35,8 @@ class TestSiteDownload:
             def boostRequest(inner_path):
                 # I really want these file
                 if inner_path == "index.html":
-                    site_temp.needFile("data/img/multiuser.png", priority=5, blocking=False)
-                    site_temp.needFile("data/img/direct_domains.png", priority=5, blocking=False)
+                    site_temp.needFile("data/img/multiuser.png", priority=15, blocking=False)
+                    site_temp.needFile("data/img/direct_domains.png", priority=15, blocking=False)
             site_temp.onFileDone.append(boostRequest)
             site_temp.download(blind_includes=True).join(timeout=5)
             file_requests = [request[2]["inner_path"] for request in requests if request[0] in ("getFile", "streamFile")]

src/Ui/UiRequest.py

@@ -389,7 +389,7 @@ class UiRequest(object):
                 if path_parts["inner_path"].endswith("favicon.ico"):  # Default favicon for all sites
                     return self.actionFile("src/Ui/media/img/favicon.ico")
 
-                result = site.needFile(path_parts["inner_path"], priority=5)  # Wait until file downloads
+                result = site.needFile(path_parts["inner_path"], priority=15)  # Wait until file downloads
                 if result:
                     return self.actionFile(file_path, header_length=header_length)
                 else:

src/Worker/WorkerManager.py

@@ -391,16 +391,16 @@ class WorkerManager(object):
         if "-default" in inner_path:
             return -4  # Default files are cloning not important
         elif inner_path.endswith(".css"):
-            return 17  # boost css files priority
+            return 13  # boost css files priority
         elif inner_path.endswith(".js"):
-            return 16  # boost js files priority
+            return 12  # boost js files priority
         elif inner_path.endswith("dbschema.json"):
-            return 15  # boost database specification
+            return 11  # boost database specification
         elif inner_path.endswith("content.json"):
             return 1  # boost included content.json files priority a bit
         elif inner_path.endswith(".json"):
-            if len(inner_path) < 50:  # Boost non-user json files more
-                return 14
+            if len(inner_path) < 50:  # Boost non-user json files
+                return 10
             else:
                 return 2
         return 0