Plex
/
Plex-Meta-Manager
mirror of https://github.com/meisnate12/Plex-Meta-Manager.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

QoL improvements

Browse Source
pull/556/head
meisnate12 3 years ago
parent 766238c1ed
commit eb9fe219aa
4 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File

32
modules/builder.py
Unescape View File

@ -1262,6 +1262,7 @@ class CollectionBuilder:
total_ids = len(ids) total_ids = len(ids)
logger.debug("") logger.debug("")
logger.debug(f"{total_ids} IDs Found: {ids}") logger.debug(f"{total_ids} IDs Found: {ids}")
logger.debug("")
for i, input_data in enumerate(ids, 1): for i, input_data in enumerate(ids, 1):
input_id, id_type = input_data input_id, id_type = input_data
util.print_return(f"Parsing ID {i}/{total_ids}") util.print_return(f"Parsing ID {i}/{total_ids}")
@ -1614,7 +1615,7 @@ class CollectionBuilder:
for value in values: for value in values:
final_years.append(self._parse(final, value, datatype="int")) final_years.append(self._parse(final, value, datatype="int"))
return smart_pair(final_years) return smart_pair(final_years)
elif attribute in plex.number_attributes + plex.date_attributes and modifier in ["", ".not", ".gt", ".gte", ".lt", ".lte"]: elif attribute in plex.number_attributes + plex.date_attributes + plex.year_attributes + ["tmdb_year"] and modifier in ["", ".not", ".gt", ".gte", ".lt", ".lte"]:
return self._parse(final, data, datatype="int") return self._parse(final, data, datatype="int")
elif attribute in plex.float_attributes and modifier in [".gt", ".gte", ".lt", ".lte"]: elif attribute in plex.float_attributes and modifier in [".gt", ".gte", ".lt", ".lte"]:
return self._parse(final, data, datatype="float", minimum=0, maximum=10) return self._parse(final, data, datatype="float", minimum=0, maximum=10)
@ -1651,13 +1652,18 @@ class CollectionBuilder:
raise Failed(f"Plex Error: Item {item} not found") raise Failed(f"Plex Error: Item {item} not found")
def add_to_collection(self): def add_to_collection(self):
logger.info("")
util.separator(f"Adding to {self.name} {self.Type}", space=False, border=False)
logger.info("")
name, collection_items = self.library.get_collection_name_and_items(self.obj if self.obj else self.name, self.smart_label_collection) name, collection_items = self.library.get_collection_name_and_items(self.obj if self.obj else self.name, self.smart_label_collection)
total = len(self.added_items) total = len(self.added_items)
spacing = len(str(total)) * 2 + 1
amount_added = 0 amount_added = 0
playlist_adds = [] playlist_adds = []
for item in self.added_items: for i, item in enumerate(self.added_items, 1):
current_operation = "=" if item in collection_items else "+" current_operation = "=" if item in collection_items else "+"
logger.info(util.adjust_space(f"{name} {self.Type} | {current_operation} | {util.item_title(item)}")) number_text = f"{i}/{total}"
logger.info(util.adjust_space(f"{number_text:>{spacing}} | {name} {self.Type} | {current_operation} | {util.item_title(item)}"))
if item in collection_items: if item in collection_items:
self.plex_map[item.ratingKey] = None self.plex_map[item.ratingKey] = None
else: else:
@ -1688,14 +1694,17 @@ class CollectionBuilder:
def sync_collection(self): def sync_collection(self):
amount_removed = 0 amount_removed = 0
playlist_removes = [] playlist_removes = []
for ratingKey, item in self.plex_map.items(): items = [item for _, item in self.plex_map.items() if item is not None]
if item is not None: if items:
if amount_removed == 0:
logger.info("") logger.info("")
util.separator(f"Removed from {self.name} {self.Type}", space=False, border=False) util.separator(f"Removed from {self.name} {self.Type}", space=False, border=False)
logger.info("") logger.info("")
total = len(items)
spacing = len(str(total)) * 2 + 1
for i, item in enumerate(items, 1):
self.library.reload(item) self.library.reload(item)
logger.info(f"{self.name} {self.Type} | - | {util.item_title(item)}") number_text = f"{i}/{total}"
logger.info(f"{number_text:>{spacing}} | {self.name} {self.Type} | - | {util.item_title(item)}")
if self.playlist: if self.playlist:
playlist_removes.append(item) playlist_removes.append(item)
else: else:
@ -1712,7 +1721,6 @@ class CollectionBuilder:
if self.playlist and playlist_removes: if self.playlist and playlist_removes:
self.obj.reload() self.obj.reload()
self.obj.removeItems(playlist_removes) self.obj.removeItems(playlist_removes)
if amount_removed > 0:
logger.info("") logger.info("")
logger.info(f"{amount_removed} {self.collection_level.capitalize()}{'s' if amount_removed == 1 else ''} Removed") logger.info(f"{amount_removed} {self.collection_level.capitalize()}{'s' if amount_removed == 1 else ''} Removed")
return amount_removed return amount_removed
@ -1870,6 +1878,10 @@ class CollectionBuilder:
added_to_radarr = 0 added_to_radarr = 0
added_to_sonarr = 0 added_to_sonarr = 0
if len(self.missing_movies) > 0: if len(self.missing_movies) > 0:
if self.details["show_missing"] is True:
logger.info("")
util.separator(f"Missing Movies from Library: {self.name}", space=False, border=False)
logger.info("")
missing_movies_with_names = [] missing_movies_with_names = []
for missing_id in self.missing_movies: for missing_id in self.missing_movies:
try: try:
@ -1906,6 +1918,10 @@ class CollectionBuilder:
if self.run_again: if self.run_again:
self.run_again_movies.extend(missing_tmdb_ids) self.run_again_movies.extend(missing_tmdb_ids)
if len(self.missing_shows) > 0 and self.library.is_show: if len(self.missing_shows) > 0 and self.library.is_show:
if self.details["show_missing"] is True:
logger.info("")
util.separator(f"Missing Shows from Library: {self.name}", space=False, border=False)
logger.info("")
missing_shows_with_names = [] missing_shows_with_names = []
for missing_id in self.missing_shows: for missing_id in self.missing_shows:
try: try:

7
modules/radarr.py
Unescape View File

@ -2,7 +2,7 @@ import logging
from modules import util from modules import util
from modules.util import Failed from modules.util import Failed
from arrapi import RadarrAPI from arrapi import RadarrAPI
from arrapi.exceptions import ArrException, Invalid, NotFound from arrapi.exceptions import ArrException
logger = logging.getLogger("Plex Meta Manager") logger = logging.getLogger("Plex Meta Manager")
@ -89,6 +89,8 @@ class Radarr:
mismatched[path] = tmdb_id mismatched[path] = tmdb_id
continue continue
movie = self.api.get_movie(tmdb_id=tmdb_id) movie = self.api.get_movie(tmdb_id=tmdb_id)
if self.config.trace_mode:
logger.debug(f"Folder to Check: {folder}/{movie.folder}")
if f"{folder}/{movie.folder}".lower() in arr_paths: if f"{folder}/{movie.folder}".lower() in arr_paths:
path_in_use[f"{folder}/{movie.folder}"] = tmdb_id path_in_use[f"{folder}/{movie.folder}"] = tmdb_id
continue continue
@ -107,7 +109,8 @@ class Radarr:
exists.extend(_e) exists.extend(_e)
invalid.extend(_i) invalid.extend(_i)
movies = [] movies = []
except (Invalid, NotFound) as e: except ArrException as e:
util.print_stacktrace()
raise Failed(f"Radarr Error: {e}") raise Failed(f"Radarr Error: {e}")
if len(added) > 0: if len(added) > 0:

7
modules/sonarr.py
Unescape View File

@ -2,7 +2,7 @@ import logging
from modules import util from modules import util
from modules.util import Failed from modules.util import Failed
from arrapi import SonarrAPI from arrapi import SonarrAPI
from arrapi.exceptions import ArrException, Invalid, NotFound from arrapi.exceptions import ArrException
logger = logging.getLogger("Plex Meta Manager") logger = logging.getLogger("Plex Meta Manager")
@ -115,6 +115,8 @@ class Sonarr:
mismatched[path] = tvdb_id mismatched[path] = tvdb_id
continue continue
show = self.api.get_series(tvdb_id=tvdb_id) show = self.api.get_series(tvdb_id=tvdb_id)
if self.config.trace_mode:
logger.debug(f"Folder to Check: {folder}/{show.folder}")
if f"{folder}/{show.folder}".lower() in arr_paths: if f"{folder}/{show.folder}".lower() in arr_paths:
path_in_use[f"{folder}/{show.folder}"] = tvdb_id path_in_use[f"{folder}/{show.folder}"] = tvdb_id
continue continue
@ -133,7 +135,8 @@ class Sonarr:
exists.extend(_e) exists.extend(_e)
invalid.extend(_i) invalid.extend(_i)
shows = [] shows = []
except (Invalid, NotFound) as e: except ArrException as e:
util.print_stacktrace()
raise Failed(f"Sonarr Error: {e}") raise Failed(f"Sonarr Error: {e}")
if len(added) > 0: if len(added) > 0:

14
plex_meta_manager.py
Unescape View File

@ -707,9 +707,6 @@ def run_collection(config, library, metadata, requested_collections):
builder.find_rating_keys() builder.find_rating_keys()
if len(builder.added_items) >= builder.minimum and builder.build_collection: if len(builder.added_items) >= builder.minimum and builder.build_collection:
logger.info("")
util.separator(f"Adding to {mapping_name} Collection", space=False, border=False)
logger.info("")
items_added = builder.add_to_collection() items_added = builder.add_to_collection()
stats["added"] += items_added stats["added"] += items_added
items_removed = 0 items_removed = 0
@ -726,10 +723,6 @@ def run_collection(config, library, metadata, requested_collections):
builder.deleted = True builder.deleted = True
if builder.do_missing and (len(builder.missing_movies) > 0 or len(builder.missing_shows) > 0): if builder.do_missing and (len(builder.missing_movies) > 0 or len(builder.missing_shows) > 0):
if builder.details["show_missing"] is True:
logger.info("")
util.separator(f"Missing from Library", space=False, border=False)
logger.info("")
radarr_add, sonarr_add = builder.run_missing() radarr_add, sonarr_add = builder.run_missing()
stats["radarr"] += radarr_add stats["radarr"] += radarr_add
stats["sonarr"] += sonarr_add stats["sonarr"] += sonarr_add
@ -1026,9 +1019,6 @@ def run_playlists(config):
builder.filter_and_save_items(items) builder.filter_and_save_items(items)
if len(builder.added_items) >= builder.minimum: if len(builder.added_items) >= builder.minimum:
logger.info("")
util.separator(f"Adding to {mapping_name} Playlist", space=False, border=False)
logger.info("")
items_added = builder.add_to_collection() items_added = builder.add_to_collection()
stats["added"] += items_added stats["added"] += items_added
items_removed = 0 items_removed = 0
@ -1045,10 +1035,6 @@ def run_playlists(config):
builder.deleted = True builder.deleted = True
if builder.do_missing and (len(builder.missing_movies) > 0 or len(builder.missing_shows) > 0): if builder.do_missing and (len(builder.missing_movies) > 0 or len(builder.missing_shows) > 0):
if builder.details["show_missing"] is True:
logger.info("")
util.separator(f"Missing from Library", space=False, border=False)
logger.info("")
radarr_add, sonarr_add = builder.run_missing() radarr_add, sonarr_add = builder.run_missing()
stats["radarr"] += radarr_add stats["radarr"] += radarr_add
stats["sonarr"] += sonarr_add stats["sonarr"] += sonarr_add

Write Preview
Loading…
Cancel
Save