From d898ba93333d1427ee3fe45c75aaba6dac4f123b Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Fri, 4 Sep 2015 14:55:47 +0100
Subject: [PATCH] [WebUI] Refactor server.get_scripts

 * The directory list is now sorted so will always produce the same output.
 * Code is now shared with minify script, with some minor changes.
---
 deluge/ui/web/server.py | 60 +++++++++++++++++++----------------------
 minify_web_js.py        | 29 ++++++++------------
 2 files changed, 39 insertions(+), 50 deletions(-)

diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py
index 512e79a66..283e9ff64 100644
--- a/deluge/ui/web/server.py
+++ b/deluge/ui/web/server.py
@@ -320,54 +320,50 @@ class ScriptResource(resource.Resource, component.Component):
         :keyword type: The type of scripts to get (normal, debug, dev)
         :param type: string
         """
-        scripts = []
         if type not in ("dev", "debug", "normal"):
             type = 'normal'
 
         _scripts = self.__scripts[type]["scripts"]
         _order = self.__scripts[type]["order"]
 
+        scripts = []
         for path in _order:
-            filepath = _scripts[path]
+            # Index for grouping the scripts when inserting.
+            script_idx = len(scripts)
+            # A folder resource is enclosed in a tuple.
+            if isinstance(_scripts[path], tuple):
+                filepath, recurse = _scripts[path]
+                for root, dirnames, filenames in os.walk(filepath):
+                    dirnames.sort(reverse=True)
+                    files = fnmatch.filter(filenames, "*.js")
+                    files.sort()
 
-            # this is a folder
-            if isinstance(filepath, tuple):
-                filepath, recurse = filepath
-                if recurse:
-                    for dirpath, dirnames, filenames in os.walk(filepath, False):
-                        files = fnmatch.filter(filenames, "*.js")
-                        files.sort()
+                    order_file = os.path.join(root, ".order")
+                    if os.path.isfile(order_file):
+                        with open(order_file, "r") as _file:
+                            for line in _file:
+                                if line.startswith("+ "):
+                                    order_filename = line.split()[1]
+                                    files.pop(files.index(order_filename))
+                                    files.insert(0, order_filename)
 
-                        order_file = os.path.join(dirpath, '.order')
-                        if os.path.isfile(order_file):
-                            for line in open(order_file, 'rb'):
-                                line = line.strip()
-                                if not line or line[0] == '#':
-                                    continue
-                                try:
-                                    pos, filename = line.split()
-                                    files.pop(files.index(filename))
-                                    if pos == '+':
-                                        files.insert(0, filename)
-                                    else:
-                                        files.append(filename)
-                                except:
-                                    pass
+                    # Ensure sub-directory scripts are top of list with root directory scripts bottom.
+                    if dirnames:
+                        scripts.extend(["js/" + os.path.basename(root) + "/" + f for f in files])
+                    else:
+                        dirpath = os.path.basename(os.path.dirname(root)) + "/" + os.path.basename(root)
+                        for filename in reversed(files):
+                            scripts.insert(script_idx, "js/" + dirpath + "/" + filename)
 
-                        dirpath = dirpath[len(filepath) + 1:]
-                        if dirpath:
-                            scripts.extend(['js/' + path + '/' + dirpath + '/' + f for f in files])
-                        else:
-                            scripts.extend(['js/' + path + '/' + f for f in files])
-                else:
-                    files = fnmatch.filter(os.listdir('.'), "*.js")
+                    if not recurse:
+                        break
             else:
                 scripts.append("js/" + path)
         return scripts
 
     def getChild(self, path, request):  # NOQA
         if hasattr(request, "lookup_path"):
-            request.lookup_path += '/' + path
+            request.lookup_path += "/" + path
         else:
             request.lookup_path = path
         return self
diff --git a/minify_web_js.py b/minify_web_js.py
index fed4b2d44..a7dc665f5 100755
--- a/minify_web_js.py
+++ b/minify_web_js.py
@@ -46,35 +46,28 @@ else:
 
 
 def source_files_list(source_dir):
-
-    src_file_list = []
-
+    scripts = []
     for root, dirnames, filenames in os.walk(source_dir):
         dirnames.sort(reverse=True)
-        filenames_js = fnmatch.filter(filenames, '*.js')
-        filenames_js.sort()
+        files = fnmatch.filter(filenames, '*.js')
+        files.sort()
 
         order_file = os.path.join(root, '.order')
         if os.path.isfile(order_file):
             with open(order_file, 'r') as _file:
                 for line in _file:
-                    line = line.strip()
-                    if not line or line[0] == '#':
-                        continue
-                    order_pos, order_filename = line.split()
-                    filenames_js.pop(filenames_js.index(order_filename))
-                    if order_pos == '+':
-                        filenames_js.insert(0, order_filename)
+                    if line.startswith('+ '):
+                        order_filename = line.split()[1]
+                        files.pop(files.index(order_filename))
+                        files.insert(0, order_filename)
 
         # Ensure root directory files are bottom of list.
         if dirnames:
-            for filename in filenames_js:
-                src_file_list.append(os.path.join(root, filename))
+            scripts.extend([os.path.join(root, f) for f in files])
         else:
-            for filename in reversed(filenames_js):
-                src_file_list.insert(0, os.path.join(root, filename))
-
-    return src_file_list
+            for filename in reversed(files):
+                scripts.insert(0, os.path.join(root, filename))
+    return scripts
 
 
 def concat_src_files(file_list, fileout_path):