From b72268810036f8f195df7b44f4cb95b4f4762ef6 Mon Sep 17 00:00:00 2001 From: Jordan Date: Thu, 3 Aug 2023 01:06:37 -0700 Subject: roka: misc housekeeping --- roka.py | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) (limited to 'roka.py') diff --git a/roka.py b/roka.py index c9643b2..effdbe2 100755 --- a/roka.py +++ b/roka.py @@ -9,26 +9,19 @@ from flask.globals import app_ctx from lib.books import Books from lib.util import check_auth, escape, generate_rss, read_cache -abs_path = os.path.dirname(os.path.abspath(__file__)) app = Flask(__name__) -config_path = os.path.join(abs_path, 'app.cfg') -config_exists = os.path.exists(config_path) -if config_exists or __name__.startswith('uwsgi'): - app.config.from_pyfile(config_path) -cache_path = os.path.join(abs_path, 'cache') -json_path = os.path.join(cache_path, 'audiobooks.json') +CONFIG_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'app.cfg') +if os.path.exists(CONFIG_PATH) or __name__.startswith('uwsgi'): + app.config.from_pyfile(CONFIG_PATH) +CACHE_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'cache') +JSON_PATH = os.path.join(CACHE_PATH, 'audiobooks.json') @app.route('/') def list_books(): ''' Book listing and audiobook RSS/file download - - :a: audiobook hash; if provided without :f: (track) return RSS - :f: file hash; requires associated audiobook (:a:) to download - - Listing of audiobooks returned if no params provided ''' - books = read_cache(json_path) + books = read_cache(JSON_PATH) book = request.args.get('a') # audiobook hash track = request.args.get('f') # file hash @@ -42,29 +35,32 @@ def list_books(): return send_file(track_path, conditional=True) # serve up audiobook RSS feed; only audiobook hash provided - elif book: + if book: if not books.get(book): return 'book not found', 404 rss = generate_rss(request.base_url, book, books) return Response(rss, mimetype='text/xml') - else: - auth = request.authorization - if not auth or not check_auth(app, auth.username, auth.password): - form = {'WWW-Authenticate': 'Basic realm="o/"'} - return Response('unauthorized', 401, form) + # return index if authenticated + auth = request.authorization + if not auth or not check_auth(app, auth.username, auth.password): + form = {'WWW-Authenticate': 'Basic realm="o/"'} + return Response('unauthorized', 401, form) - return render_template('index.html', books=books, + return render_template('index.html', books=books, show_path=app.config.get('SHOW_PATH', True)) def generate(static_path, base_url, audiobook_dirs): + ''' + Static generation of index pages and RSS feeds + ''' static_index_path = os.path.join(static_path, 'index.html') books = Books() books.scan_books(audiobook_dirs) books.write_cache() - books = read_cache(json_path) + books = read_cache(JSON_PATH) # A bit of a hack, but push to the app context stack so we can render a # template outside of a Flask request with app.app_context(): @@ -115,13 +111,12 @@ if __name__ == '__main__': config = objectview(json.loads(args.config)) # override app.cfg app.config.from_object(config) - elif not config_exists: + elif not os.path.exists(CONFIG_PATH): raise Exception(f"Config file '{config_path}' doesn't exist") root_path = os.path.expanduser(app.config['ROOT_PATH']) - if args.scan: - books = Books() + books = Books(CACHE_PATH) books.scan_books(root_path) books.write_cache() elif args.static_path: -- cgit v1.2.3-54-g00ecf