Merge pull request #101 from jmarmstrong1207/convert-library-conversion

convert-library - don't copy original book when failed to convert the file | import converted book first before rm existing book | move failed import to processed_books/failed
crocodilestick · Oct 13, 2024 · 57cd82e · 57cd82e
2 parents fb03c95 + 7077fa9
commit 57cd82e
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/scripts/convert-library.py b/scripts/convert-library.py
@@ -101,16 +101,6 @@ def convert_library(self):
                 print_and_log(f"[convert-library]: Conversion of {os.path.basename(file)} successful! Removing old version from library...")
             except subprocess.CalledProcessError as e:
                 print_and_log(f"[convert-library]: Conversion of {os.path.basename(file)} was unsuccessful. See the following error:\n{e}")
-                shutil.copyfile(file, f"/config/processed_books/failed/{os.path.basename(file)}")
-                self.current_book += 1
-                continue
-
-            try: # Remove Book from Existing Library
-                subprocess.run(["calibredb", "remove", book_id, "--permanent", "--with-library", self.library_dir], check=True)
-
-                print_and_log(f"[convert-library]: Non-epub version of {Path(file).stem} (Book ID: {book_id}) was successfully removed from library.\nAdding converted version to library...")
-            except subprocess.CalledProcessError as e:
-                print_and_log(f"[convert-library]: Non-epub version of {Path(file).stem} couldn't be successfully removed from library. See the following error:\n{e}")
                 self.current_book += 1
                 continue
 
@@ -125,7 +115,17 @@ def convert_library(self):
 
                 print_and_log(f"[convert-library]: Import of {os.path.basename(target_filepath)} successfully completed!")
             except subprocess.CalledProcessError as e:
-                print_and_log(f"[convert-library]: Import of {os.path.basename(target_filepath)} was not successfully completed. See the following error:\n{e}")
+                print_and_log(f"[convert-library]: Import of {os.path.basename(target_filepath)} was not successfully completed. Converted file moved to /config/processed_books/failed/{os.path.basename(target_filepath)}. See the following error:\n{e}")
+                shutil.move(target_filepath, f"/config/processed_books/failed/{os.path.basename(target_filepath)}")
+                self.current_book += 1
+                continue
+
+            try: # Remove Book from Existing Library
+                subprocess.run(["calibredb", "remove", book_id, "--permanent", "--with-library", self.library_dir], check=True)
+
+                print_and_log(f"[convert-library]: Non-epub version of {Path(file).stem} (Book ID: {book_id}) was successfully removed from library.\nAdding converted version to library...")
+            except subprocess.CalledProcessError as e:
+                print_and_log(f"[convert-library]: Non-epub version of {Path(file).stem} couldn't be successfully removed from library. See the following error:\n{e}")
                 self.current_book += 1
                 continue