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

impl multiCollapse and fileupload

Browse Source
This commit is contained in:
神楽坂·喵
2019-11-22 10:51:23 +08:00
parent 0aea5026e8
commit cddf252db9
2 changed files with 100 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
interface.py
View File

@@ -122,6 +122,7 @@ def index():
user=var.user) user=var.user)
@web.route('/upload', methods=["POST"])
def upload(): def upload():
file = request.files['file'] file = request.files['file']
if not file: if not file:
@@ -137,14 +138,15 @@ def upload():
elif '../' in targetdir: elif '../' in targetdir:
return redirect("./", code=406) return redirect("./", code=406)
# print('Uploading file:') print('Uploading file:')
# print('filename:', filename) print('filename:', filename)
# print('targetdir:', targetdir) print('targetdir:', targetdir)
# print('mimetype:', file.mimetype) print('mimetype:', file.mimetype)
if "audio" in file.mimetype: if "audio" in file.mimetype:
storagepath = os.path.abspath(os.path.join(var.music_folder, targetdir)) storagepath = os.path.abspath(os.path.join(var.music_folder, targetdir))
if not storagepath.startswith(var.music_folder): print('storagepath:',storagepath)
if not storagepath.startswith(os.path.abspath(var.music_folder)):
return redirect("./", code=406) return redirect("./", code=406)
try: try:
@@ -154,6 +156,7 @@ def upload():
return redirect("./", code=500) return redirect("./", code=500)
filepath = os.path.join(storagepath, filename) filepath = os.path.join(storagepath, filename)
print('filepath:',filepath)
if os.path.exists(filepath): if os.path.exists(filepath):
return redirect("./", code=406) return redirect("./", code=406)

42
templates/index.html
View File

@@ -2,6 +2,7 @@
<ul class="list-group"> <ul class="list-group">
{% for subdirname, subdirobj in dir.get_subdirs().items() %} {% for subdirname, subdirobj in dir.get_subdirs().items() %}
{%- set subdirpath = os.path.relpath(subdirobj.fullpath, music_library.fullpath) %} {%- set subdirpath = os.path.relpath(subdirobj.fullpath, music_library.fullpath) %}
{%- set subdirid = subdirpath.replace("/","-") %}
<li class="directory list-group-item list-group-item-primary"> <li class="directory list-group-item list-group-item-primary">
<span>{{ subdirpath }}/&nbsp;</span> <span>{{ subdirpath }}/&nbsp;</span>
<div class="btn-group" role="group"> <div class="btn-group" role="group">
@@ -17,9 +18,14 @@
<input type="text" value="{{ subdirpath }}" name="directory" hidden> <input type="text" value="{{ subdirpath }}" name="directory" hidden>
<button type="submit" class="btn btn-secondary">Download entire directory</button> <button type="submit" class="btn btn-secondary">Download entire directory</button>
</form> </form>
<button class="btn btn-primary" type="button" data-toggle="collapse"
data-target="#multiCollapse-{{ subdirid }}" aria-expanded="true"
aria-controls="multiCollapse-{{ subdirid }}">Toggle Collapse</button>
</div> </div>
</li> </li>
<div class="collapse multi-collapse" id="multiCollapse-{{ subdirid }}">
{{- dirlisting(subdirobj, subdirpath) -}} {{- dirlisting(subdirobj, subdirpath) -}}
</div>
{% endfor %} {% endfor %}
{%- set files = dir.get_files() %} {%- set files = dir.get_files() %}
{%- if files %} {%- if files %}
@@ -55,8 +61,9 @@
<body> <body>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col">
<div id="playlist" class="card"> <div id="playlist" class="card">
<div class="card-head"> <div class="card-header">
<h2 class="card-title">Play List</h2> <h2 class="card-title">Play List</h2>
</div> </div>
@@ -65,15 +72,14 @@
Currently Playing : Currently Playing :
{% if playlist|length > 0 %} {% if playlist|length > 0 %}
{% if 'url' in playlist[0] %} {% if 'url' in playlist[0] %}
(<a href="{{ playlist[0]['url'] }}">{{ playlist[0]['url'] }}</a>) <a href="{{ playlist[0]['url'] }}">{{ playlist[0]['url'] }}</a>
{% elif 'path' in playlist[0] %} {% elif 'path' in playlist[0] %}
({{ playlist[0]['path'] }}) {{ playlist[0]['path'] }}
{% endif %} {% endif %}
{% else %} {% else %}
No music No music
{% endif %} {% endif %}
</div> </div>
Playlist :
<form method="post"> <form method="post">
<input type="text" value="randomize" name="action" hidden> <input type="text" value="randomize" name="action" hidden>
<button type="submit" class="btn btn-primary">Randomize playlist</button> <button type="submit" class="btn btn-primary">Randomize playlist</button>
@@ -82,6 +88,7 @@
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th scope="col">#</th>
<th scope="col">Type</th> <th scope="col">Type</th>
<th scope="col">Title</th> <th scope="col">Title</th>
<th scope="col">Url/Path</th> <th scope="col">Url/Path</th>
@@ -91,27 +98,28 @@
<tbody> <tbody>
{% for m in playlist[1:] %} {% for m in playlist[1:] %}
<tr> <tr>
<th>{{ m['type'] }}</th> <th scope="row">{{ loop.index }}</th>
<th> <td>{{ m['type'] }}</td>
<td>
{% if 'title' in m %} {% if 'title' in m %}
({{ m['title'] }}) ({{ m['title'] }})
{% else %} {% else %}
No title No title
{% endif %} {% endif %}
</th> </td>
<th> <td>
{% if 'url' in m %} {% if 'url' in m %}
(<a href="{{ m['url'] }}">{{ m['url'] }}</a>) <a href="{{ m['url'] }}">{{ m['url'] }}</a>
{% elif 'path' in m %} {% elif 'path' in m %}
({{ m['path'] }}) {{ m['path'] }}
{% endif %} {% endif %}
</th> </td>
<th> <td>
<form method="post"> <form method="post">
<input type="text" value="{{ loop.index }}" name="delete_music" hidden> <input type="text" value="{{ loop.index }}" name="delete_music" hidden>
<button type="submit" class="btn btn-primary">Remove</button> <button type="submit" class="btn btn-primary">Remove</button>
</form> </form>
</th> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
@@ -119,12 +127,15 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row"> <div class="row">
<div class="col">
<div id="browser" class="card"> <div id="browser" class="card">
<div class="card-header"> <div class="card-header">
<h2 class="card-title">Music library</h2> <h2 class="card-title">Music library</h2>
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<form action="./download" method="get" class="directory form1"> <form action="./download" method="get" class="directory form1">
@@ -143,6 +154,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div id="upload" class="container"> <div id="upload" class="container">
<div class="row"> <div class="row">
@@ -160,6 +172,7 @@
<label class="custom-file-label" for="uploadSelectFile">Choose file</label> <label class="custom-file-label" for="uploadSelectFile">Choose file</label>
</div> </div>
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">Upload To</span>
<input class="form-control" list="targetdirs" id="targetdir" name="targetdir" <input class="form-control" list="targetdirs" id="targetdir" name="targetdir"
placeholder="uploads" /> placeholder="uploads" />
<datalist id="targetdirs"> <datalist id="targetdirs">
@@ -169,7 +182,7 @@
{% endfor %} {% endfor %}
</datalist> </datalist>
<button class="btn btn-outline-secondary" type="submit" <button class="btn btn-outline-secondary" type="submit"
id="uploadSubmit">Button</button> id="uploadSubmit">Upload</button>
</div> </div>
</div> </div>
</form> </form>
@@ -209,6 +222,7 @@
</div> </div>
</div> </div>
<script src="/static/js/jquery-3.4.1.min.js" crossorigin="anonymous"></script>
<script src="/static/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script> <script src="/static/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
</body> </body>