Merge pull request #162 from Drazzilb08/dev

[v1.2.0]

Author: Drazzilb08

VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

config/config.sample.yml

@@ -216,6 +216,11 @@ border_replacerr:
   border_width: 26
   # skip - This will skip border replacement until the next schedule/holiday
   skip: false
+  # fix light mm2k posters so no black bar shows at the bottom
+  exclusion_list:
+  # - "Fall (2022)"
+  # - "Inglourious Basterds (2009)"
+  # - "True Detective (2014) - Season 1"
   # Setting a border color of nothing will remove the border, else it will add the border color
   # Examples: Must include everything from double quotes to double quotes such as "#FF0000"
   # "#FF0000" - Red

modules/border_replacerr.py

@@ -16,6 +16,7 @@
 
 import os
 import json
+from os.path import dirname
 import re
 import logging
 import filecmp
@@ -127,6 +128,7 @@ def fix_borders(assets_dict, script_config, border_colors, destination_dir, dry_
 
     # Extracting necessary parameters from the script config
     border_width = script_config['border_width']
+    exclusion_list = script_config['exclusion_list']
     rgb_border_colors = []
 
     # Convert border colors to RGB format if available
@@ -198,7 +200,7 @@ def fix_borders(assets_dict, script_config, border_colors, destination_dir, dry_
                         if rgb_border_color:
                             results = replace_border(input_file, output_path, rgb_border_color, border_width, logger)
                         else:
-                            results = remove_border(input_file, output_path, border_width, logger)
+                            results = remove_border(input_file, output_path, border_width, exclusion_list, logger)
                         if results:
                             if path:
                                 messages.append(f"{action} {data['title']}{year} - {file_name}")
@@ -277,34 +279,75 @@ def replace_border(input_file, output_path, border_colors, border_width, logger)
         logger.error(f"Error processing {input_file}")
         return False
 
-def remove_border(input_file, output_path, border_width, logger):
+def remove_border(input_file, output_path, border_width, exclusion_list, logger):
     """
     Crops the center of an image, reducing its dimensions by 50 pixels on each side.
     
     Args:
         input_file (str): The input file.
         output_path (str): The output path.
         border_width (int): The border width.
+        exclusion_list (list): Light posters to exclude from having a black border on the bottom
     Returns:
         bool: True if the file was saved, False otherwise.
     """
 
+    def format_season(string):
+        return re.sub(r'Season0*(\d+)', r'Season \1', string) 
+
+    if exclusion_list is None:
+        exclusion_list = []
+
     # Open the image
     try:
         with Image.open(input_file) as image: # Open the image
             # Set the border width
             width, height = image.size # Get the width and height of the image
-                
             # Remove top, left, and right borders, and replace bottom border with black
-            final_image = image.crop((border_width, border_width, width - border_width, height)) # Crop the image to remove the borders
-            bottom_border = Image.new("RGB", (width - 2 * border_width, border_width), color='black') # Create a black image for the bottom border
-            bottom_border_position = (0, height - border_width - border_width) # Position the bottom border 25 pixels from the bottom
-            final_image.paste(bottom_border, bottom_border_position) # Paste the black bottom border at the specified position
+            file_name = os.path.basename(input_file)
+            name_without_extension, extension = os.path.splitext(file_name)
+            # Format for no asset folders
+            parts = name_without_extension.split('_')
+            # Check if list is greater > 2 indicating season file, if not return None
+            if len(parts)>= 2:
+                name_without_season, season = parts 
+            else:
+                name_without_season = parts[0]
+                season = None
+            if season is not None: 
+                formatted_season = format_season(season)
+                # Create variable to match exclusion_list format
+                formatted_name_without_season = f"{name_without_season} - {formatted_season}"
+            else:
+                formatted_name_without_season = None
+            
+            # Format for asset folders
+            directory_path = os.path.dirname(input_file)
+            parent_dir_name = os.path.basename(directory_path)
+            formatted_name_without_extension = format_season(name_without_extension)
+            # Create variable to match exclusion_list format
+            folder_season_file_name = f"{parent_dir_name} - {formatted_name_without_extension}"
+
+            # Check asset folders for exclusion list match
+            if folder_season_file_name in exclusion_list and "Season" in name_without_extension: # season file name
+                final_image = image.crop((border_width, border_width, width - border_width, height - border_width)) 
+            elif parent_dir_name in exclusion_list and "Season" not in name_without_extension: # poster/series file name
+                final_image = image.crop((border_width, border_width, width - border_width, height - border_width)) 
+
+            # Check formatted file name against exclusion list if asset folders is false
+            elif name_without_extension in exclusion_list: # poster/series file name
+                final_image = image.crop((border_width, border_width, width - border_width, height - border_width)) 
+            elif formatted_name_without_season in exclusion_list: # season file name
+                final_image = image.crop((border_width, border_width, width - border_width, height - border_width)) 
+            # Not an exclusion
+            else:
+                final_image = image.crop((border_width, border_width, width - border_width, height)) # Crop the image to remove the borders
+                bottom_border = Image.new("RGB", (width - 2 * border_width, border_width), color='black') # Create a black image for the bottom border
+                bottom_border_position = (0, height - border_width - border_width) # Position the bottom border 25 pixels from the bottom
+                final_image.paste(bottom_border, bottom_border_position) # Paste the black bottom border at the specified position
 
             # Resize the image to 1500x1000
             final_image = final_image.resize((1000, 1500)).convert("RGB")
-            
-            file_name = os.path.basename(input_file)
             final_path = f"{output_path}/{file_name}" # Set the output path to the parent directory
 
             if os.path.isfile(final_path):
@@ -546,4 +589,4 @@ def main(config):
         logger.error(f"\n\nAn error occurred:\n", exc_info=True)
         logger.error(f"\n\n")
     finally:
-        logger.info(create_bar(f"END {name}"))
+        logger.info(create_bar(f"END {name}"))

modules/health_checkarr.py

@@ -79,11 +79,11 @@ def main(config):
                     id_list = []
                     if health:
                         for health_item in health:
-                            if health_item['source'] == "RemovedMovieCheck" or health_item['source'] == "RemoveSeriesCheck":
-                                if instance_type == "Radarr":
+                            if health_item['source'] == "RemovedMovieCheck" or health_item['source'] == "RemovedSeriesCheck":
+                                if instance_type == "radarr":
                                     for m in re.finditer(tmdb_id_extractor, health_item['message']):
                                         id_list.append(int(m.group(1)))
-                                if instance_type == "Sonarr":
+                                if instance_type == "sonarr":
                                     for m in re.finditer(tvdb_id_extractor, health_item['message']):
                                         id_list.append(int(m.group(1)))
                     logger.debug(f"id_list:\n{json.dumps(id_list, indent=4)}")
@@ -98,10 +98,10 @@ def main(config):
                         logger.info(f"Deleting {len(output)} {instance_type} items from {server_name}")
                         for item in tqdm(output, desc=f"Deleting {instance_type} items", unit="items", disable=None, total=len(output)):
                             if not dry_run:
-                                logger.info(f"{item['title']} deleted with id: {item['db_id']}")
-                                app.delete_media(item['db_id'], instance_type)
+                                logger.info(f"{item['title']} deleted with id: {item['media_id']} and tvdb/tmdb id: {item['db_id']}")
+                                app.delete_media(item['media_id'])
                             else:
-                                logger.info(f"{item['title']} would have been deleted with id: {item['db_id']}")
+                                logger.info(f"{item['title']} would have been deleted with id: {item['media_id']}")
     except KeyboardInterrupt:
         print("Keyboard Interrupt detected. Exiting...")
         sys.exit()

modules/sync_gdrive.py

@@ -54,19 +54,20 @@ def set_cmd_args(settings, logger):
         sync_id = sync_item['id']
 
         sync_cmd = cmd.copy()
-        if client_id:
-            sync_cmd.append('-i')
-            sync_cmd.append(shlex.quote(client_id))
-        else:
-            logger.error("No client id provided")
-            return
-
-        if client_secret:
-            sync_cmd.append('-s')
-            sync_cmd.append(shlex.quote(client_secret))
-        else:
-            logger.error("No client secret provided")
-            return
+        if not gdrive_sa_location:
+            if client_id:
+                sync_cmd.append('-i')
+                sync_cmd.append(shlex.quote(client_id))
+            else:
+                logger.error("No client id provided")
+                return
+
+            if client_secret:
+                sync_cmd.append('-s')
+                sync_cmd.append(shlex.quote(client_secret))
+            else:
+                logger.error("No client secret provided")
+                return
 
         if gdrive_sync:
             if sync_location != '' and os.path.exists(sync_location):

modules/unmatched_assets.py

@@ -157,6 +157,9 @@ def print_output(unmatched_dict, media_dict, logger):
                     logger.info(create_table(table))
                     logger.info("")
                     for item in data:
+                        if data.index(item) % 10 == 0:
+                            logger.info(f"\t*** {location_base.title()}{suffix} {data.index(item)+1} - {min(data.index(item)+10, len(data))} ***")
+                            logger.info("")
                         if asset_type == 'series':
                             missing_seasons = item.get('missing_seasons', False)
                             if missing_seasons:

util/arrpy.py

@@ -659,16 +659,16 @@ def get_health(self):
         endpoint = f"{self.url}/api/v3/health"
         return self.make_get_request(endpoint, headers=self.headers)
 
-    def delete_media(self, media_id, instance_type):
+    def delete_media(self, media_id):
         """
         Delete a media item.
         Args:
             media_id (int): The ID of the media item to delete.
         """
         endpoint = None
-        if instance_type == 'Sonarr':
+        if self.instance_type == 'Sonarr':
             endpoint = f"{self.url}/api/v3/series/{media_id}"
-        elif instance_type == 'Radarr':
+        elif self.instance_type == 'Radarr':
             endpoint = f"{self.url}/api/v3/movie/{media_id}"
         return self.make_delete_request(endpoint)