cinnaboot
/
pvdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

add some javascript for async file listing

master
cinnaboot 7 years ago
parent
c4590c4789
commit
019212f999
4 changed files with 94 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 58
      video_metadata/static/file_listing.js
  2. 1
      video_metadata/templates/base.html
  3. 40
      video_metadata/templates/file_listing/folder_contents.html
  4. 13
      video_metadata/views/file_listing.py

58
video_metadata/static/file_listing.js
Unescape View File

@ -0,0 +1,58 @@
function logError(s) {
console.log(s);
let error_box = document.querySelector('#js_errors');
let p = document.createElement('p');
p.appendChild(document.createTextNode(s));
error_box.appendChild(p);
error_box.style.display = 'block';
}
function fetchJSON(url, responseFunc, event) {
fetch(url)
.then(function(response) {
console.log('Response.url: ', response.url)
if (!response.ok)
throw Error(response.statusText);
return response.json();
})
.then(function(json) {
responseFunc(json, event);
})
.catch(function(error) {
logError('fetch error: ' + error);
return null;
});
}
function parseResponse(json, event) {
if (json.errors.length > 0) {
for (let err of json.errors)
logError(err);
} else {
for (let path of json.paths) {
console.log(event);
}
}
}
window.onload = function() {
document.querySelector('#noscript').style.display = 'none';
let error_box = document.querySelector('#js_errors');
error_box.style.display = 'none';
if (!('fetch' in window)) {
logError('Unsupported Browser, No fetch API');
return;
}
// replace top level links with event listeners that fetch json directory listings
for (let link of document.querySelectorAll('#videolist > li > a')) {
let href = link.getAttribute('href')
link.addEventListener('click', function(e) {
e.preventDefault();
fetchJSON(window.location + href, parseResponse, e);
});
}
}

1
video_metadata/templates/base.html
Unescape View File

@ -3,6 +3,7 @@
<head> <head>
<title>{% block title %}{% endblock %} - pvdb</title> <title>{% block title %}{% endblock %} - pvdb</title>
<link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}"> <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
{% block extra_js %}{% endblock %}
</head> </head>
<body> <body>
<nav> <nav>

40
video_metadata/templates/file_listing/folder_contents.html
Unescape View File

@ -1,21 +1,33 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% block extra_js %}
<script type="text/javascript" src="{{ url_for('static', filename='file_listing.js') }}"></script>
{% endblock %}
{% block header %} {% block header %}
<h1>{% block title %}File Listing{% endblock %}</h1> <h1>{% block title %}File Listing{% endblock %}</h1>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<ul> <p id="noscript" class="flash">Javascript needs to be enabled for this page</p>
{% for path in paths%} <div id="js_errors" class="flash"></div>
<li>
{% if path.is_dir %} <ul id="videolist">
<a href="{{ url_for('file_listing.getFolderJSON', subpath=path.rel_path) }}"> {% for path in paths%}
{{ path.base_name }}</a> <li>
{% else %} {% if path.is_dir %}
<a href="{{ url_for('tmdb.query_movie', query=path.base_name, rel_path=path.rel_path) }}"> <a class="folder" href="{{ path.rel_path }}">{{ path.base_name }}</a>
{{ path.base_name }}</a> {% else %}
{% endif %} <a class="file" href="{{
</li> url_for('tmdb.query_movie', query=path.base_name, rel_path=path.rel_path) }}">
{% endfor %} {{ path.base_name }}</a>
</ul> {% endif %}
</li>
{% endfor %}
</ul>
<template id="path_info">
<li><a href=""></a></li>
</template>
{% endblock %} {% endblock %}

13
video_metadata/views/file_listing.py
Unescape View File

@ -47,7 +47,7 @@ def getBaseFolderContents():
# validate input # validate input
if not os.path.exists(full_path): if not os.path.exists(full_path):
flash('invalid path') flash('path in "MOVIE_DIR" is invalid')
else: else:
for entry in os.scandir(full_path): for entry in os.scandir(full_path):
paths.append(getPathInfo(entry, MAX_RECURSE_DEPTH)) paths.append(getPathInfo(entry, MAX_RECURSE_DEPTH))
@ -65,16 +65,21 @@ def getBaseFolderContents():
def getFolderJSON(subpath = ''): def getFolderJSON(subpath = ''):
video_path = current_app.config['MOVIE_DIR'] video_path = current_app.config['MOVIE_DIR']
full_path = os.path.join(video_path, subpath) full_path = os.path.join(video_path, subpath)
errors = []
paths = [] paths = []
current_app.logger.debug('video_path: {}'.format(video_path))
current_app.logger.debug('subpath: {}'.format(subpath))
current_app.logger.debug('full_path: {}'.format(full_path))
# validate input # validate input
if re.search('\.\.', subpath) or not os.path.exists(full_path): if re.search('\.\.', subpath) or not os.path.exists(full_path):
flash('invalid path') errors.append('invalid path?: {}'.format(full_path))
else: else:
for entry in os.scandir(full_path): for entry in os.scandir(full_path):
# TODO: remove 'getPathInfo()' when finished with async file listing # TODO: remove 'getPathInfo()' when finished with async file listing
# make sure to continue to test for '.' and symlinks # make sure to continue to test for '.' and symlinks
logger.info(entry) # TODO: add errors to json, 'flash()' won't trigger on this function since it's async
pe = getPathInfo(entry, MAX_RECURSE_DEPTH) pe = getPathInfo(entry, MAX_RECURSE_DEPTH)
if pe: if pe:
paths.append({ paths.append({
@ -84,7 +89,7 @@ def getFolderJSON(subpath = ''):
'is_dir': pe.is_dir, 'is_dir': pe.is_dir,
}) })
return jsonify(paths) return jsonify(errors=errors, paths=paths)
def getPathInfo(entry, depth=0): def getPathInfo(entry, depth=0):

Write Preview
Loading…
Cancel
Save