Moved GetPublicationsFromConnector to connector.

Moved GetNewChaptersList to Connector.
Removed knownPublications file
Renamed chapterCollection to collection and only contains Publications

Tranga/Connector.cs

@@ -2,7 +2,6 @@
 using System.Net;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
-using System.Xml.Linq;
 using Logging;
 using Tranga.TrangaTasks;
 using static System.IO.UnixFileMode;
@@ -48,6 +47,24 @@ public abstract class Connector
     /// <returns>Array of Chapters matching Publication and Language</returns>
     public abstract Chapter[] GetChapters(Publication publication, string language = "");
 
+    /// <summary>
+    /// Updates the available Chapters of a Publication
+    /// </summary>
+    /// <param name="publication">Publication to check</param>
+    /// <param name="language">Language to receive chapters for</param>
+    /// <param name="collection"></param>
+    /// <returns>List of Chapters that were previously not in collection</returns>
+    public List<Chapter> GetNewChaptersList(Publication publication, string language, ref HashSet<Publication> collection)
+    {
+        Chapter[] newChapters = this.GetChapters(publication, language);
+        collection.Add(publication);
+        logger?.WriteLine(this.GetType().ToString(), "Checking for duplicates");
+        List<Chapter> newChaptersList = newChapters.Where(nChapter => !nChapter.CheckChapterIsDownloaded(settings.downloadLocation)).ToList();
+        logger?.WriteLine(this.GetType().ToString(), $"{newChaptersList.Count} new chapters.");
+        
+        return newChaptersList;
+    }
+
     public Chapter[] SelectChapters(Publication publication, string searchTerm, string? language = null)
     {
         Chapter[] availableChapters = this.GetChapters(publication, language??"en");

Tranga/TaskManager.cs

@@ -11,7 +11,7 @@ namespace Tranga;
 /// </summary>
 public class TaskManager
 {
-    public Dictionary<Publication, List<Chapter>> chapterCollection = new();
+    public HashSet<Publication> collection = new();
     private HashSet<TrangaTask> _allTasks = new();
     private readonly Dictionary<TrangaTask, CancellationTokenSource> _runningTasks = new ();
     private bool _continueRunning = true;
@@ -265,41 +265,11 @@ public class TaskManager
         _allTasks.CopyTo(ret);
         return ret;
     }
-
-    public Publication[] GetPublicationsFromConnector(Connector connector, string? title = null)
-    {
-        Publication[] ret = connector.GetPublications(title ?? "");
-        foreach (Publication publication in ret)
-        {
-            if(chapterCollection.All(pub => pub.Key.internalId != publication.internalId))
-                this.chapterCollection.TryAdd(publication, new List<Chapter>());
-        }
-        return ret;
-    }
     
     /// <returns>All added Publications</returns>
     public Publication[] GetAllPublications()
     {
-        return this.chapterCollection.Keys.ToArray();
-    }
-    
-    
-    /// <summary>
-    /// Updates the available Chapters of a Publication
-    /// </summary>
-    /// <param name="connector">Connector to use</param>
-    /// <param name="publication">Publication to check</param>
-    /// <param name="language">Language to receive chapters for</param>
-    /// <returns>List of Chapters that were previously not in collection</returns>
-    public List<Chapter> GetNewChaptersList(Connector connector, Publication publication, string language)
-    {
-        List<Chapter> newChaptersList = new();
-        chapterCollection.TryAdd(publication, newChaptersList); //To ensure publication is actually in collection
-        
-        Chapter[] newChapters = connector.GetChapters(publication, language);
-        newChaptersList = newChapters.Where(nChapter => !nChapter.CheckChapterIsDownloaded(settings.downloadLocation)).ToList();
-        
-        return newChaptersList;
+        return this.collection.ToArray();
     }
 
     public List<Chapter> GetExistingChaptersList(Connector connector, Publication publication, string language)
@@ -363,15 +333,6 @@ public class TaskManager
                 parentTask.lastExecuted = DateTime.UnixEpoch;
             }
         }
-        
-        if (File.Exists(settings.knownPublicationsPath))
-        {
-            logger?.WriteLine(this.GetType().ToString(), $"Importing known publications from {settings.knownPublicationsPath}");
-            buffer = File.ReadAllText(settings.knownPublicationsPath);
-            Publication[] publications = JsonConvert.DeserializeObject<Publication[]>(buffer)!;
-            foreach (Publication publication in publications)
-                this.chapterCollection.TryAdd(publication, new List<Chapter>());
-        }
     }
 
     /// <summary>
@@ -386,11 +347,6 @@ public class TaskManager
         while(IsFileInUse(settings.tasksFilePath))
             Thread.Sleep(50);
         File.WriteAllText(settings.tasksFilePath, JsonConvert.SerializeObject(this._allTasks));
-        
-        logger?.WriteLine(this.GetType().ToString(), $"Exporting known publications to {settings.knownPublicationsPath}");
-        while(IsFileInUse(settings.knownPublicationsPath))
-            Thread.Sleep(50);
-        File.WriteAllText(settings.knownPublicationsPath, JsonConvert.SerializeObject(this.chapterCollection.Keys.ToArray()));
     }
 
     private bool IsFileInUse(string path)

Tranga/TrangaSettings.cs

@@ -12,7 +12,6 @@ public class TrangaSettings
     public string workingDirectory { get; set; }
     [JsonIgnore] public string settingsFilePath => Path.Join(workingDirectory, "settings.json");
     [JsonIgnore] public string tasksFilePath => Path.Join(workingDirectory, "tasks.json");
-    [JsonIgnore] public string knownPublicationsPath => Path.Join(workingDirectory, "knownPublications.json");
     [JsonIgnore] public string coverImageCache => Path.Join(workingDirectory, "imageCache");
     public HashSet<LibraryManager> libraryManagers { get; }
     public HashSet<NotificationManager> notificationManagers { get; }

Tranga/TrangaTasks/MonitorPublicationTask.cs

@@ -23,7 +23,7 @@ public class MonitorPublicationTask : TrangaTask
         
         //Check if Publication already has a Folder
         publication.CreatePublicationFolder(taskManager.settings.downloadLocation);
-        List<Chapter> newChapters = taskManager.GetNewChaptersList(connector, publication, language);
+        List<Chapter> newChapters = connector.GetNewChaptersList(publication, language, ref taskManager.collection);
 
         connector.CopyCoverFromCacheToDownloadLocation(publication, taskManager.settings);