Unit3Dup 0.8.16__tar.gz → 0.8.18__tar.gz

{unit3dup-0.8.16 → unit3dup-0.8.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.8.16
+Version: 0.8.18
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT

{unit3dup-0.8.16 → unit3dup-0.8.18}/Unit3Dup.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.8.16
+Version: 0.8.18
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT

{unit3dup-0.8.16 → unit3dup-0.8.18}/Unit3Dup.egg-info/SOURCES.txt

@@ -98,5 +98,4 @@ unit3dup/web/__init__.py
 unit3dup/web/main.py
 view/__init__.py
 view/custom_console.py
-view/custom_console2.py
-view/settings.py
+view/web_console.py

{unit3dup-0.8.16 → unit3dup-0.8.18}/common/command.py

@@ -48,6 +48,7 @@ class CommandLine:
         # optional
         parser.add_argument("-dump", "--dump", action="store_true", help="Download all torrent titles")
         parser.add_argument("-s", "--search", type=str, help="Search for torrent")
+        parser.add_argument("-db", "--dbsave", action="store_true", help="Save the search results")
         parser.add_argument("-i", "--info", type=str, help="Get info on torrent")
         parser.add_argument("-up", "--uploader", type=str, help="Search by uploader")
         parser.add_argument("-desc", "--description", type=str, help="Search by description")

{unit3dup-0.8.16 → unit3dup-0.8.18}/common/settings.py

@@ -13,7 +13,7 @@ from common.utility import ManageTitles
 from common import trackers
 
 config_file = "Unit3Dbot.json"
-version = "0.8.16"
+version = "0.8.18"
 
 if os.name == "nt":
     PW_TORRENT_ARCHIVE_PATH: Path = Path(os.getenv("LOCALAPPDATA", ".")) / "Unit3Dup_config" / "pw_torrent_archive"

{unit3dup-0.8.16 → unit3dup-0.8.18}/common/utility.py

@@ -37,6 +37,11 @@ class ManageTitles:
         "BR": "BRA",
         "RU": "RUS",
         "CN": "CHN",
+        "EN-US": "ENG",
+        "EN-GB": "ENG",
+        "EN-AU": "ENG",
+        "ES-ES": "ESP",
+        "ES-MX": "ESP"
     }
 
     @staticmethod
@@ -191,6 +196,7 @@ class ManageTitles:
             (r'\bCINEMA \bMD\b', 'CINEMA-MD'),
             (r'\bHEVC \bFHC\b', 'HEVC-FHC'),
             (r'\bCBR \bCBZ\b', 'CBR-CBZ'),
+            (r'\bH \b264\b', 'H.264'),
 
         ]
 

{unit3dup-0.8.16 → unit3dup-0.8.18}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 dynamic = ["dependencies"]
 name = "Unit3Dup"
-version = "0.8.16"
+version = "0.8.18"
 description = "An uploader for the Unit3D torrent tracker"
 readme = "README.rst"
 requires-python = ">=3.10"

{unit3dup-0.8.16 → unit3dup-0.8.18}/unit3dup/__main__.py

@@ -145,8 +145,7 @@ def main():
 
     # Search by different criteria
     if cli.args.search:
-        print("NOT YET IMPLEMENTED")
-        # torrent_info.view_search(cli.args.search)
+        torrent_info.view_search(cli.args.search, save=cli.args.dbsave)
         return
 
     # Dump

{unit3dup-0.8.16 → unit3dup-0.8.18}/unit3dup/automode.py

@@ -45,6 +45,7 @@ class Auto:
             if self.auto == "folder":
                 # -f command (single folder series or 'saga')
                 return self._lists(files_path=[], subfolders_path=[self.path])
+            return None
         else:
             return self._lists(files_path=[self.path], subfolders_path=[])
 

{unit3dup-0.8.16 → unit3dup-0.8.18}/unit3dup/media.py

@@ -14,7 +14,6 @@ class Media:
         self.folder: str = folder
         self.subfolder: str = subfolder
         self.title: str = os.path.basename(os.path.join(self.folder, self.subfolder))
-        self._not_title_lang = False
 
         # // Media
         self._crew_list: list[str] | None = None
@@ -53,9 +52,6 @@ class Media:
         self._igdb_id: int | None = None
         self._generate_title: str | None = None
 
-    @property
-    def no_title_lang(self) -> bool:
-        return self._not_title_lang
 
     @property
     def title_sanitized(self)-> str:
@@ -283,8 +279,6 @@ class Media:
                 if converted_code := ManageTitles.convert_iso(code):
                     self._audio_languages = converted_code
                     return self._audio_languages
-            # no language found in title
-            self._not_title_lang = True
             # get from the audio track
             self._audio_languages = self.languages
         return self._audio_languages

{unit3dup-0.8.16 → unit3dup-0.8.18}/unit3dup/media_manager/ContentManager.py

@@ -51,10 +51,6 @@ class ContentManager:
             content = self.get_data(media=media)
             if content:
                 contents.append(content)
-
-            # Add language to the title from the media file when it's absent
-            if not media._not_title_lang:
-                media.display_name = " ".join([media.display_name] + media.audio_languages)
         return contents
 
     def get_data(self, media: Media) -> Media | bool:
@@ -93,6 +89,10 @@ class ContentManager:
             media.igdb_id = self.igdb_id
             media.display_name = self.display_name
 
+            # Add language to the title from the media file when it's absent
+            for found_languages in media.audio_languages:
+                if found_languages not in media.display_name.upper():
+                    media.display_name = f"{media.display_name}  {found_languages}"
             return media
         else:
             return False

{unit3dup-0.8.16 → unit3dup-0.8.18}/unit3dup/torrent.py

@@ -174,7 +174,7 @@ class View(Torrent):
                 f" -> {item['attributes']['name']}"
             )
 
-    def print_normal(self, tracker_data: dict):
+    def print_normal(self, tracker_data: dict, save= False):
         data = [item for item in tracker_data["data"]]
         for item in data:
             if item['attributes']['tmdb_id'] != 0:
@@ -192,13 +192,14 @@ class View(Torrent):
 
             # Print a data to the console
             custom_console.bot_log(f"\n {media} - {item['attributes']['name']}")
-            # Save torrent data into database
-            self.database.write(item['attributes'])
+            # Save torrent data into database by -db flag
+            if save:
+                self.database.write(item['attributes'])
 
 
-    def page_view(self, tracker_data: dict, tracker: pvtTracker, info=False, inkey=True):
+    def page_view(self, tracker_data: dict, tracker: pvtTracker, info=False, inkey=True, save=False):
 
-        self.print_normal(tracker_data) if not info else self.print_info(tracker_data)
+        self.print_normal(tracker_data,save=save) if not info else self.print_info(tracker_data)
         page = 0
         while True:
             if not tracker_data["links"]["next"]:
@@ -219,16 +220,16 @@ class View(Torrent):
             custom_console.rule(f"\n[bold blue]'Page -> {page}'", style="#ea00d9")
             tracker_data = tracker.next(url=tracker_data["links"]["next"])
             (
-                self.print_normal(tracker_data)
+                self.print_normal(tracker_data, save=save)
                 if not info
                 else self.print_info(tracker_data)
             )
 
-    def view_search(self, keyword: str, info=False, inkey=True):
+    def view_search(self, keyword: str, info=False, inkey=True, save=False):
         tracker_data = self.search(keyword=keyword)
         custom_console.log(f"Searching.. '{keyword}'")
         (
-            self.page_view(tracker_data=tracker_data, tracker=self.tracker,inkey=inkey)
+            self.page_view(tracker_data=tracker_data, tracker=self.tracker,inkey=inkey, save=save)
             if not info
             else self.page_view(
                 tracker_data=tracker_data, tracker=self.tracker, info=True

unit3dup-0.8.18/view/web_console.py

@@ -0,0 +1,205 @@
+# -*- coding: utf-8 -*-
+from rich.align import Align
+from rich.console import Console
+from rich.panel import Panel
+from rich.text import Text
+from rich.table import Table
+from nicegui import ui
+from common import config_settings
+
+class CustomConsole(Console):
+    def __init__(self):
+        super().__init__(log_path=False)
+
+        ui.add_head_html('''
+        <style>
+            html, body {
+                margin: 0;
+                padding: 0;
+                overflow: hidden;
+                height: 100%;
+                background-color: #002b36;
+            }
+        </style>
+        ''')
+
+        self.colors = {
+            'info': '#839496',  # grigio chiaro
+            'cmd': '#93a1a1',  # input comando
+            'success': '#859900',  # verde
+            'error': '#dc322f',  # rosso
+            'warning': '#b58900',  # giallo
+            'highlight': '#268bd2',  # blu
+            'log': '#586e75',  # grigio scuro
+            'message': '#2aa198',  # ciano tenue
+        }
+
+        self.container = ui.column().style(
+            '''
+            width: 90vw;
+            height: 90vh;
+            background-color: #002b36;
+            color: #839496;
+            font-family: 'Fira Code', 'Cascadia Code', monospace;
+            font-size: clamp(0.8rem, 1.5vw, 1rem);
+            padding: 1rem;
+            overflow-y: auto;
+            border: 1px solid #586e75;
+            box-sizing: border-box;
+            white-space: pre-wrap;
+            margin: auto;
+            display: flex;
+            flex-direction: column;
+            row-gap: 0;
+            '''
+        )
+
+    def welcome_message(self):
+        title_panel = Panel(
+            Text(f"UNIT3Dup - An uploader for the Unit3D torrent tracker -\n{config_settings.console_options.WELCOME_MESSAGE}",
+                 style=config_settings.console_options.WELCOME_MESSAGE_COLOR, justify="center"),
+            border_style=config_settings.console_options.WELCOME_MESSAGE_BORDER_COLOR,
+            title_align="center",
+        )
+        self.print(title_panel)
+
+    def panel_message(self, message: str):
+        title_panel = Panel(
+            Text(message, style=config_settings.console_options.PANEL_MESSAGE_COLOR, justify="center"),
+            border_style=config_settings.console_options.PANEL_MESSAGE_BORDER_COLOR,
+            title_align="center",
+            expand=False,
+        )
+        self.print(title_panel, justify="center")
+
+    def bot_log(self, message: str):
+        self.log(message, style=config_settings.console_options.NORMAL_COLOR)
+        self._print(message, self.colors['info'])
+
+
+    def bot_error_log(self, message: str):
+        self.log(message, style=config_settings.console_options.ERROR_COLOR)
+        self._print(message, self.colors['error'])
+
+
+    def bot_warning_log(self, message: str):
+        self.log(message, style=config_settings.console_options.QUESTION_MESSAGE_COLOR)
+        self._print(message, self.colors['warning'])
+
+    def bot_input_log(self, message: str):
+        self.print(f"{message} ", end="", style=config_settings.console_options.NORMAL_COLOR)
+
+    def bot_question_log(self, message: str):
+        self.print(message, end="", style=config_settings.console_options.QUESTION_MESSAGE_COLOR)
+
+    def bot_counter_log(self, message: str):
+        self.print(message, end="\r", style=config_settings.console_options.QUESTION_MESSAGE_COLOR)
+
+    def bot_process_table_log(self, content: list):
+
+        table = Table(
+            title="Here is your files list" if content else "There are no files here",
+            border_style="bold blue",
+            header_style="red blue",
+        )
+
+        table.add_column("Torrent Pack", style="dim")
+        table.add_column("Media", justify="left", style="bold green")
+        table.add_column("Path", justify="left", style="bold green")
+
+        for item in content:
+            pack = "Yes" if item.torrent_pack else "No"
+            table.add_row(
+                pack,
+                item.category,
+                item.torrent_path,
+            )
+
+        self.print(Align.center(table))
+
+    def bot_process_table_pw(self, content: list):
+
+        table = Table(
+            title="Here is your files list" if content else "There are no files here",
+            border_style="bold blue",
+            header_style="red blue",
+        )
+
+        table.add_column("Category", style="dim")
+        table.add_column("Indexer", justify="left", style="bold green")
+        table.add_column("Title", justify="left", style="bold green")
+        table.add_column("Size", justify="left", style="bold green")
+        table.add_column("Seeders", justify="left", style="bold green")
+
+        for item in content:
+            table.add_row(
+                item.categories[0]['name'],
+                item.indexer,
+                item.title,
+                str(item.size),
+                str(item.seeders),
+            )
+
+        self.print(Align.center(table))
+
+    def bot_tmdb_table_log(self, result, title: str, media_info_language: str):
+
+        self.print("\n")
+        media_info_audio_languages = (",".join(media_info_language)).upper()
+        self.panel_message(f"\nResults for {title.upper()}")
+
+        table = Table(border_style="bold blue")
+        table.add_column("TMDB ID", style="dim")
+        table.add_column("LANGUAGE", style="dim")
+        table.add_column("TMDB POSTER", justify="left", style="bold green")
+        table.add_column("TMDB BACKDROP", justify="left", style="bold green")
+        # table.add_column("TMDB KEYWORDS", justify="left", style="bold green")
+        table.add_row(
+            str(result.video_id),
+            media_info_audio_languages,
+            result.poster_path,
+            result.backdrop_path,
+        )
+        self.print(Align.center(table))
+
+    def wait_for_user_confirmation(self, message: str):
+        # Wait for user confirmation in case of validation failure
+        try:
+            self.bot_error_log(message=message)
+            input("> ")
+        except KeyboardInterrupt:
+            self.bot_error_log("\nOperation cancelled.Please update your config file")
+            exit(0)
+
+    def user_input(self,message: str)-> int:
+        try:
+            while True:
+                self.bot_input_log(message=message)
+                user_tmdb_id = input()
+                if user_tmdb_id.isdigit():
+                    user_tmdb_id = int(user_tmdb_id)
+                    return user_tmdb_id if user_tmdb_id < 9999999 else 0
+        except KeyboardInterrupt:
+            self.bot_error_log("\nOperation cancelled. Bye !")
+            exit(0)
+
+    def user_input_str(self,message: str)-> str:
+        try:
+            while True:
+                self.bot_input_log(message=message)
+                user_ = input()
+                return user_ if user_ else '0'
+        except KeyboardInterrupt:
+            self.bot_error_log("\nOperation cancelled. Bye !")
+            exit(0)
+
+
+    def _print(self, text: str, color: str):
+        with self.container:
+            ui.label(text).style(f'color: {color}; font-family: monospace;')
+
+    # def print_cmd(self, text: str): self._print(text, self.colors['cmd'])
+    def print_success(self, text: str): self._print(text, self.colors['success'])
+    def print_highlight(self, text: str): self._print(text, self.colors['highlight'])
+    def print_srv_log(self, text: str): self._print(text, self.colors['log'])
+    def print_message(self, text: str): self._print(text, self.colors['message'])

unit3dup-0.8.16/view/custom_console2.py

@@ -1,139 +0,0 @@
-from nicegui import ui
-from typing import List, Callable
-from common import config_settings
-from datetime import datetime
-
-
-class NiceGUIConsole:
-    def __init__(self):
-        self.init_footer_log()
-        self.log_area = ui.column().style('max-height: 400px; overflow-y: auto; border: 1px solid #ccc; padding: 10px')
-        self.counter_label = ui.label()
-
-    def init_footer_log(self):
-        with ui.element('div').style('''
-            position: fixed;
-            bottom: 0;
-            left: 0;
-            width: 100%;
-            background-color: #2e3b4e;
-            text-align: center;
-            padding: 4px 8px;  /* meno padding verticale */
-            font-size: 14px;
-            line-height: 18px;
-            z-index: 1000;
-        ''') as footer:
-            self.footer_label = ui.label("Ready.").style("color: white; margin: 0")
-
-    def log_message(self, message: str, color: str = "#ffffff"):
-        timestamp = datetime.now().strftime("%H:%M:%S")
-        """
-        with self.log_area:
-            ui.label(f"[{timestamp}] {message}").style(f'color: {color}; white-space: pre-wrap')
-        """
-        self.footer_label.text = f"${timestamp}$ {message}"
-        self.footer_label.style(f"color: {color}")
-
-
-    def panel_message(self, message: str, color: str = "#ccc"):
-        with ui.card().style(f'background-color: {color}; color: white'):
-            ui.label(message).style("text-align: center")
-
-    def bot_log(self, message: str):
-        self._add_log(message, config_settings.console_options.NORMAL_COLOR)
-
-    def bot_error_log(self, message: str):
-        self._add_log(f'❌ {message}', config_settings.console_options.ERROR_COLOR)
-
-    def bot_warning_log(self, message: str):
-        self._add_log(f'⚠️ {message}', config_settings.console_options.QUESTION_MESSAGE_COLOR)
-
-    def bot_input_log(self, message: str):
-        self._add_log(message, config_settings.console_options.NORMAL_COLOR)
-
-    def bot_question_log(self, message: str):
-        self._add_log(message, config_settings.console_options.QUESTION_MESSAGE_COLOR)
-
-    def bot_counter_log(self, message: str):
-        self.counter_label.set_text(message)
-        self.counter_label.style(f'color: {config_settings.console_options.QUESTION_MESSAGE_COLOR}')
-
-    def bot_process_table_log(self, content: List):
-        ui.label("Here is your files list" if content else "There are no files here")
-        ui.table(columns=[
-            {'name': 'pack', 'label': 'Torrent Pack', 'field': 'pack'},
-            {'name': 'category', 'label': 'Media', 'field': 'category'},
-            {'name': 'path', 'label': 'Path', 'field': 'path'},
-        ], rows=[
-            {
-                'pack': 'Yes' if item.torrent_pack else 'No',
-                'category': item.category,
-                'path': item.torrent_path,
-            } for item in content
-        ])
-
-    def bot_process_table_pw(self, content: List):
-        ui.label("Here is your files list" if content else "There are no files here")
-        ui.table(columns=[
-            {'name': 'category', 'label': 'Category', 'field': 'category'},
-            {'name': 'indexer', 'label': 'Indexer', 'field': 'indexer'},
-            {'name': 'title', 'label': 'Title', 'field': 'title'},
-            {'name': 'size', 'label': 'Size', 'field': 'size'},
-            {'name': 'seeders', 'label': 'Seeders', 'field': 'seeders'},
-        ], rows=[
-            {
-                'category': item.categories[0]['name'],
-                'indexer': item.indexer,
-                'title': item.title,
-                'size': str(item.size),
-                'seeders': str(item.seeders),
-            } for item in content
-        ])
-
-    def bot_tmdb_table_log(self, result, title: str, media_info_language: List[str]):
-        media_info_audio_languages = ", ".join(media_info_language).upper()
-        self.panel_message(f"Results for {title.upper()}")
-
-        ui.table(columns=[
-            {'name': 'tmdb_id', 'label': 'TMDB ID', 'field': 'tmdb_id'},
-            {'name': 'language', 'label': 'LANGUAGE', 'field': 'language'},
-            {'name': 'poster', 'label': 'TMDB POSTER', 'field': 'poster'},
-            {'name': 'backdrop', 'label': 'TMDB BACKDROP', 'field': 'backdrop'},
-        ], rows=[{
-            'tmdb_id': str(result.video_id),
-            'language': media_info_audio_languages,
-            'poster': result.poster_path,
-            'backdrop': result.backdrop_path,
-        }])
-
-    def wait_for_user_confirmation(self, message: str, on_confirm: Callable):
-        self.bot_error_log(message)
-        with ui.row():
-            ui.button("OK", on_click=on_confirm)
-            ui.button("Cancel",
-                      on_click=lambda: self.bot_error_log("Operation cancelled. Please update your config file."))
-
-    def user_input(self, message: str, on_submit: Callable[[int], None]):
-        with ui.row():
-            input_field = ui.input(label=message, placeholder="Enter TMDB ID").props("type=number")
-            ui.button("Submit", on_click=lambda: self._validate_and_submit(input_field.value, on_submit))
-
-    def user_input_str(self, message: str, on_submit: Callable[[str], None]):
-        with ui.row():
-            input_field = ui.input(label=message, placeholder="Enter text")
-            ui.button("Submit", on_click=lambda: on_submit(input_field.value or "0"))
-
-    def _add_log(self, message: str, color: str = "#fff"):
-        timestamp = datetime.now().strftime("%H:%M:%S")
-        with self.log_area:
-            ui.label(f"[{timestamp}] {message}").style(f'color: {color}; white-space: pre-wrap')
-
-    def _validate_and_submit(self, value: str, on_submit: Callable[[int], None]):
-        try:
-            if value.isdigit():
-                user_id = int(value)
-                on_submit(user_id if user_id < 9999999 else 0)
-            else:
-                self.bot_error_log("Please enter a valid number.")
-        except Exception as e:
-            self.bot_error_log(f"Error: {str(e)}")

unit3dup-0.8.16/view/settings.py

@@ -1,31 +0,0 @@
-from nicegui import ui
-
-class SettingsPanel:
-    def __init__(self):
-        with ui.column().classes('items-center q-pa-xl'):
-
-            # Header
-            ui.label("Settings").style('font-size: 32px; font-weight: bold; color: #2e3b4e')
-
-            # Settings card
-            with ui.card().style('max-width: 400px; width: 100%; padding: 20px; box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1)'):
-
-                self._setting_group("Account Settings", [
-                    ("Enable notifications", True),
-                    ("Allow email updates", False),
-                ])
-
-                ui.separator().style("margin: 20px 0")
-
-                self._setting_group("Privacy", [
-                    ("Location tracking", False),
-                    ("Data sharing", True),
-                ])
-
-    def _setting_group(self, title: str, settings: list[tuple[str, bool]]):
-        ui.label(title).style('font-size: 18px; font-weight: 500; margin-bottom: 10px; color: #333')
-
-        for label_text, default_value in settings:
-            with ui.row().style('justify-content: space-between; align-items: center; margin-bottom: 12px'):
-                ui.label(label_text).style("font-size: 14px; color: #555")
-                ui.switch(value=default_value)