Unit3Dup 0.9.24__tar.gz → 0.9.26__tar.gz

{unit3dup-0.9.24 → unit3dup-0.9.26}/PKG-INFO

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

{unit3dup-0.9.24 → unit3dup-0.9.26}/Unit3Dup.egg-info/PKG-INFO

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

unit3dup-0.9.26/common/database.py

@@ -0,0 +1,78 @@
+import json
+import os
+import sqlite3
+from unit3dup import config_settings
+
+# 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.CACHE_PATH = config_settings.user_preferences.CACHE_PATH
+        self.database = sqlite3.connect(os.path.join(self.CACHE_PATH, f"{db_file}.db"))
+        self.cursor = self.database.cursor()
+        self.build()
+
+    def build(self):
+        self.cursor.execute("DROP TABLE IF EXISTS torrents")
+        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()

{unit3dup-0.9.24 → unit3dup-0.9.26}/common/settings.py

@@ -23,7 +23,7 @@ user_tags_file = "tags_list.json"
 user_sign_file = "sign_list.json"
 bane_file = "ban_list.json"
 
-version = "0.9.24"
+version = "0.9.26"
 
 if os.name == "nt":
     WATCHER_DESTINATION_PATH: Path = Path(

{unit3dup-0.9.24 → unit3dup-0.9.26}/common/trackers/signs_list.py

@@ -8,6 +8,7 @@ SIGNS_LIST = {
     "APEX": "releaser",
     "ARMOR": "releaser",
     "ARRANCAR": "releaser",
+    "ARTEMIX": "releaser",
     "ARTEMIX MIRCREW": "releaser",
     "ASPIDE MIRCREW": "releaser",
     "ASTOR": "releaser",
@@ -22,6 +23,7 @@ SIGNS_LIST = {
     "BL4CK-B4RT-MIRCREW": "releaser",
     "BLUWORLD": "releaser",
     "BOBDOBBS": "releaser",
+    "BONE": "releaser",
     "BULLITT": "releaser",
     "BUMBLEBEE1982": "releaser",
     "BUREK": "releaser",
@@ -82,6 +84,7 @@ SIGNS_LIST = {
     "G66": "releaser",
     "GABIACAS": "releaser",
     "GATTOPOLLO": "releaser",
+    "GEGE": "releaser",
     "GFM": "releaser",
     "GIUSEPPETNT": "releaser",
     "GOLDENTORRENT": "releaser",
@@ -215,12 +218,14 @@ SIGNS_LIST = {
     "TIGER": "releaser",
     "TIGRE67": "releaser",
     "TBR": "releaser",
+    "TBZ": "releaser",
     "T4P3": "releaser",
     "TORRENTER10": "releaser",
     "TOTAL_SHARE88": "releaser",
     "TREE7458": "releaser",
     "TRITON": "releaser",
     "TRL": "releaser",
+    "TSUNAMI": "releaser",
     "UBI": "releaser",
     "UH": "releaser",
     "V3SP4EV3R": "releaser",

{unit3dup-0.9.24 → unit3dup-0.9.26}/common/trackers/tags_list.py

@@ -86,7 +86,9 @@ TAGS_LIST = {
             "EDITION": "version",
             "DIRECTOR'S": "version",
             "CUT": "version",
+            "RERIP": "version",
 
+            "COLLECTION": "version",
             "SUBBED": "version",
             "MUX": "version",
             "REMASTERED": "version",

{unit3dup-0.9.24 → unit3dup-0.9.26}/common/utility.py

@@ -21,7 +21,7 @@ class ManageTitles:
     ]
 
     iso_3166_alpha3 = [
-        "ENG", "USA", "GBR", "ITA", "DEU", "FRA", "ESP",
+        "ENG", "USA", "GBR", "ITA", "DEU", "FRA", "ESP", "SPA",
         "BRA", "JPN", "CHN", "RUS", "PER", "NOR",
         "SWE", "DAN", "POL", "HIN", "TUR", "ARA", "KOR", "VIE", "IND"
     ]
@@ -31,7 +31,7 @@ class ManageTitles:
         "IT": "ITA",
         "DE": "DEU",
         "FR": "FRA",
-        "ES": "ESP", "ES-ES": "ESP", "ES-MX": "ESP",
+        "ES": "SPA", "ES-ES": "SPA", "ES-MX": "SPA",
         "BR": "BRA",
         "JP": "JPN",
         "CN": "CHN",
@@ -56,7 +56,7 @@ class ManageTitles:
         "ITALIAN": "ITA",
         "GERMAN": "DEU",
         "FRENCH": "FRA",
-        "SPANISH": "ESP",
+        "SPANISH": "SPA",
         "BRAZILIAN": "BRA",
         "JAPANESE": "JPN",
         "CHINESE": "CHN",

{unit3dup-0.9.24 → unit3dup-0.9.26}/pyproject.toml

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

{unit3dup-0.9.24 → unit3dup-0.9.26}/unit3dup/__main__.py

@@ -18,7 +18,7 @@ def main():
     """
 
     custom_console.welcome_message()
-    custom_console.bot_question_log(f"Unitr3Dup {version} Checking your configuration file.. \n")
+    custom_console.bot_question_log(f"Unit3Dup {version} Checking your configuration file.. \n")
 
     # Load user configuration data
     config = Load().load_config()
@@ -181,8 +181,7 @@ def main():
 
     # Dump
     if cli.args.dump:
-        print("NOT YET IMPLEMENTED")
-        # torrent_info.view_search(" ", inkey=False,save=True) # Fix aggiunto Save
+        torrent_info.view_search(" ", inkey=False,save=True)
         return
 
     if cli.args.info:
@@ -198,7 +197,7 @@ def main():
         return
 
     if cli.args.uploader:
-        torrent_info.view_by_uploader(cli.args.uploader)
+        torrent_info.view_by_uploader(cli.args.uploader, save=cli.args.dbsave)
         return
 
     if cli.args.startyear:

{unit3dup-0.9.24 → unit3dup-0.9.26}/unit3dup/torrent.py

@@ -4,17 +4,18 @@ import time
 import requests
 
 from common.trackers.trackers import TRACKData
-# from common.database import Database
+from common.database import Database
 from unit3dup import pvtTracker
 from view import custom_console
 
+
 class Torrent:
 
     def __init__(self, tracker_name: str):
 
         self.perPage = 100
         self.tracker = pvtTracker.Unit3d(tracker_name=tracker_name)
-        # self.database = Database(db_file=tracker_name)
+        self.database = Database(db_file=tracker_name)
 
     def get_unique_id(self, media_info: str) -> str:
         # Divido per campi
@@ -133,13 +134,11 @@ class Torrent:
             personalRelease=True, perPage=self.perPage
         )
 
-
     # Filter 'Combo'
-    def get_by_tmdb_res(self, tmdb_id: int , resolution_id: str) -> requests.Response:
+    def get_by_tmdb_res(self, tmdb_id: int, resolution_id: str) -> requests.Response:
         return self.tracker.get_tmdb_res(tmdb_id=tmdb_id, res_id=resolution_id, perPage=self.perPage)
 
 
-
 class View(Torrent):
 
     def __init__(self, tracker_name: str):
@@ -148,6 +147,7 @@ class View(Torrent):
         # Load the constant tracker
         self.tracker_data = TRACKData.load_from_module(tracker_name=tracker_name)
         self.tracker_name = tracker_name
+
         print()
 
     def get_unique_id(self, media_info: str) -> str:
@@ -173,8 +173,7 @@ class View(Torrent):
                 f" -> {item['attributes']['name']}"
             )
 
-
-    def print_normal(self, tracker_data: dict, save= False):
+    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:
@@ -185,21 +184,20 @@ class View(Torrent):
 
                 media = f"{self.tracker_name} - TMDB: {item['attributes']['tmdb_id']} - {release_year}"
 
-            elif item['attributes']['igdb_id'] !=0:
-                    media = f"{self.tracker_name} IGDB: {item['attributes']['igdb_id']}"
+            elif item['attributes']['igdb_id'] != 0:
+                media = f"{self.tracker_name} IGDB: {item['attributes']['igdb_id']}"
             else:
                 media = f"{self.tracker_name} DOC:"
 
             # Print a data to the console
             custom_console.bot_log(f"\n {media} - {item['attributes']['name']}")
             # Save torrent data into database by -db flag
-            # if save:
-            #     self.database.write(item['attributes'])
-
+            if save:
+                self.database.write(item['attributes'])
 
     def page_view(self, tracker_data: dict, tracker: pvtTracker.Tracker, info=False, inkey=True, save=False):
 
-        self.print_normal(tracker_data,save=save) 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"]:
@@ -229,7 +227,7 @@ class View(Torrent):
         tracker_data = self.search(keyword=keyword)
         custom_console.log(f"Searching.. '{keyword}'")
         (
-            self.page_view(tracker_data=tracker_data, tracker=self.tracker,inkey=inkey, save=save)
+            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
@@ -247,10 +245,10 @@ class View(Torrent):
         custom_console.bot_log(f"Filter by the torrent's BDInfo.. '{bdinfo.upper()}'")
         self.page_view(tracker_data=tracker_data, tracker=self.tracker)
 
-    def view_by_uploader(self, username: str):
+    def view_by_uploader(self, username: str, save=False):
         tracker_data = self.get_by_uploader(username=username)
         custom_console.bot_log(f"Filter by the torrent uploader's username.. '{username.upper()}'")
-        self.page_view(tracker_data=tracker_data, tracker=self.tracker)
+        self.page_view(tracker_data=tracker_data, tracker=self.tracker, save=save)
 
     def view_by_start_year(self, startyear: str):
         tracker_data = self.get_by_start_year(start_year=startyear)
@@ -455,7 +453,7 @@ class View(Torrent):
             self.page_view(tracker_data=tracker_data, tracker=self.tracker)
 
     # Filter 'Combo'
-    def view_tmdb_res(self, tmdb_id: int , res_name: str) -> requests.Response | None:
+    def view_tmdb_res(self, tmdb_id: int, res_name: str) -> requests.Response | None:
 
         # Filter by TMDB and Resolution
         if res_name not in self.tracker_data.resolution.keys():
@@ -463,7 +461,7 @@ class View(Torrent):
             custom_console.bot_warning_log(";".join(list(self.tracker_data.resolution.keys())[:-1]))
             exit()
 
-        tracker_data = self.get_by_tmdb_res(tmdb_id=tmdb_id,resolution_id=str(self.tracker_data.resolution.get(res_name)))
+        tracker_data = self.get_by_tmdb_res(tmdb_id=tmdb_id,
+                                            resolution_id=str(self.tracker_data.resolution.get(res_name)))
         if tracker_data:
             self.page_view(tracker_data=tracker_data, tracker=self.tracker)
-

unit3dup-0.9.24/common/database.py

@@ -1,79 +0,0 @@
-import json
-# import os
-# import sqlite3
-# from unit3dup import config_settings
-#
-# # 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.CACHE_PATH = config_settings.user_preferences.CACHE_PATH
-#         self.database = sqlite3.connect(os.path.join(self.CACHE_PATH,f"{db_file}.db"))
-#         self.cursor = self.database.cursor()
-#         self.build()
-#
-#     def build(self):
-#         self.cursor.execute("DROP TABLE IF EXISTS torrents")
-#         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()