Merge branch 'duplicateEntries'

Author: maforget

ComicRack.Engine/IO/ComicExporter.cs

@@ -39,6 +39,10 @@ public class ComicExporter
 
 		public event EventHandler<StorageProgressEventArgs> Progress;
 
+		public FileIsInDatabaseChecker FileIsInDatabase { get; set; }
+		public delegate bool FileIsInDatabaseChecker(string targetPath, string sourcePath);
+
+
 		public ComicExporter(IEnumerable<ComicBook> books, ExportSetting setting, int sequence)
 		{
 			comicBooks = books.ToList();
@@ -57,6 +61,13 @@ public string Export(IPagePool pagePool)
 				{
 					throw new InvalidOperationException(StringUtility.Format(TR.Messages["OutputFileExists", "Output file '{0}' already exists!"], targetPath));
 				}
+				// Check if the file already exists in the database.
+				bool existsInDatabase = FileIsInDatabase?.Invoke(targetPath, ComicBook.FilePath) ?? false;
+				if (File.Exists(targetPath) && existsInDatabase && setting.Target == ExportTarget.ReplaceSource)
+				{
+					// If the file exists in the database and we are replacing the source, we throw an exception
+					throw new InvalidOperationException(StringUtility.Format(TR.Messages["AlreadyExistsInDatabase", "Resulting operation would result in a duplicate entry in the database, Output file '{0}' already exists in the library"], targetPath));
+				}
 				if ((setting.AddToLibrary || setting.Target == ExportTarget.ReplaceSource) && Providers.Readers.GetFormatProviderType(setting.FormatId) == null)
 				{
 					throw new ArgumentException(TR.Messages["InvalidExportSettings", "The export settings do not match (e.g. adding a not supported format to the library)"]);

ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookDublicateComparer.cs

@@ -7,7 +7,12 @@ public class ComicBookDublicateComparer : Comparer<ComicBook>
 	{
 		public override int Compare(ComicBook x, ComicBook y)
 		{
-			int num = string.Compare(GroupInfo.CompressedName(x.ShadowSeries), GroupInfo.CompressedName(y.ShadowSeries), ignoreCase: true);
+			int num = string.Compare(x.FilePath, y.FilePath, ignoreCase: true);
+			if (num != 0)
+			{
+				return num;
+			}
+			num = string.Compare(GroupInfo.CompressedName(x.ShadowSeries), GroupInfo.CompressedName(y.ShadowSeries), ignoreCase: true);
 			if (num != 0)
 			{
 				return num;

ComicRack.Engine/QueueManager.cs

@@ -423,6 +423,18 @@ public void ExportComic(IEnumerable<ComicBook> cbs, ExportSetting setting, int s
 					IEnumerable<string> source = (from cb in cbs
 												  where cb.EditMode.IsLocalComic()
 												  select cb.FilePath).ToArray();
+
+
+					//Callback function to check if the file is already in the database, will be checked when calling Export
+					comicExporter.FileIsInDatabase = (string targetPath, string sourceFile) =>
+					{
+						if (string.IsNullOrEmpty(targetPath))
+							return false;
+
+						// If the target path is the same as the source file, we assume it's not a duplicate
+						return targetPath != sourceFile && DatabaseManager.Database.Books.FindItemByFile(targetPath) != null;
+					};
+
 					outPath = comicExporter.Export(CacheManager.ImagePool);
 					if (outPath != null)
 					{