server/app.py

@@ -59,9 +59,6 @@ from entertainment_decider.models import (
     setup_custom_tables,
     update_element_lookup_cache,
 )
-from entertainment_decider.models.sql_helpers import (
-    sql_condition_join,
-)
 from entertainment_decider.preferences import PreferenceScore, generate_preference_list
 from entertainment_decider.extractors.collection import (
     collection_extract_uri,
@@ -443,10 +440,18 @@ def show_collection(collection_id: int) -> ResponseReturnValue:
     collection: MediaCollection = MediaCollection.get(id=collection_id)
     if collection is None:
         return make_response(f"Not found", 404)
-    media_links = None
-    media_titles = None
-    if orm.count(collection.media_links) <= SMALL_COLLECTION_MAX_COUNT:
-        media_links, media_titles = prepare_collection_episodes(collection)
+    media_links = (
+        MediaCollectionLink.sorted(
+            MediaCollectionLink.select(lambda l: l.collection == collection)
+        )
+        if orm.count(collection.media_links) <= SMALL_COLLECTION_MAX_COUNT
+        else None
+    )
+    media_titles = (
+        remove_common_trails([link.element.title for link in media_links])
+        if media_links is not None
+        else None
+    )
     return render_template(
         "collection_element.htm",
         collection=collection,
@@ -460,7 +465,10 @@ def show_collection_episodes(collection_id: int) -> ResponseReturnValue:
     collection: MediaCollection = MediaCollection.get(id=collection_id)
     if collection is None:
         return make_response(f"Not found", 404)
-    media_links, media_titles = prepare_collection_episodes(collection)
+    media_links = MediaCollectionLink.sorted(
+        MediaCollectionLink.select(lambda l: l.collection == collection)
+    )
+    media_titles = remove_common_trails([link.element.title for link in media_links])
     return render_template(
         "collection_episodes.htm",
         collection=collection,
@@ -469,28 +477,43 @@ def show_collection_episodes(collection_id: int) -> ResponseReturnValue:
     )
 
 
-def prepare_collection_episodes(
-    collection: MediaCollection,
-) -> tuple[Iterable[MediaCollectionLink], Iterable[str]]:
-    media_links = MediaCollectionLink.select(
-        lambda l: l.collection == collection
-    ).order_by(
-        MediaCollectionLink.desc_sort_key
-        if collection.is_creator
-        else MediaCollectionLink.sort_key
-    )
-    media_titles = remove_common_trails([link.element.title for link in media_links])
-    return media_links, media_titles
-
-
 @flask_app.route("/media")
 def list_media() -> ResponseReturnValue:
-    media_list = prepare_media_sql()
+    media_list: Iterable[MediaElement] = get_all_considered(
+        "elem.release_date DESC, elem.id"
+    )
     return render_template(
         "media_list.htm",
         media_list=common.limit_iter(media_list, 100),
         check_considered=False,
-        **pass_media_filter_vals(),
+    )
+
+
+@flask_app.route("/media/short")
+@flask_app.route("/media/short/<int:seconds>")
+def list_short_media(seconds: int = 10 * 60) -> ResponseReturnValue:
+    media_list: Iterable[MediaElement] = get_all_considered(
+        filter_by=f"(length - progress) <= {seconds}",
+        order_by="elem.release_date DESC, elem.id",
+    )
+    return render_template(
+        "media_list.htm",
+        media_list=list(itertools.islice(media_list, 100)),
+        check_considered=False,
+    )
+
+
+@flask_app.route("/media/long")
+@flask_app.route("/media/long/<int:seconds>")
+def list_long_media(seconds: int = 10 * 60) -> ResponseReturnValue:
+    media_list: Iterable[MediaElement] = get_all_considered(
+        filter_by=f"{seconds} <= (length - progress)",
+        order_by="elem.release_date DESC, elem.id",
+    )
+    return render_template(
+        "media_list.htm",
+        media_list=list(itertools.islice(media_list, 100)),
+        check_considered=False,
     )
 
 
@@ -527,33 +550,6 @@ def list_unsorted_media() -> ResponseReturnValue:
     )
 
 
-def prepare_media_sql(
-    filter_by: str | None = None,
-) -> Sequence[MediaElement]:
-    elem_len = "(elem.length - elem.progress)"
-    min_len = request.args.get("min_length", default=None, type=int)
-    max_len = request.args.get("max_length", default=None, type=int)
-    filter_str = sql_condition_join(
-        filter_by,
-        f"{min_len * 60} <= {elem_len}" if min_len else None,
-        f"{elem_len} <= {max_len * 60}" if max_len else None,
-    )
-    return get_all_considered(
-        filter_by=filter_str,
-        order_by="elem.release_date DESC, elem.id",
-    )
-
-
-def pass_media_filter_vals() -> Mapping[str, Any]:
-    KEYS = [
-        "min_length",
-        "max_length",
-    ]
-    return {
-        "show_filters": True,
-    } | {key: request.args.get(key) for key in KEYS}
-
-
 @flask_app.route("/media/extract")
 def extract_media() -> ResponseReturnValue:
     return render_template("media_extract.htm")
@@ -783,7 +779,11 @@ def refresh_collections() -> ResponseReturnValue:
             orm.rollback()
             errors.append(
                 {
-                    "collection": coll.json_summary,
+                    "collection": {
+                        "id": coll.id,
+                        "title": coll.title,
+                        "uri": coll.primary_uri,
+                    },
                     "error": gen_api_error(e),
                 },
             )
@@ -807,25 +807,7 @@ def force_refresh_collection(collection_id: int) -> ResponseReturnValue:
     coll: MediaCollection = MediaCollection.get(id=collection_id)
     if coll is None:
         return "404 Not Found", 404
-    try:
-        state = collection_update(coll, check_cache_expired=False)
-    except Exception as e:
-        orm.rollback()
-        return (
-            {
-                "status": False,
-                "error": {
-                    "msg": "Failed to update collection successfully",
-                    "data": [
-                        {
-                            "collection": coll.json_summary,
-                            "error": gen_api_error(e),
-                        }
-                    ],
-                },
-            },
-            501,
-        )
+    state = collection_update(coll, check_cache_expired=False)
     if state.may_has_changed:
         update_element_lookup_cache((coll.id,))
     return redirect_back_or_okay()

server/entertainment_decider/common/__init__.py

@@ -20,23 +20,9 @@ from ._string import (
 from ._subprocess import (
     call,
 )
-from ._types import (
-    JsonContainer,
-    JsonLeaf,
-    JsonList,
-    JsonMapping,
-    JsonMappingKey,
-    JsonRepr,
-)
 
 
 __all__ = [
-    "JsonContainer",
-    "JsonLeaf",
-    "JsonList",
-    "JsonMapping",
-    "JsonMappingKey",
-    "JsonRepr",
     "all_same",
     "call",
     "date_to_datetime",

server/entertainment_decider/common/_types.py

@@ -1,25 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import (
-    Sequence,
-    Mapping,
-)
-from typing import (
-    TypeAlias,
-)
-
-
-JsonMappingKey: TypeAlias = str | int | float
-"""type for use in JSON mappings as key"""
-JsonLeaf: TypeAlias = JsonMappingKey | bool | None
-"""object natively mapping to JSON as values excluding containers"""
-
-JsonMapping: TypeAlias = Mapping[JsonMappingKey, "JsonRepr"]
-"""mapping natively mapping to JSON"""
-JsonList: TypeAlias = Sequence["JsonRepr"]
-"""list natively mapping to JSON"""
-JsonContainer: TypeAlias = JsonList | JsonMapping
-"""container natively mapping to JSON"""
-
-JsonRepr: TypeAlias = JsonContainer | JsonLeaf
-"""object natively mapping to JSON"""

server/entertainment_decider/extractors/collection/rss.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pony import orm  # TODO remove
 import requests
 from rss_parser import Parser
-from rss_parser.models.rss import RSS
+from rss_parser.models import RSSFeed
 
 from ...models import MediaCollection
 from ..generic import (
@@ -15,7 +15,7 @@ from ..generic import (
 from .base import CollectionExtractor
 
 
-class RssCollectionExtractor(CollectionExtractor[RSS]):
+class RssCollectionExtractor(CollectionExtractor[RSSFeed]):
     PROTOCOL_PREFIX = "rss+"
     SUPPORTED_PROTOCOLS = [
         "http://",
@@ -47,20 +47,20 @@ class RssCollectionExtractor(CollectionExtractor[RSS]):
     def can_extract_offline(self, uri: str) -> bool:
         return True
 
-    def _extract_offline(self, uri: str) -> ExtractedDataOffline[RSS]:
+    def _extract_offline(self, uri: str) -> ExtractedDataOffline[RSSFeed]:
         cuted = self.__get_uri(uri)
-        return ExtractedDataOffline[RSS](
+        return ExtractedDataOffline[RSSFeed](
             extractor_name=self.name,
             object_key=cuted,
             object_uri=uri,
         )
 
-    def _extract_online(self, uri: str) -> ExtractedDataOnline[RSS]:
+    def _extract_online(self, uri: str) -> ExtractedDataOnline[RSSFeed]:
         cuted = self.__get_uri(uri)
         res = requests.get(cuted)
-        parser = Parser()
-        data = parser.parse(data=res.text)
-        return ExtractedDataOnline[RSS](
+        parser = Parser(xml=res.content)
+        data = parser.parse()
+        return ExtractedDataOnline[RSSFeed](
             extractor_name=self.name,
             object_key=cuted,
             object_uri=uri,
@@ -70,18 +70,18 @@ class RssCollectionExtractor(CollectionExtractor[RSS]):
     def _update_object_raw(
         self,
         object: MediaCollection,
-        data: RSS,
+        data: RSSFeed,
     ) -> ChangedReport:
-        object.title = f"[rss] {data.channel.title.content.strip()}"
-        object.description = data.channel.description.content
+        object.title = f"[rss] {data.title.strip()}"
+        object.description = data.description
         object.set_watch_in_order_auto(True)
         object.add_single_uri(
             self.__get_uri(object.primary_uri)
         )  # add url without prefix if required
-        for item in data.channel.items:
+        for item in data.feed:
             element = self._add_episode(
                 collection=object,
-                uri=item.link.content,
+                uri=item.link,
             )
             if element:
                 orm.commit()

server/entertainment_decider/models/__init__.py

@@ -8,10 +8,6 @@ from .custom_types import (
     SafeStr,
 )
 
-from .db import (
-    db,
-)
-
 from .entities import (
     CollectionStats,
     CollectionUriMapping,
@@ -24,6 +20,7 @@ from .entities import (
     Tag,
     Tagable,
     TagKey,
+    db,
 )
 
 from .predefined_tags import (

server/entertainment_decider/models/db.py

@@ -1,4 +0,0 @@
-from pony import orm
-
-
-db = orm.Database()

server/entertainment_decider/models/entities.py

@@ -1,9 +1,6 @@
 from __future__ import annotations
 
 from abc import abstractproperty
-from collections.abc import (
-    Mapping,
-)
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 import logging
@@ -21,13 +18,13 @@ import requests
 from pony import orm
 
 from .custom_types import Query
-from .db import db
 from .thumbnails import THUMBNAIL_ALLOWED_TYPES, THUMBNAIL_HEADERS
 from .extras import (
     UriHolder,
 )
 from ..preferences.tag_protocol import TagableProto, TagProto
 
+db = orm.Database()
 
 
 T = TypeVar("T")
@@ -324,15 +321,8 @@ class MediaCollectionLink(db.Entity):
         )
 
     @staticmethod
-    def sorted(
-        iterable: Iterable[MediaCollectionLink],
-        reverse: bool = False,
-    ) -> List[MediaCollectionLink]:
-        return sorted(
-            iterable,
-            key=MediaCollectionLink.sort_key,
-            reverse=reverse,
-        )
+    def sorted(iterable: Iterable[MediaCollectionLink]) -> List[MediaCollectionLink]:
+        return sorted(iterable, key=MediaCollectionLink.sort_key)
 
 
 ## Media Elements
@@ -588,14 +578,6 @@ class MediaElement(db.Entity, UriHolder, Tagable):
     def info_link(self) -> str:
         return f"/media/{self.id}"
 
-    @property
-    def json_summary(self) -> Mapping[str, str]:
-        return {
-            "id": self.id,
-            "title": self.title,
-            "uri": self.primary_uri,
-        }
-
     ### methods
 
     def merge_to(self, other: MediaElement) -> None:
@@ -986,14 +968,6 @@ class MediaCollection(db.Entity, UriHolder, Tagable):
     def info_link(self) -> str:
         return f"/collection/{self.id}"
 
-    @property
-    def json_summary(self) -> Mapping[str, str]:
-        return {
-            "id": self.id,
-            "title": self.title,
-            "uri": self.primary_uri,
-        }
-
     ### methods
 
     def set_watch_in_order_auto(self, watch_in_order: bool) -> None:

server/entertainment_decider/models/extras/__init__.py

@@ -1,4 +1,4 @@
-from .exidkeys import (
+from .exids_base import (
     ExIdKey_Columns,
     ExIdKeyCompatible,
     ExIdKeyData,

server/entertainment_decider/models/extras/uris.py

@@ -42,7 +42,7 @@ class UriHolder:
 
     @abstractmethod
     def _clear_uri_set(self) -> None:
-        """Clears the uri set of this object in a naive way."""
+        """Sets the uri set of this object in a naive way."""
 
     @abstractmethod
     def _add_uri_to_set(self, uri: str) -> bool:

server/entertainment_decider/models/sql_helpers.py

@@ -13,16 +13,5 @@ def sql_cleanup(sql: str) -> str:
     return SQL_WHITESPACE_PATTERN.sub(" ", sql).strip()
 
 
-def sql_condition_join(
-    *sql_conditions: str | None,
-    joiner: str = "AND",
-    default: str = "TRUE",
-) -> str:
-    return (
-        f" {joiner} ".join(f"({cond})" for cond in sql_conditions if cond is not None)
-        or default
-    )
-
-
 def sql_where_in(id: str, id_list: Iterable[str | int]) -> str:
     return f"{id} IN ({','.join(str(i) for i in id_list)})"

server/requirements.txt

@@ -6,7 +6,7 @@ pycountry>=20
 python-magic>=0.4.25
 pyyaml>=5.4.1
 requests>=2.26
-rss-parser>=1.1
+rss-parser>=0.2.3
 tmdbsimple>=2.9.1
 yt-dlp>=2022.6.29
 git+https://git.banananet.work/zocker/python-jsoncache#egg=jsoncache

server/templates/media_list.htm

@@ -10,21 +10,6 @@
     <body>
         {{ macros.body_header() }}
         <h1>{{ title }}</h1>
-        {% if show_filters | default(False) %}
-            <form class="form-single-button" method="get" action="{{ this_url() }}">
-                <label>
-                    <span>Min Length:</span>
-                    <input type="number" name="min_length" min="0" size="4" value="{{ min_length or '' }}"/>
-                    <span>min</span>
-                </label>
-                <label>
-                    <span>Max Length:</span>
-                    <input type="number" name="max_length" min="0" size="4" value="{{ max_length or '' }}"/>
-                    <span>min</span>
-                </label>
-                <button type="submit">Filter</button>
-            </form>
-        {% endif %}
         {{ macros.media_thumbnail_list(
             elements=media_list,
             check_considered=check_considered|default(True),