Merge pull request #161 from 31December99/0.12.x

0.12.0

Author: 31December99

common/command.py

@@ -88,6 +88,9 @@ def __init__(self):
         search_group.add_argument("-d", "--description", type=str, help="By description")
         search_group.add_argument("-bd", "--bdinfo", type=str, help="Show BDInfo")
         search_group.add_argument("-m", "--mediainfo", type=str, help="Show MediaInfo")
+        search_group.add_argument("-int", "--internal", action="store_true", help="Internal Release")
+        search_group.add_argument("-mod", "--moderation", action="store_true", help="In moderation")
+
 
         # /////////////////////////
         # Filter Options
@@ -123,7 +126,7 @@ def __init__(self):
         special_group.add_argument("-str", "--stream", action="store_true", help="Stream")
         special_group.add_argument("-sd", "--standard", action="store_true", help="SD")
         special_group.add_argument("-hs", "--highspeed", action="store_true", help="Highspeed")
-        special_group.add_argument("-int", "--internal", action="store_true", help="Internal")
+        special_group.add_argument("-inter", "--intern_r", action="store_true", help="Internal Release")
         special_group.add_argument("-pr", "--prelease", action="store_true", help="Personal")
 
         # /////////////////////////
@@ -159,4 +162,4 @@ def __init__(self):
             if self.args.force.lower() not in valid_categories:
                 self.args.force = None
                 print("Invalid -force category")
-                exit()
+                exit()

common/settings.py

@@ -24,7 +24,7 @@
 user_sign_file = "sign_list.json"
 bane_file = "ban_list.json"
 
-version = "0.11.11"
+version = "0.12.0"
 
 if os.name == "nt":
     WATCHER_DESTINATION_PATH: Path = Path(
@@ -112,6 +112,8 @@ class TorrentClientConfig(BaseModel):
     SHARED_RTORR_PATH: str | None = None
     TORRENT_CLIENT: str | None = None
     TAG: str | None = None
+    CATEGORY_MOVIE: str | None = None
+    CATEGORY_TV: str | None = None
 
 
 class UserPreferences(BaseModel):
@@ -452,7 +454,7 @@ def set_default_torrent_client_config(cls, v):
                     section[field] = Validate.integer(value=section[field], field_name=field)
 
                 if field in ['QBIT_PASS', 'TRASM_PASS', 'RTORR_PASS', 'QBIT_USER', 'TRASM_USER', 'RTORR_USER',
-                             'TORRENT_CLIENT', 'TAG', 'RTORR_HOST']:
+                             'TORRENT_CLIENT', 'TAG', 'CATEGORY_MOVIE','CATEGORY_TV', 'RTORR_HOST']:
                     section[field] = Validate.string(value=section[field], field_name=field)
 
                 if field in ['SHARED_TRASM_PATH', 'SHARED_QBIT_PATH', 'SHARED_RTORR_PATH']:
@@ -622,7 +624,9 @@ def create_default_json_file(path: Path):
                 "RTORR_PORT": "9091",
                 "SHARED_RTORR_PATH": "no_path",
                 "TORRENT_CLIENT": "qbittorrent",
-                "TAG": "ADDED TORRENTS"
+                "TAG": "ADDED TORRENTS",
+                "CATEGORY_MOVIE": "movie",
+                "CATEGORY_TV": "tv"
             },
             "user_preferences": {
                 "PTSCREENS_PRIORITY": 0,