Unit3Dup 0.14.0__tar.gz → 0.14.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {unit3dup-0.14.0 → unit3dup-0.14.2}/PKG-INFO +1 -1
- {unit3dup-0.14.0 → unit3dup-0.14.2}/Unit3Dup.egg-info/PKG-INFO +1 -1
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/settings.py +4 -2
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/torrent_clients.py +18 -9
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/trackers/tags_list.py +1 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/pyproject.toml +1 -1
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/pvtVideo.py +3 -1
- {unit3dup-0.14.0 → unit3dup-0.14.2}/LICENSE +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/README.rst +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/Unit3Dup.egg-info/SOURCES.txt +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/Unit3Dup.egg-info/dependency_links.txt +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/Unit3Dup.egg-info/entry_points.txt +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/Unit3Dup.egg-info/requires.txt +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/Unit3Dup.egg-info/top_level.txt +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/bdinfo_string.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/bittorrent.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/command.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/constants.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/database.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/ftpx/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/ftpx/client.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/ftpx/core/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/ftpx/core/ftpx_service.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/ftpx/core/ftpx_session.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/ftpx/core/menu.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/ftpx/core/models/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/ftpx/core/models/list.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/igdb/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/igdb/client.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/igdb/core/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/igdb/core/api.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/igdb/core/models/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/igdb/core/models/search.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/igdb/core/platformid.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/igdb/core/tags.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/imageHost.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/mediaresult.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/sessions/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/sessions/agents.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/sessions/exceptions.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/sessions/session.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/api.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/keywords.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/movie/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/movie/alternative.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/movie/details.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/movie/movie.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/movie/nowplaying.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/movie/release_info.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/movie/translations.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/tvshow/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/tvshow/alternative.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/tvshow/details.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/tvshow/on_the_air.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/tvshow/translations.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/tvshow/tvshow.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/videos.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/trailers/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/trailers/api.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/trailers/response.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/tvdb.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/extractor.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/frames.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/mediainfo.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/mediainfo_string.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/tags.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/title.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/trackers/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/trackers/ast.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/trackers/ban_list.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/trackers/data.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/trackers/itt.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/trackers/ptt.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/trackers/signs_list.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/trackers/sis.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/trackers/trackers.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/common/utility.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/requirements.txt +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/setup.cfg +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/__main__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/automode.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/bot.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/duplicate.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/exceptions.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/media.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/media_manager/ContentManager.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/media_manager/DocuManager.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/media_manager/GameManager.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/media_manager/MediaInfoManager.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/media_manager/SeedManager.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/media_manager/TorrentManager.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/media_manager/VideoManager.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/media_manager/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/media_manager/common.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/pvtDocu.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/pvtTorrent.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/pvtTracker.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/torrent.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/unit3dup/upload.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/view/__init__.py +0 -0
- {unit3dup-0.14.0 → unit3dup-0.14.2}/view/custom_console.py +0 -0
|
@@ -24,7 +24,7 @@ user_tags_file = "tags_list.json"
|
|
|
24
24
|
user_sign_file = "sign_list.json"
|
|
25
25
|
bane_file = "ban_list.json"
|
|
26
26
|
|
|
27
|
-
version = "0.14.
|
|
27
|
+
version = "0.14.2"
|
|
28
28
|
|
|
29
29
|
if os.name == "nt":
|
|
30
30
|
WATCHER_DESTINATION_PATH: Path = Path(
|
|
@@ -153,6 +153,7 @@ class UserPreferences(BaseModel):
|
|
|
153
153
|
FAST_LOAD: int = 0
|
|
154
154
|
MY_SIGN: str | None = None
|
|
155
155
|
MY_URL: str | None = None
|
|
156
|
+
MY_TEXT_H: str | None = None
|
|
156
157
|
MY_TEXT_1: str | None = None
|
|
157
158
|
MY_TEXT_2: str | None = None
|
|
158
159
|
MY_TEXT_3: str | None = None
|
|
@@ -678,7 +679,8 @@ class Load:
|
|
|
678
679
|
"MY_URL": "",
|
|
679
680
|
"MY_TEXT_1": "",
|
|
680
681
|
"MY_TEXT_2": "",
|
|
681
|
-
"MY_TEXT_3": ""
|
|
682
|
+
"MY_TEXT_3": "",
|
|
683
|
+
"MY_TEXT_H": "[center]━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━[/center]"
|
|
682
684
|
},
|
|
683
685
|
"options": {
|
|
684
686
|
"FTPX_USER": "user",
|
|
@@ -176,19 +176,28 @@ class QbittorrentClient(TorrClient):
|
|
|
176
176
|
|
|
177
177
|
self.client.torrents_add_tags(tags=config_settings.torrent_client_config.TAG, torrent_hashes=info_hash)
|
|
178
178
|
|
|
179
|
+
@staticmethod
|
|
180
|
+
def _get_category(content: Media) -> str:
|
|
181
|
+
category = content.category.lower()
|
|
182
|
+
|
|
183
|
+
if "tv" in category:
|
|
184
|
+
return config_settings.torrent_client_config.CATEGORY_TV
|
|
185
|
+
|
|
186
|
+
if "movie" in category:
|
|
187
|
+
return config_settings.torrent_client_config.CATEGORY_MOVIE
|
|
188
|
+
|
|
189
|
+
return ""
|
|
190
|
+
|
|
179
191
|
def send_to_client(self, tracker_data_response: str, torrent: Mytorrent, content: Media, archive_path: str):
|
|
180
192
|
|
|
193
|
+
# Get the category from the media
|
|
194
|
+
category = self._get_category(content)
|
|
195
|
+
|
|
181
196
|
# Check if shared path exists
|
|
182
197
|
if config_settings.torrent_client_config.SHARED_QBIT_PATH:
|
|
183
198
|
torr_location = config_settings.torrent_client_config.SHARED_QBIT_PATH
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
if 'tv' in content.category.lower():
|
|
187
|
-
torr_location = os.path.join(torr_location, config_settings.torrent_client_config.CATEGORY_TV)
|
|
188
|
-
|
|
189
|
-
# append the category Movie to the shared path
|
|
190
|
-
if 'movie' in content.category.lower():
|
|
191
|
-
torr_location = os.path.join(torr_location, config_settings.torrent_client_config.CATEGORY_MOVIE)
|
|
199
|
+
if category:
|
|
200
|
+
torr_location = os.path.join(torr_location, category)
|
|
192
201
|
else:
|
|
193
202
|
# otherwise set torr_location using the cli path
|
|
194
203
|
torr_location = os.path.dirname(content.torrent_path)
|
|
@@ -202,7 +211,7 @@ class QbittorrentClient(TorrClient):
|
|
|
202
211
|
info_hash = hashlib.sha1(bencode2.bencode(info)).hexdigest()
|
|
203
212
|
file_buffer.seek(0)
|
|
204
213
|
self._add_torrent_and_tag(torrent_bytes=file_buffer.read(), save_path=str(torr_location),
|
|
205
|
-
info_hash=info_hash, category=
|
|
214
|
+
info_hash=info_hash, category=category)
|
|
206
215
|
|
|
207
216
|
|
|
208
217
|
class RTorrentClient(TorrClient):
|
|
@@ -75,8 +75,10 @@ class Video:
|
|
|
75
75
|
custom_console.bot_log("Done.")
|
|
76
76
|
|
|
77
77
|
# Build the description
|
|
78
|
+
# Header
|
|
79
|
+
self.description+= config_settings.user_preferences.MY_TEXT_H
|
|
78
80
|
build_description = Build(extracted_frames=extracted_frames_webp+extracted_frames, filename= self.display_name)
|
|
79
|
-
self.description
|
|
81
|
+
self.description+= build_description.description()
|
|
80
82
|
|
|
81
83
|
if config_settings.user_preferences.MY_SIGN:
|
|
82
84
|
self.description += f"""
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/movie/details.py
RENAMED
|
File without changes
|
{unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/movie/movie.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{unit3dup-0.14.0 → unit3dup-0.14.2}/common/external_services/theMovieDB/core/models/tvshow/tvshow.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|