Remove to-dos

kodi-nfo-feeder.py

@@ -232,20 +232,28 @@ def get_season_and_episode(
     ext = file_name_ext_split[1]
     season_episode = re.split("[S|E]", season_ep_str[0])
     season = f"Season {season_episode[1]}"
-    title = season_ep_str[1]
+    try:
-    basic_cleaned_title = get_basic_cleaned_title(csection_name, config_obj, title)
+        title = season_ep_str[1]
+    except IndexError:
+        log.warning(f"File name '{raw_file_name}' is not following expected format. The excepted format "
+                    f"is a season-and-episode string followed by space-slash-space and and arbitrary sequence "
+                    f"of characters suffixed with a file extension e.g. "
+                    f"'S2022E2022032001 - This is a Title.mp4'. Skipping further file processing ...")
+        return {}
+    else:
+        basic_cleaned_title = get_basic_cleaned_title(csection_name, config_obj, title)
 
-    got_season_and_episode = {
+        got_season_and_episode = {
-        "season_str": season,
+            "season_str": season,
-        "title_str": basic_cleaned_title,
+            "title_str": basic_cleaned_title,
-        "season_ep_list": season_ep_str,
+            "season_ep_list": season_ep_str,
-        "ext": ext
+            "ext": ext
-    }
+        }
-    log.debug(f"""Identified {got_season_and_episode["season_str"]}, """
+        log.debug(f"""Identified {got_season_and_episode["season_str"]}, """
-              f"""title "{got_season_and_episode["title_str"]}" """ 
+                  f"""title "{got_season_and_episode["title_str"]}" """ 
-              f"and episode object {season_ep_str} "
+                  f"and episode object {season_ep_str} "
-              f"with extension '{ext}'.")
+                  f"with extension '{ext}'.")
-    return got_season_and_episode
+        return got_season_and_episode
 
 
 def get_target_file_list(
@@ -276,14 +284,16 @@ def move_file_to_target_dir(
     target_ext = season_ep_str["ext"]
     target_file_name_plus_ext = f"{target_file_name}{target_ext}"
 
-    if target_file_name_plus_ext in target_file_list:
+    while target_file_name_plus_ext in target_file_list:
-        log.debug(f"Intended file name already exists in target dir, incrementing counter ...")
+        log.debug(f"Intended file name already exists in target dir, incrementing counter suffix ...")
         episode_minus_counter = target_file_name[:-2]
         counter = target_file_name[-2:]
         counter_length = len(counter)
         counter_stripped = int(counter.lstrip("0"))
         counter_stripped += 1
         target_file_name = f"{episode_minus_counter}{str(counter_stripped).zfill(counter_length)}"
+        target_file_name_plus_ext = f"{target_file_name}{target_ext}"
+
     target_abs_path = os.path.join(target_dir, f"{target_file_name}{target_ext}")
 
     try:
@@ -417,11 +427,13 @@ if __name__ == '__main__':
                 watch_dir = watch_dir_config["watch_dir"]
                 output_dir = watch_dir_config["output_dir"]
                 section_name = watch_dir_config["section"]
-                log.debug(f"Watch dir config: {watch_dir_config}")
                 log.info(f"File '{file_name}' was moved to watch directory "
                          f"""'{watch_dir}', processing ...""")
 
                 season_and_episode = get_season_and_episode(section_name, config, file_name)
+                if not season_and_episode:
+                    break
+
                 if config.getboolean(section_name, "do_seasons"):
                     season_str = season_and_episode["season_str"]
                     log.debug(f"Changing output to season-specific dir '{season_str}' ...")