Unit3Dup 0.8.8__tar.gz → 0.8.9__tar.gz

{unit3dup-0.8.8 → unit3dup-0.8.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.8.8
+Version: 0.8.9
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT
@@ -66,24 +66,19 @@ It performs the following tasks:
 unit3dup can grab the first page, convert it to an image (using xpdf),
 and then the bot can upload it to an image host, then add the link to the torrent page description.
 
-.. image:: https://img.shields.io/badge/INSTALL-gr
-   :alt: install
 
-Ubuntu/Debian
--------------
-pip install unit3dup
+Install and Upgrade
+===================
 
-Upgrade
--------
-pip install unit3dup --upgrade
+- pip install unit3dup --upgrade
 
 Ubuntu/Debian Dependencies
 --------------------------
-sudo apt install ffmpeg
+- sudo apt install ffmpeg
 
 Only for pdf
 ------------
-sudo apt install poppler-utils
+- sudo apt install poppler-utils
 
 
 Windows Dependencies
@@ -110,12 +105,6 @@ Alternative method
 4. unit3dup
 
 
-.. image:: https://img.shields.io/badge/Bot_UPDATE-gr
-   :alt: Bot Update
-
-1. pip install unit3dup --upgrade
-
-
 
 RUN
 ======

{unit3dup-0.8.8 → unit3dup-0.8.9}/README.rst

@@ -35,24 +35,19 @@ It performs the following tasks:
 unit3dup can grab the first page, convert it to an image (using xpdf),
 and then the bot can upload it to an image host, then add the link to the torrent page description.
 
-.. image:: https://img.shields.io/badge/INSTALL-gr
-   :alt: install
 
-Ubuntu/Debian
--------------
-pip install unit3dup
+Install and Upgrade
+===================
 
-Upgrade
--------
-pip install unit3dup --upgrade
+- pip install unit3dup --upgrade
 
 Ubuntu/Debian Dependencies
 --------------------------
-sudo apt install ffmpeg
+- sudo apt install ffmpeg
 
 Only for pdf
 ------------
-sudo apt install poppler-utils
+- sudo apt install poppler-utils
 
 
 Windows Dependencies
@@ -79,12 +74,6 @@ Alternative method
 4. unit3dup
 
 
-.. image:: https://img.shields.io/badge/Bot_UPDATE-gr
-   :alt: Bot Update
-
-1. pip install unit3dup --upgrade
-
-
 
 RUN
 ======

{unit3dup-0.8.8 → unit3dup-0.8.9}/Unit3Dup.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.8.8
+Version: 0.8.9
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT
@@ -66,24 +66,19 @@ It performs the following tasks:
 unit3dup can grab the first page, convert it to an image (using xpdf),
 and then the bot can upload it to an image host, then add the link to the torrent page description.
 
-.. image:: https://img.shields.io/badge/INSTALL-gr
-   :alt: install
 
-Ubuntu/Debian
--------------
-pip install unit3dup
+Install and Upgrade
+===================
 
-Upgrade
--------
-pip install unit3dup --upgrade
+- pip install unit3dup --upgrade
 
 Ubuntu/Debian Dependencies
 --------------------------
-sudo apt install ffmpeg
+- sudo apt install ffmpeg
 
 Only for pdf
 ------------
-sudo apt install poppler-utils
+- sudo apt install poppler-utils
 
 
 Windows Dependencies
@@ -110,12 +105,6 @@ Alternative method
 4. unit3dup
 
 
-.. image:: https://img.shields.io/badge/Bot_UPDATE-gr
-   :alt: Bot Update
-
-1. pip install unit3dup --upgrade
-
-
 
 RUN
 ======

{unit3dup-0.8.8 → unit3dup-0.8.9}/Unit3Dup.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ common/bdinfo_string.py
 common/bittorrent.py
 common/command.py
 common/constants.py
+common/database.py
 common/extractor.py
 common/frames.py
 common/mediainfo.py

{unit3dup-0.8.8 → unit3dup-0.8.9}/common/command.py

@@ -47,6 +47,7 @@ class CommandLine:
         parser.add_argument("-ftp", "--ftp", action="store_true", help="Connect to FTP")
 
         # optional
+        parser.add_argument("-dump", "--dump", type=str, help="Download all torrent files")
         parser.add_argument("-s", "--search", type=str, help="Search for torrent")
         parser.add_argument("-i", "--info", type=str, help="Get info on torrent")
         parser.add_argument("-up", "--uploader", type=str, help="Search by uploader")

unit3dup-0.8.9/common/database.py

@@ -0,0 +1,94 @@
+import json
+import sqlite3
+
+# Torrent attributes
+create_table_sql = ('\n'
+                    'CREATE TABLE IF NOT EXISTS torrents (\n'
+                    '    id INTEGER PRIMARY KEY AUTOINCREMENT,\n'
+                    '    name TEXT,\n'
+                    '    category TEXT,\n'
+                    '    category_id INTEGER,\n'
+                    '    created_at TEXT,\n'
+                    '    description TEXT,\n'
+                    '    details_link TEXT,\n'
+                    '    download_link TEXT,\n'
+                    '    double_upload BOOLEAN,\n'
+                    '    featured BOOLEAN,\n'
+                    '    freeleech TEXT,\n'
+                    '    igdb_id INTEGER,\n'
+                    '    imdb_id TEXT,\n'
+                    '    info_hash TEXT,\n'
+                    '    internal BOOLEAN,\n'
+                    '    leechers INTEGER,\n'
+                    '    magnet_link TEXT,\n'
+                    '    mal_id INTEGER,\n'
+                    '    media_info TEXT,\n'
+                    '    release_year INTEGER,\n'
+                    '    resolution TEXT,\n'
+                    '    resolution_id INTEGER,\n'
+                    '    seeders INTEGER,\n'
+                    '    size INTEGER,\n'
+                    '    times_completed INTEGER,\n'
+                    '    tmdb_id INTEGER,\n'
+                    '    tvdb_id INTEGER,\n'
+                    '    type TEXT,\n'
+                    '    type_id INTEGER,\n'
+                    '    uploader TEXT,\n'
+                    '    personal_release BOOLEAN,\n'
+                    '    refundable BOOLEAN,\n'
+                    '    num_file INTEGER,\n'
+                    '    bd_info TEXT,\n'
+                    '    genres TEXT,\n'
+                    '    poster TEXT,\n'
+                    '    meta TEXT,\n'
+                    '    files TEXT\n'
+                    ')\n')
+
+
+class Database:
+    """
+    Create a new database and populate it with torrents attributes
+    Search torrents based on attributes
+    """
+
+    def __init__(self, db_file):
+        self.filename = db_file
+        self.database = sqlite3.connect(f"{db_file}.db")
+        self.cursor = self.database.cursor()
+        self.build()
+
+    def build(self):
+        self.cursor.execute(create_table_sql)
+        self.database.commit()
+
+    def write(self, data: dict):
+        for key, value in data.items():
+            if isinstance(value, (dict,list)):
+                data[key] = json.dumps(value)
+
+        keys = ', '.join(data.keys())
+        placeholders = ', '.join(['?'] * len(data))
+        values = tuple(data.values())
+
+        sql = f'''INSERT INTO torrents ({keys}) VALUES ({placeholders})'''
+        self.cursor.execute(sql, values)
+        self.database.commit()
+
+    def search(self, query: str):
+        # Search a substring in 'name'
+        self.cursor.execute("SELECT name FROM torrents WHERE name LIKE ?", ('%' + query + '%',))
+        results = self.cursor.fetchall()
+        # print the results
+        for r in results:
+            print(f"[database]{r}")
+        input("[DATABASE] Press Enter to continue...")
+
+
+
+
+
+
+
+
+
+

{unit3dup-0.8.8 → unit3dup-0.8.9}/common/external_services/Pw/core/pw_api.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 import os.path
 
+import httpx
+
 from common.external_services.Pw.core.models.torrent_client_config import (
     TorrentClientConfig,
 )
@@ -37,7 +39,7 @@ class PwAPI(MyHttp):
             custom_console.bot_question_log("No PW_API_KEY provided\n")
             exit(1)
 
-    def get_indexers(self) -> ["Indexer"]:
+    def get_indexers(self) -> list[type[[Indexer]]]:
         """Get all indexers."""
 
         response = self.get_url(url=f"{self.base_url}/indexer", params={})
@@ -46,15 +48,10 @@ class PwAPI(MyHttp):
             indexers_list = response.json()
             return [Indexer(**indexer) for indexer in indexers_list]
         else:
-            return []
+            return [Indexer]
 
-    def get_torrent_url(self, url: str, filename: str):
-
-        response = self.get_url(url=url)
-        if response.status_code == 200:
-            # Write the torrent to file
-            with open(os.path.join(config_settings.options.PW_TORRENT_ARCHIVE_PATH,f"{filename}.torrent"), 'wb') as f:
-                f.write(response.content)
+    def get_torrent_url(self, url: str, filename: str)-> httpx.Response :
+        return self.get_url(url=url)
 
     def search(self, query: str) -> list[Search] | None:
         """Get search queue."""

unit3dup-0.8.9/common/external_services/Pw/pw_manager.py

@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+
+import argparse
+import os
+
+from common.external_services.Pw.pw_service import PwService
+from common.utility import ManageTitles
+from common.database import Database
+from common import config_settings
+from unit3dup.media import Media
+
+
+from qbittorrent import Client
+from view import custom_console
+
+class PwManager:
+
+    def __init__(self,cli: argparse.Namespace):
+        # Keyword
+        self.search = cli.pw
+
+        # filename for the new download
+        self.filename = ManageTitles.normalize_filename(self.search)
+
+        # Select the tracker database
+        self.database = Database(db_file=cli.tracker)
+
+
+    def process(self):
+
+        # a new qbittorrent instance
+        qb = Client(f"http://{config_settings.torrent_client_config.QBIT_HOST}:{config_settings.torrent_client_config.QBIT_PORT}/")
+        # a new pw instance
+        pw_service = PwService()
+        # Query the indexers
+        search = pw_service.search(query=self.search)
+
+        content = []
+        if search:
+            for index, s in enumerate(search):
+                    if s.seeders > 0:
+                        category = s.categories[0]['name']
+                        if category in ['Movies','TV','TV/HD']:
+                            content.append(s)
+            custom_console.bot_process_table_pw(content=content)
+
+
+            for c in content:
+                test = Media(folder=f"c:\\test\\{c.fileName}", subfolder=f"c:\\test\\{c.fileName}")
+                print(f"[Prowlarr] {c.fileName}")
+                self.database.search(test.guess_title)
+
+
+            """"
+            qb.login(username=config_settings.torrent_client_config.QBIT_USER,
+                     password=config_settings.torrent_client_config.QBIT_PASS)
+
+            for torrent in content:
+                filename = str(os.path.join(config_settings.options.PW_TORRENT_ARCHIVE_PATH,torrent.fileName))
+                print(filename)
+                magnet = pw_service.get_torrent_from_pw(torrent_url=torrent.downloadUrl,download_filename=filename)
+                qb.download_from_link(magnet, savepath=config_settings.options.PW_DOWNLOAD_PATH)
+            """

{unit3dup-0.8.8 → unit3dup-0.8.9}/common/external_services/Pw/pw_service.py

@@ -23,7 +23,12 @@ class PwService:
     def send_torrent_to_client(self, payload):
         return self.pw_api.send_torrent_to_client(payload)
 
-    def get_torrent_from_pw(self, torrent_url: str, download_filename: str):
-        return self.pw_api.get_torrent_url(url=torrent_url, filename=download_filename)
+    def get_torrent_from_pw(self, torrent_url: str, download_filename: str)-> str | None:
+        response = self.pw_api.get_torrent_url(url=torrent_url, filename=download_filename)
+        # Redirect (PW)
+        if response.status_code == 301:
+            return response.headers.get('Location')
+        return None
+
 
 

{unit3dup-0.8.8 → unit3dup-0.8.9}/common/external_services/imageHost.py

@@ -15,6 +15,7 @@ class ImageUploader(ABC):
         self.image = base64.b64encode(image)
         self.key = key
         self.image_name = image_name
+        self.timeout = 30
 
     @abstractmethod
     def get_endpoint(self):
@@ -39,7 +40,7 @@ class ImageUploader(ABC):
             try:
                 upload_n += 1
                 response = requests.post(
-                    self.get_endpoint(), data = data, files = files, timeout = 20
+                    self.get_endpoint(), data = data, files = files, timeout = self.timeout
                 )
                 response.raise_for_status()
                 return response.json()
@@ -60,7 +61,7 @@ class ImageUploader(ABC):
             except requests.exceptions.Timeout:
                 custom_console.bot_log(
                     f"[{self.__class__.__name__}] We did not receive a response from the server"
-                    f" within the 20 second limit"
+                    f" within the {self.timeout} second limit"
                 )
                 break
 

{unit3dup-0.8.8 → unit3dup-0.8.9}/common/settings.py

@@ -13,7 +13,7 @@ from common.utility import ManageTitles
 from common import trackers
 
 config_file = "Unit3Dbot.json"
-version = "0.8.8"
+version = "0.8.9"
 
 if os.name == "nt":
     PW_TORRENT_ARCHIVE_PATH: Path = Path(os.getenv("LOCALAPPDATA", ".")) / "Unit3Dup_config" / "pw_torrent_archive"
@@ -40,7 +40,7 @@ def get_default_path(field: str)-> str:
             "CACHE_PATH": CACHE_PATH,
             "WATCHER_DESTINATION_PATH": WATCHER_DESTINATION_PATH,
             "WATCHER_PATH": WATCHER_PATH,
-            "PW_DOWNLOAD": PW_DOWNLOAD_PATH,
+            "PW_DOWNLOAD_PATH": PW_DOWNLOAD_PATH,
             "PW_TORRENT_ARCHIVE_PATH": PW_TORRENT_ARCHIVE_PATH
     }
     return str(default_paths[field])
@@ -130,7 +130,7 @@ class Options(BaseModel):
     PW_API_KEY: str | None = None
     PW_URL: str = "http://localhost:9696/api/v1"
     PW_TORRENT_ARCHIVE_PATH: str | None = None
-    PW_DOWNLOAD: str | None = None
+    PW_DOWNLOAD_PATH: str | None = None
     FTPX_USER: str = "user"
     FTPX_PASS: str = "pass"
     FTPX_IP: str = "127.0.0.1"
@@ -425,7 +425,7 @@ class Config(BaseModel):
                              'CACHE_SCR','CACHE_DBONLINE', 'PERSONAL_RELEASE']:
                     section[field] = Validate.boolean(value=section[field], field_name=field)
 
-                if field in ['TORRENT_COMMENT','PW_TORRENT_ARCHIVE_PATH','WATCHER_PATH','DEFAULT_TRACKER']:
+                if field in ['TORRENT_COMMENT','WATCHER_PATH','DEFAULT_TRACKER']:
                     section[field] = Validate.string(value=section[field], field_name=field)
 
                 if field in ['NUMBER_OF_SCREENSHOTS','COMPRESS_SCSHOT','IMGBB_PRIORITY','FREE_IMAGE_PRIORITY',
@@ -451,11 +451,29 @@ class Config(BaseModel):
                     section[field] =Validate.unit3dup_path(path=section[field],field_name=field,
                                                            default_path=get_default_path(field=field))
 
+
         return v
 
     @model_validator(mode='before')
     def set_default_options(cls, v):
-        return v or Options()
+        section = v['options']
+
+        for field, value in section.items():
+            if value is None:
+                print(f"Please fix the '{field}' value")
+                exit(1)
+            else:
+                field = field.upper()
+
+                if field == 'PW_TORRENT_ARCHIVE_PATH':
+                    section[field] = Validate.unit3dup_path(path=section[field], field_name=field,
+                                                    default_path=get_default_path(field=field))
+
+                if field == 'PW_DOWNLOAD_PATH':
+                    section[field] = Validate.unit3dup_path(path=section[field], field_name=field,
+                                                    default_path=get_default_path(field=field))
+
+        return v
 
     @model_validator(mode='before')
     def set_default_console_options(cls, v):
@@ -570,7 +588,7 @@ class Load:
                 "PW_API_KEY": "no_key",
                 "PW_URL": "http://localhost:9696/api/v1",
                 "PW_TORRENT_ARCHIVE_PATH": ".",
-                "PW_DOWNLOAD": ".",
+                "PW_DOWNLOAD_PATH": ".",
                 "FTPX_USER": "user",
                 "FTPX_PASS": "pass",
                 "FTPX_IP": "127.0.0.1",

{unit3dup-0.8.8 → unit3dup-0.8.9}/pyproject.toml

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

{unit3dup-0.8.8 → unit3dup-0.8.9}/unit3dup/__main__.py

@@ -127,8 +127,10 @@ def main():
 
     # Pw
     if cli.args.pw:
-        bot = Bot(path=cli.args.pw,cli=cli.args, trackers_name_list=tracker_name_list)
-        bot.pw()
+        print("Not yet implemented")
+        # bot = Bot(path=cli.args.pw,cli=cli.args, trackers_name_list=tracker_name_list)
+        # bot.pw()
+        return
 
 
     # ftp and upload
@@ -154,6 +156,12 @@ def main():
         torrent_info.view_search(cli.args.search)
         return
 
+    # Dump
+    if cli.args.dump:
+        print("Not yet implemented")
+        # torrent_info.view_search(cli.args.dump,inkey=False)
+        return
+
     if cli.args.info:
         torrent_info.view_search(cli.args.info, info=True)
         return

{unit3dup-0.8.8 → unit3dup-0.8.9}/unit3dup/torrent.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 import re
+import time
 import requests
 
 from common.trackers.trackers import TRACKData
+from common.database import Database
 from unit3dup import pvtTracker
 from view import custom_console
 
@@ -10,8 +12,9 @@ class Torrent:
 
     def __init__(self, tracker_name: str):
 
-        self.perPage = 130
+        self.perPage = 100
         self.tracker = pvtTracker.Unit3d(tracker_name=tracker_name)
+        self.database = Database(db_file=tracker_name)
 
     def get_unique_id(self, media_info: str) -> str:
         # Divido per campi
@@ -142,7 +145,6 @@ class View(Torrent):
     def __init__(self, tracker_name: str):
         super().__init__(tracker_name=tracker_name)
 
-        self.perPage = 130
         # Load the constant tracker
         self.tracker_data = TRACKData.load_from_module(tracker_name=tracker_name)
         print()
@@ -171,10 +173,8 @@ class View(Torrent):
                 f" -> {item['attributes']['name']}"
             )
 
-    @staticmethod
-    def print_normal(tracker_data: dict):
+    def print_normal(self, tracker_data: dict):
         data = [item for item in tracker_data["data"]]
-
         for item in data:
             if item['attributes']['tmdb_id'] != 0:
                 if not item['attributes']['release_year']:
@@ -184,14 +184,18 @@ class View(Torrent):
 
                 media = f"[TRACKER] TMDB: {item['attributes']['tmdb_id']} - {release_year}"
 
+            elif item['attributes']['igdb_id'] !=0:
+                    media = f"[TRACKER] IGDB: {item['attributes']['igdb_id']}"
             else:
-                media = f"[TRACKER] IGDB: {item['attributes']['igdb_id']}"
+                media = f"[TRACKER] DOC:"
 
+            # 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'])
 
 
-
-    def page_view(self, tracker_data: dict, tracker: pvtTracker, info=False):
+    def page_view(self, tracker_data: dict, tracker: pvtTracker, info=False, inkey=True):
 
         self.print_normal(tracker_data) if not info else self.print_info(tracker_data)
         page = 0
@@ -199,12 +203,17 @@ class View(Torrent):
             if not tracker_data["links"]["next"]:
                 break
 
+            # Wait for user input if inkey is True
             page += 1
-            custom_console.bot_question_log(
-                f"\n Prossima Pagina '{page}' - Premi un tasto per continuare, Q(quit) - "
-            )
-            if input().lower() == "q":
-                break
+            if inkey:
+                custom_console.bot_question_log(
+                    f"\n Prossima Pagina '{page}' - Premi un tasto per continuare, Q(quit) - "
+                )
+                if input().lower() == "q":
+                    break
+            else:
+                # otherwise wait for 2 seconds ( 30 request/ 60sec max) dirty
+                time.sleep(2)
             print()
             custom_console.rule(f"\n[bold blue]'Page -> {page}'", style="#ea00d9")
             tracker_data = tracker.next(url=tracker_data["links"]["next"])
@@ -214,11 +223,11 @@ class View(Torrent):
                 else self.print_info(tracker_data)
             )
 
-    def view_search(self, keyword: str, info=False):
+    def view_search(self, keyword: str, info=False, inkey=True):
         tracker_data = self.search(keyword=keyword)
         custom_console.log(f"Searching.. '{keyword}'")
         (
-            self.page_view(tracker_data=tracker_data, tracker=self.tracker)
+            self.page_view(tracker_data=tracker_data, tracker=self.tracker,inkey=inkey)
             if not info
             else self.page_view(
                 tracker_data=tracker_data, tracker=self.tracker, info=True

{unit3dup-0.8.8 → unit3dup-0.8.9}/view/custom_console.py

@@ -69,6 +69,31 @@ class CustomConsole(Console):
 
         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")

unit3dup-0.8.8/common/external_services/Pw/pw_manager.py

@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import argparse
-import os
-
-from common.external_services.Pw.pw_service import PwService
-from common.utility import ManageTitles
-from common import config_settings
-
-from qbittorrent import Client
-from view import custom_console
-
-class PwManager:
-
-    def __init__(self,cli: argparse.Namespace):
-        # Keyword
-        self.search = cli.pw
-
-        # filename for the new download
-        self.filename = ManageTitles.normalize_filename(self.search)
-
-
-    def process(self):
-
-        # a new qbittorent instance
-        qb = Client(f"http://{config_settings.tracker_config.QBIT_HOST}:{config_settings.tracker_config.QBIT_PORT}/")
-        # a new pw instance
-        pw_service = PwService()
-        # Query the indexers
-        search = pw_service.search(query=self.search)
-
-        if search:
-            for index, s in enumerate(search):
-                if s.seeders > 0:
-                    torrent_file = search[index]
-                    custom_console.log(torrent_file.downloadUrl)
-                    pw_service.get_torrent_from_pw(torrent_url=torrent_file.downloadUrl,download_filename=self.filename)
-
-                    qb.login(username=config_settings.tracker_config.QBIT_USER,
-                             password=config_settings.tracker_config.QBIT_PASS)
-
-                    qb.download_from_file(
-                        file_buffer=open(os.path.join(config_settings.options.PW_TORRENT_ARCHIVE_PATH,
-                                                      f"{self.filename}.torrent"), "rb"),
-                        savepath=config_settings.options.PW_DOWNLOAD_PATH,
-                    )