storm/bragi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Web Interface] Fix directory listing

Browse Source 
- fixes not displaying files of top level directory
- fixes duplicate sub-directory listings
This commit is contained in:
Fabian Würfl
2018-05-21 12:29:05 +02:00
parent 6beed76ba5
commit f45aa6c712
2 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
templates/index.html
View File

@ -1,6 +1,6 @@
{% macro dirlisting(path='') -%}
{% macro dirlisting(dir, path='') -%}
<ul>
{% for subdirname in music_library.get_subdirs(path) %}
{% for subdirname, subdirobj in dir.get_subdirs().items() %}
{%- set subdirpath = path + subdirname + '/' %}
<li class="directory">
<span>{{ subdirname }}/&nbsp;</span>
@ -17,31 +17,24 @@
<input type="submit" value="Download entire directory">
</form>
</li>
{%- set subdirs = music_library.get_subdirs(subdirpath) %}
{%- if subdirs %}
{%- for subdir in subdirs %}
{{- dirlisting(subdirpath) -}}
{%- endfor %}
{%- endif %}
<ul>
{%- set files = music_library.get_files(subdirpath) %}
{%- if files %}
{% for file in files %}
<li class="file">
<form method="post" class="file file_add">
<input type="text" value="{{ subdirpath }}{{ file }}" name="add_file" hidden>
<input type="submit" value="Add">
</form>
<form action="./download" method="get" class="file file_download">
<input type="text" value="{{ subdirpath }}{{ file }}" name="file" hidden>
<input type="submit" value="Download">
&nbsp;{{ file }}
</form>
</li>
{% endfor %}
{%- endif %}
</ul>
{{- dirlisting(subdirobj, subdirpath) -}}
{% endfor %}
{%- set files = dir.get_files() %}
{%- if files %}
{% for file in files %}
<li class="file">
<form method="post" class="file file_add">
<input type="text" value="{{ subdirpath }}{{ file }}" name="add_file" hidden>
<input type="submit" value="Add">
</form>
<form action="./download" method="get" class="file file_download">
<input type="text" value="{{ subdirpath }}{{ file }}" name="file" hidden>
<input type="submit" value="Download">
&nbsp;{{ file }}
</form>
</li>
{% endfor %}
{%- endif %}
</ul>
{%- endmacro %}
@ -101,7 +94,7 @@
<input type="submit" value="Download entire music library">
</form>
<br />
{{ dirlisting() }}
{{ dirlisting(music_library) }}
</div>

1
util.py
View File

@ -84,6 +84,7 @@ class Dir(object):
if subdir in self.subdirs:
searchpath = '/'.join(path.split('/')[1::])
subdirs = self.subdirs[subdir].get_subdirs(searchpath)
subdirs = list(map(lambda subsubdir: os.path.join(subdir, subsubdir), subdirs))
else:
subdirs = self.subdirs