fix: fixed resume button in frontend, notifications for shows, and alldebrid missing path attr bug

Author: dreulavelle

src/program/media/item.py

@@ -240,8 +240,8 @@ def is_scraped(self) -> bool:
             try:
                 session.refresh(self, attribute_names=["blacklisted_streams"])
                 return (len(self.streams) > 0 and any(stream not in self.blacklisted_streams for stream in self.streams))
-            except Exception as e:
-                logger.error(f"Error refreshing item streams for {self.log_string}: {str(e)}")
+            except:
+                ...
         return False
 
     def to_dict(self):
@@ -541,7 +541,7 @@ def _determine_state(self):
             return States.Requested
         return States.Unknown
 
-    def store_state(self, given_state: States =None) -> None:
+    def store_state(self, given_state: States = None) -> None:
         for season in self.seasons:
             season.store_state(given_state)
         super().store_state(given_state)

src/program/services/downloaders/models.py

@@ -12,7 +12,7 @@
     "m4v", "webm", "mpg","mpeg", "m2ts", "ts",
 ]
 
-ANIME_SPECIALS_PATTERN: regex.Pattern = regex.compile(r"\b(OVA|NCED|NCOP|NC|OVA|ED(\d?v?\d?)|OPv?(\d+)?)\b", regex.IGNORECASE)
+ANIME_SPECIALS_PATTERN: regex.Pattern = regex.compile(r"\b(OVA|NCED|NCOP|NC|OVA|ED(\d?v?\d?)|OPv?(\d+)?|SP\d+)\b", regex.IGNORECASE)
 
 VIDEO_EXTENSIONS: list[str] = settings_manager.settings.downloaders.video_extensions or DEFAULT_VIDEO_EXTENSIONS
 VALID_VIDEO_EXTENSIONS = [ext for ext in VIDEO_EXTENSIONS if ext in ALLOWED_VIDEO_EXTENSIONS]
@@ -54,10 +54,10 @@ class DebridFile(BaseModel):
     @classmethod
     def create(
         cls,
-        path: str,
-        filename: str,
-        filesize_bytes: int,
-        filetype: Literal["movie", "show", "season", "episode"],
+        path: str = None,
+        filename: str = None,
+        filesize_bytes: int = None,
+        filetype: Literal["movie", "show", "season", "episode"] = None,
         file_id: Optional[int] = None,
         limit_filesize: bool = True
     ) -> Optional["DebridFile"]:
@@ -70,7 +70,7 @@ def create(
         if not any(filename_lower.endswith(ext) for ext in VALID_VIDEO_EXTENSIONS):
             raise InvalidDebridFileException(f"Skipping non-video file: '{filename}'")
 
-        if ANIME_SPECIALS_PATTERN.search(path):
+        if path and ANIME_SPECIALS_PATTERN.search(path):
             raise InvalidDebridFileException(f"Skipping anime special: '{path}'")
 
         if limit_filesize:

src/program/services/post_processing/__init__.py

@@ -1,11 +1,10 @@
 from datetime import datetime
 
 from loguru import logger
-from subliminal import Movie
 
 from program.db.db import db
 from program.db.db_functions import clear_streams
-from program.media.item import MediaItem, Movie, Show
+from program.media.item import MediaItem
 from program.media.state import States
 from program.services.post_processing.subliminal import Subliminal
 from program.settings.manager import settings_manager
@@ -42,12 +41,12 @@ def notify(item: MediaItem):
         with db.Session() as session:
             show = session.merge(show)
             show.store_state()
+            if show.last_state == States.Completed:
+                _notify(show)
             session.commit()
-        if show == States.Completed:
-            _notify(show)
 
-def _notify(_item: Show | Movie):
-    duration = round((datetime.now() - _item.requested_at).total_seconds())
-    logger.success(f"{_item.log_string} has been completed in {duration} seconds.")
+def _notify(item: MediaItem):
+    duration = round((datetime.now() - item.requested_at).total_seconds())
+    logger.success(f"{item.log_string} has been completed in {duration} seconds.")
     if settings_manager.settings.notifications.enabled:
-        notify_on_complete(_item)
+        notify_on_complete(item)

src/program/utils/notifications.py

@@ -4,7 +4,7 @@
 from apprise import Apprise
 from loguru import logger
 
-from program.media.item import MediaItem
+from program.media.item import MediaItem, Stream
 from program.settings.manager import settings_manager
 from program.settings.models import NotificationsModel
 from program.utils import root_dir
@@ -39,36 +39,16 @@ def notification(title: str, body: str) -> None:
 
 def _build_discord_notification(item: MediaItem) -> str:
     """Build a discord notification for the given item using markdown that lists the files completed."""
-    notification_message = f"[{item.type.title()}] **{item.log_string}**\n"
-
-    if item.type == "movie":
-        notification_message += f"  - File: {item.file}\n"
-
-    elif item.type == "show":
-        for season in item.seasons:
-            notification_message += f"- [Season {season.number}] **Season {season.number}**\n"
-            for episode in season.episodes:
-                notification_message += f"  - [Episode {episode.number}] **{episode.log_string}**\n"
-                notification_message += f"    - File: {episode.file}\n"
-
-    elif item.type == "season":
-        notification_message += f"- [Season {item.number}] **Season {item.number}**\n"
-        for episode in item.episodes:
-            notification_message += f"  - [Episode {episode.number}] **{episode.log_string}**\n"
-            notification_message += f"    - File: {episode.file}\n"
-
-    elif item.type == "episode":
-        notification_message += f"  - [Episode {item.number}] **{item.log_string}**\n"
-        notification_message += f"    - File: {item.file}\n"
-
+    notification_message = f"### [{item.type.title()}] **{item.log_string}** ({item.aired_at.year})\n"
+    stream: Stream = next((stream for stream in item.streams if stream.infohash == item.active_stream.get("infohash")), None)
+    notification_message += f"- {stream.raw_title}\n"
     return notification_message
 
-
 def notify_on_complete(item: MediaItem) -> None:
     """Send notifications to all services in settings."""
     if item.type not in on_item_type:
         return
-    
+
     title = "Riven completed something!" if not settings.title else settings.title
     body = _build_discord_notification(item)
-    notification(title, body)
+    notification(title, body)

src/routers/secure/items.py

@@ -592,7 +592,7 @@ async def unpause_items(request: Request, ids: str) -> PauseResponse:
             for media_item in db_functions.get_items_by_ids(ids):
                 try:
                     if media_item.last_state == States.Paused:
-                        media_item.store_state(None) # recheck the last state
+                        media_item.store_state(States.Requested)
                         session.merge(media_item)
                         session.commit()
                         request.app.program.em.add_event(Event("RetryItem", media_item.id))