From fb059ae5d141ee30ebbe4817b11f119565a0347e Mon Sep 17 00:00:00 2001
From: ducklet
-
diff --git a/unwind-ui/src/utils.ts b/unwind-ui/src/utils.ts index 382af53..15aa8d4 100644 --- a/unwind-ui/src/utils.ts +++ b/unwind-ui/src/utils.ts @@ -10,7 +10,7 @@ export function mean(nums) { return sum(nums) / nums.length } -export function pstdev(nums, mu=null) { +export function pstdev(nums, mu = null) { if (mu === null) { mu = mean(nums) } diff --git a/unwind/db.py b/unwind/db.py index 1381e52..21e9728 100644 --- a/unwind/db.py +++ b/unwind/db.py @@ -566,11 +566,11 @@ async def find_movies( query = f""" SELECT {','.join(sql_fields(Movie))} FROM {Movie._table} - WHERE {(' AND '.join(conditions)) if conditions else '1=1'} - ORDER BY - length({Movie._table}.title) ASC, - {Movie._table}.imdb_score DESC, - {Movie._table}.release_year DESC + WHERE {(' AND '.join(conditions)) if conditions else '1=1'} + ORDER BY + length({Movie._table}.title) ASC, + {Movie._table}.imdb_score DESC, + {Movie._table}.release_year DESC LIMIT :skip_rows, :limit_rows """ rows = await shared_connection().fetch_all(bindparams(query, values)) diff --git a/unwind/web.py b/unwind/web.py index 550b266..f043f18 100644 --- a/unwind/web.py +++ b/unwind/web.py @@ -319,9 +319,6 @@ async def add_movie(request): not_implemented() -import_lock = asyncio.Lock() - - @route("/movies/_reload_imdb", methods=["GET"]) @requires(["authenticated", "admin"]) async def progress_for_load_imdb_movies(request): @@ -352,11 +349,14 @@ async def progress_for_load_imdb_movies(request): return JSONResponse(resp) +_import_lock = asyncio.Lock() + + @route("/movies/_reload_imdb", methods=["POST"]) @requires(["authenticated", "admin"]) async def load_imdb_movies(request): - async with import_lock: + async with _import_lock: progress = await db.get_import_progress() if progress and not progress.stopped: return JSONResponse(