Skip to content

Speakr is a personal, self-hosted web application designed for transcribing audio recordings

Python

Export template order is tag, then folder, then the user default (#412, Dc), as for every other per-recording setting

Murtaza Nasir163d6385df01
diff --git a/src/file_exporter.py b/src/file_exporter.py
index 829ef594..5c8cd4ca 100644
--- a/src/file_exporter.py
+++ b/src/file_exporter.py
@@ -450,9 +450,10 @@ def get_user_export_template(user, recording=None):
"""
Get the export template to use for a recording.
- Resolution order:
- 1. Folder's export_template_id (if recording is in a folder)
- 2. Tag's export_template_id (first matching tag with an export template)
+ Resolution order (#412: same order as every other per-recording setting,
+ tag before folder; before #412 the folder came first):
+ 1. Tag's export_template_id (first matching tag with an export template)
+ 2. Folder's export_template_id (if recording is in a folder)
3. User's default export template (is_default=True)
Args:
@@ -465,13 +466,7 @@ def get_user_export_template(user, recording=None):
from src.models import ExportTemplate
from src.database import db
- # 1. Check folder's export template
- if recording and recording.folder and recording.folder.export_template_id:
- template = db.session.get(ExportTemplate, recording.folder.export_template_id)
- if template:
- return template
-
- # 2. Check tags' export templates
+ # 1. Check tags' export templates
if recording and recording.tags:
for tag in recording.tags:
if tag.export_template_id:
@@ -479,6 +474,12 @@ def get_user_export_template(user, recording=None):
if template:
return template
+ # 2. Check folder's export template
+ if recording and recording.folder and recording.folder.export_template_id:
+ template = db.session.get(ExportTemplate, recording.folder.export_template_id)
+ if template:
+ return template
+
# 3. Fall back to user's default
return ExportTemplate.query.filter_by(
user_id=user.id,
diff --git a/tests/test_export_template_order.py b/tests/test_export_template_order.py
new file mode 100644
index 00000000..5a2c3dd5
--- /dev/null
+++ b/tests/test_export_template_order.py
@@ -0,0 +1,63 @@
+"""Export template order: tag, then folder, then the user's default (#412, Dc).
+
+Every other per-recording setting ranks a tag above the recording's folder;
+export templates ranked the folder first. They now follow the same order.
+
+SHARED-DB: the user and templates created here are removed afterwards.
+"""
+
+import os
+import sys
+import uuid
+from types import SimpleNamespace
+
+import pytest
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from src.app import app, db
+from src.file_exporter import get_user_export_template
+from src.models import ExportTemplate, User
+
+
+def templates():
+ with app.app_context():
+ s = uuid.uuid4().hex[:8]
+ u = User(username=f"exo_{s}", email=f"exo_{s}@local.test", password="x")
+ db.session.add(u)
+ db.session.commit()
+ made = {}
+ for key, default in (("tag", False), ("folder", False), ("user", True)):
+ t = ExportTemplate(user_id=u.id, name=f"{key}-{s}", template=f"{key}", is_default=default)
+ db.session.add(t)
+ db.session.commit()
+ made[key] = t.id
+ made["user_id"] = u.id
+ yield made
+ with app.app_context():
+ for key in ("tag", "folder", "user"):
+ t = db.session.get(ExportTemplate, made[key])
+ if t is not None:
+ db.session.delete(t)
+ db.session.delete(db.session.get(User, made["user_id"]))
+ db.session.commit()
+
+
+def _rec(tag_tid=None, folder_tid=None):
+ tags = [SimpleNamespace(export_template_id=tag_tid)] if tag_tid else []
+ folder = SimpleNamespace(export_template_id=folder_tid) if folder_tid else None
+ return SimpleNamespace(tags=tags, folder=folder)
+
+
[email protected]("tag,folder,expected", [
+ (True, True, "tag"),
+ (False, True, "folder"),
+ (True, False, "tag"),
+ (False, False, "user"),
+])
+def test_tag_then_folder_then_user_default(templates, tag, folder, expected):
+ with app.app_context():
+ user = db.session.get(User, templates["user_id"])
+ rec = _rec(templates["tag"] if tag else None, templates["folder"] if folder else None)
+ assert get_user_export_template(user, rec).id == templates[expected]