mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-09 18:08:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[WebUI] Refactor server.get_scripts

Browse source 
* The directory list is now sorted so will always produce the same output.
 * Code is now shared with minify script, with some minor changes.
This commit is contained in:
Calum Lind 2015-09-04 14:55:47 +01:00
commit d898ba9333
2 changed files with 39 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

29
minify_web_js.py
View file

@ -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):