rcdl 3.0.0b13__py3-none-any.whl → 3.0.0b23__py3-none-any.whl

rcdl/core/downloader_subprocess.py

@@ -14,6 +14,7 @@ from rcdl.interface.ui import UI, NestedProgress
 from rcdl.core import parser
 from rcdl.core.models import Media, Post
 from rcdl.core.config import Config
+from rcdl.utils import bytes_to_str
 
 
 def ytdlp_clear_cache():
@@ -338,7 +339,10 @@ def handbrake_optimized(media: Media, user: str, progress: NestedProgress):
 
     assert process.stdout is not None
     progress.start_current(description="Optimizing", total=100)
-    progress.set_status(f"user@({media.service}) ->", f"{media.file_size}")
+    progress.set_status(
+        f"{user}@({media.service}) -> ",
+        f"{media.file_path} ({bytes_to_str(media.file_size)})",
+    )
 
     current_progress = 0.0
 

rcdl/gui/video_manager.py

@@ -28,62 +28,72 @@ def set_status(media: Media, status: Status):
 
 
 def video_manager():
+    if "reload_medias" not in st.session_state:
+        st.session_state.reload_medias = True
+
     st.title("Video Manager")
 
     # Filter & Sorting UI
     with st.expander("Filters & Sorting", expanded=True):
         col1, col2, col3 = st.columns(3)
         with col1:
-            sort_by = st.selectbox(
+            st.selectbox(
                 "Sort By",
                 options=["file_size", "service", "duration", "file_path"],
                 index=0,
+                key="sort_by",
             )
         with col2:
-            ascending = st.radio(
+            st.radio(
                 "Order",
                 options=[True, False],
                 format_func=lambda x: "Ascending" if x else "Descending",
                 horizontal=True,
+                key="ascending",
             )
         with col3:
-            creator_filter = st.text_input(
-                "Creator ID(user)", placeholder="Leave empty for all"
+            st.text_input(
+                "Creator ID(user)",
+                placeholder="Leave empty for all",
+                key="creator_filter",
             )
-        status_filter = st.multiselect(
+        st.multiselect(
             "Status",
             options=list(Status),
             default=[Status.DOWNLOADED, Status.OPTIMIZED],
+            key="status_filter",
         )
 
-        reload = st.button("Apply")
+        if st.button("Apply"):
+            st.session_state.reload_medias = True
 
     # load db
-    if reload or "medias" not in st.session_state:
+    if st.session_state.reload_medias or "medias" not in st.session_state:
         with DB() as db:
             medias = db.query_medias_by_status_sorted(
-                status_filter,
-                sort_by=sort_by,
-                ascending=ascending,
+                st.session_state.status_filter,
+                sort_by=st.session_state.sort_by,
+                ascending=st.session_state.ascending,
             )
 
             # check if in a fuse group
 
             # creator filter
-            if creator_filter:
+            if st.session_state.creator_filter:
                 filtered = []
                 for m in medias:
                     post = db.query_post_by_id(m.post_id)
-                    if post and post.user == creator_filter:
-                        filtered.append(m)
-                    # check i na fuse group
-                    fm = db.query_fuses_by_id(m.post_id)
-                    if fm is None:
+                    if (
+                        post
+                        and post.user == st.session_state.creator_filter
+                        and db.query_fuses_by_id(m.post_id) is None
+                    ):
                         filtered.append(m)
                 medias = filtered
 
             st.session_state.medias = medias
             st.session_state.media_index = 0
+        st.session_state.reload_medias = False
 
     medias = st.session_state.medias
     if not medias:
@@ -157,14 +167,12 @@ def video_manager():
                     st.rerun()
 
     # video player
-    full_path = os.path.join(Config.creator_folder(post.user), media.file_path)
-    if os.path.exists(full_path):
-        with col_video:
-            with st.container():
-                if media.file_size > 199 * 1024 * 1024:  # 199MB
-                    with open(full_path, "rb") as f:
-                        st.video(f.read(), autoplay=True, loop=True)
-                else:
-                    st.video(full_path, autoplay=True, loop=True)
-    else:
-        st.error(f"Video file {full_path} not found on disk")
+    with col_video:
+        full_path = os.path.join(Config.creator_folder(post.user), media.file_path)
+        video_slot = st.empty()
+        video_slot.empty()
+
+        if os.path.exists(full_path):
+            video_slot.video(full_path, autoplay=False, loop=False)
+        else:
+            st.error(f"Video file {full_path} not found on disk")

rcdl/interface/ui.py

@@ -28,6 +28,7 @@ class NestedProgress:
         self.total_task: int | None = None
         self.current_task: int | None = None
         self.status_text = Text("", style="cyan")
+        self.current_label = ""
 
     def start(
         self, *, total: int, total_label: str = "Total", current_label: str = "Current"
@@ -54,6 +55,7 @@ class NestedProgress:
             transient=False,
         )
 
+        self.current_label = current_label
         group = Group(self.global_progress, self.current_progress, self.status_text)
         self.live = Live(group, console=self.console)
         self.live.__enter__()
@@ -68,14 +70,28 @@ class NestedProgress:
         if self.global_progress and self.total_task is not None:
             self.global_progress.advance(self.total_task, step)  # type: ignore
 
+    def reset_current(self):
+        if not self.current_progress or self.current_task is None:
+            return
+
+        self.current_progress.remove_task(self.current_task)  # type: ignore
+
+        self.current_task = self.current_progress.add_task(
+            self.current_label,
+            total=1,
+            visible=False,
+        )
+
     def start_current(self, description: str, total: int | None = None):
         if not self.current_progress or self.current_task is None:
             return
 
+        self.reset_current()
+
         self.current_progress.update(
             self.current_task,  # type: ignore
             description=description,
-            total=total,
+            total=total or 1,
             completed=0,
             visible=True,
         )
@@ -88,18 +104,14 @@ class NestedProgress:
         if self.current_progress and self.current_task is not None:
             self.current_progress.update(self.current_task, visible=False)  # type: ignore
 
-    # ---------------------
     # Status line
-    # ---------------------
     def set_status(self, cyan: str, green: str = ""):
         self.status_text.plain = ""
         self.status_text.append(cyan, style="cyan")
         if green:
             self.status_text.append(green, style="green")
 
-    # ---------------------
     # Close
-    # ---------------------
     def close(self):
         if self.live:
             self.live.__exit__(None, None, None)

rcdl/utils.py

@@ -9,7 +9,6 @@ from pathlib import Path
 import os
 import time
 
-import rcdl.core.downloader_subprocess as dls
 from rcdl.core.config import Config
 from rcdl.interface.ui import UI
 
@@ -21,6 +20,8 @@ def get_date_now() -> str:
 
 def get_media_metadata(full_path: str) -> tuple[int, int, str]:
     """Get duration (if possible), file_size and checksum"""
+    from rcdl.core.downloader_subprocess import ffprobe_get_duration
+
     path = Path(full_path)
     if not os.path.exists(path):
         UI.error(f"{path} path should exist but does not.")
@@ -29,7 +30,7 @@ def get_media_metadata(full_path: str) -> tuple[int, int, str]:
     checksum = get_media_hash(path)
     if checksum is None:
         checksum = ""
-    duration = dls.ffprobe_get_duration(path)
+    duration = ffprobe_get_duration(path)
     if duration is None:
         duration = 0
     return duration, file_size, checksum
@@ -66,8 +67,17 @@ def get_json_hash(data: dict) -> tuple[str, str]:
     return raw_json, json_hash
 
 
-def bytes_to_mb(bytes: float | int):
-    return round(bytes / (1024 * 1024), 1)
+def bytes_to_mb(bytes: float | int) -> float:
+    return bytes / (1024 * 1024)
+
+
+def bytes_to_str(bytes: float | int) -> str:
+    mb = bytes_to_mb(bytes)
+
+    if mb > 1024:
+        gb = mb / 1024
+        return f"{gb:.1f} GB"
+    return f"{mb:.1f} MB"
 
 
 def clean_all(all: bool, partial: bool, cache: bool, medias_deleted: bool):
@@ -75,6 +85,7 @@ def clean_all(all: bool, partial: bool, cache: bool, medias_deleted: bool):
 
     from rcdl.core.db import DB
     from rcdl.core.models import Status
+    from rcdl.core.downloader_subprocess import ytdlp_clear_cache, kill_aria2c
 
     if all:
         partial = True
@@ -106,11 +117,11 @@ def clean_all(all: bool, partial: bool, cache: bool, medias_deleted: bool):
     # cache
     if cache:
         # clear yt-dlp cache
-        dls.ytdlp_clear_cache()
+        ytdlp_clear_cache()
         UI.info("Cleared yt-dlp cache dir")
 
         # kill aria2c
-        dls.kill_aria2c()
+        kill_aria2c()
         UI.info("Kill aria2c")
 
     # medias with status deleted

{rcdl-3.0.0b13.dist-info → rcdl-3.0.0b23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rcdl
-Version: 3.0.0b13
+Version: 3.0.0b23
 Summary: Coomer/Kemono CLI Downloader
 Keywords: downloader,video,media
 Author: Anonymous

{rcdl-3.0.0b13.dist-info → rcdl-3.0.0b23.dist-info}/RECORD

@@ -1,6 +1,6 @@
 rcdl/__init__.py,sha256=MIsNipkMNzSOT2WkNbSmVLvo3sdPBPN0xCOMP2r5z50,175
 rcdl/__main__.py,sha256=ge7lh3rCaWuUgVpwU88zyQGPtZgG7GLW4rslT9wo9j8,714
-rcdl/utils.py,sha256=hcaQExh8CuLgpYjDx4qBzLFjV9flnZIQsEpE1Z8Apb8,5016
+rcdl/utils.py,sha256=3WiJhtdafyEDYR4fYUBoqH6sVdSHbjghkROeJby8ScQ,5279
 rcdl/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rcdl/core/adapters.py,sha256=I__3dvSwI2W8ZZfao9RNzdyLivGBOVDk_zfx39KIuHc,7258
 rcdl/core/api.py,sha256=2OAUQV89mq1ELo9Ydj9zCde5qGHgI7bom8XLSeq7Ok8,2342
@@ -8,7 +8,7 @@ rcdl/core/config.py,sha256=9b5HTKLpBWShXqpTbgQUq3xdCqDQUs466nI16fRiWEk,6315
 rcdl/core/db.py,sha256=Ab6SuC093fQvJybbzYHvhYEkCdGW-BheUrpZhM-6j1A,9302
 rcdl/core/db_queries.py,sha256=KZW3SotPZamDxPY1KcCxo9-GvgnW6vjxDFu4h3HI1m8,2225
 rcdl/core/downloader.py,sha256=UyMz_c-kHmmASIhd8Co3khHuaTYOUTRpizp1zr-BHjY,10329
-rcdl/core/downloader_subprocess.py,sha256=jva51d_gONsSoQFzJeGO9kEc3aOWJFEH7C7vCDrnxYc,10279
+rcdl/core/downloader_subprocess.py,sha256=w9WPH2pOTFv-4dEp_iklN1bZLydGd3MjTfhiQEkp7Es,10375
 rcdl/core/file_io.py,sha256=C-W9GLQReGiuWKTLzVTsisI_ps5j0SeqNQM9VjJot14,1040
 rcdl/core/fuse.py,sha256=OKeWHh-WXWicLeCq_jgqKQovdDPfKAk2fi8lgUV-FKw,4188
 rcdl/core/models.py,sha256=1aMwEupTk68PfHrbY1v6il9p-cmMIMcdFk6Aqp9yU8M,1910
@@ -18,11 +18,11 @@ rcdl/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rcdl/gui/__main__.py,sha256=Ti5dQqYxcyHuAOT8FGjYMhV0Y-j9Y-6utRkV7eRmyWA,68
 rcdl/gui/db_viewer.py,sha256=0fM673d2JnWknFqVUDtDhzN6ojP1SGG06pO7T46IOHo,1060
 rcdl/gui/gui.py,sha256=38mn30ZQPNN0lTyqh5AwIuszkNQ_SdE_FdRzkZXSEVE,1054
-rcdl/gui/video_manager.py,sha256=ShOKmlw44ybZcO4E8UamaWAKHY5uQgj3LUHKy_7tKI8,5656
+rcdl/gui/video_manager.py,sha256=nVravn1WAko5HP6gC03-v4kJKYZVUOIt5uOvs4PCOkU,5842
 rcdl/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rcdl/interface/cli.py,sha256=mAKvphCoEXWtcnJfD5lsBGU5ooOKJM-G_Y4SeV9aUos,6094
-rcdl/interface/ui.py,sha256=XXip0RiAjGC7yGbU_fctxGOp_TiFKSvHzA2zpUMwdsc,5735
-rcdl-3.0.0b13.dist-info/entry_points.txt,sha256=TSFT1avCCO1d8pJnvuQLzX_1bA96uIDV_alKuruDN4E,42
-rcdl-3.0.0b13.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-rcdl-3.0.0b13.dist-info/METADATA,sha256=NCpTE5iScpVYyf4Zl6e0EQDCKvn0kMAvZ08KajYC-E8,2945
-rcdl-3.0.0b13.dist-info/RECORD,,
+rcdl/interface/ui.py,sha256=hR0JQME9ZER_GakFpi0OhK-7WB3wdx0U2KkRqkcGTkc,6078
+rcdl-3.0.0b23.dist-info/entry_points.txt,sha256=TSFT1avCCO1d8pJnvuQLzX_1bA96uIDV_alKuruDN4E,42
+rcdl-3.0.0b23.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+rcdl-3.0.0b23.dist-info/METADATA,sha256=m_FH-E7_pzu1h8AAWOQ8biqn4SN2azR7nCbO5tHnHeA,2945
+rcdl-3.0.0b23.dist-info/RECORD,,