API/RequestHandler.cs

@@ -80,16 +80,12 @@ public class RequestHandler
     private Dictionary<string, string> GetRequestVariables(string query)
     {
         Dictionary<string, string> ret = new();
-        Regex queryRex = new (@"\?{1}&?([A-z0-9-=]+=[A-z0-9-=]+)+(&[A-z0-9-=]+=[A-z0-9-=]+)*");
+        Regex queryRex = new (@"\?{1}&?([A-z]+=[A-z]+)+(&[A-z]+=[A-z]+)*");
         if (!queryRex.IsMatch(query))
             return ret;
         query = query.Substring(1);
         foreach(string kvpair in query.Split('&').Where(str => str.Length>=3 ))
-        {
-            string var = kvpair.Split('=')[0];
-            string val = kvpair.Substring(var.Length + 1);
-            ret.Add(var, val);
-        }
+            ret.Add(kvpair.Split('=')[0], kvpair.Split('=')[1]);
         return ret;
     }
 
@@ -156,7 +152,7 @@ public class RequestHandler
                     _taskManager.GetAvailableConnectors().FirstOrDefault(con => con.Key == connectorName1).Value;
                 if (connector1 is null)
                     return;
-                Publication? publication1 = _taskManager.GetAllPublications().FirstOrDefault(pub => pub.internalId == internalId1);
+                Publication? publication1 = _taskManager.GetAllPublications().FirstOrDefault(pub => string.Concat(TrangaSettings.CleanIdRex.Matches(pub.internalId)) == string.Concat(TrangaSettings.CleanIdRex.Matches(internalId1)));
                 if (publication1 is null)
                     return;
                 _taskManager.AddTask(new MonitorPublicationTask(connectorName1, (Publication)publication1, TimeSpan.Parse(reoccurrenceTime1), language1 ?? "en"));
@@ -178,7 +174,7 @@ public class RequestHandler
                     _taskManager.GetAvailableConnectors().FirstOrDefault(con => con.Key == connectorName2).Value;
                 if (connector2 is null)
                     return;
-                Publication? publication2 = _taskManager.GetAllPublications().FirstOrDefault(pub => pub.internalId == internalId2);
+                Publication? publication2 = _taskManager.GetAllPublications().FirstOrDefault(pub => string.Concat(TrangaSettings.CleanIdRex.Matches(pub.internalId)) == string.Concat(TrangaSettings.CleanIdRex.Matches(internalId2)));
                 if (publication2 is null)
                     return;
     
@@ -265,7 +261,7 @@ public class RequestHandler
                 variables.TryGetValue("internalId", out string? internalId1);
                 if(internalId1 is null)
                     return _taskManager.GetAllPublications();
-                return new [] { _taskManager.GetAllPublications().FirstOrDefault(pub => pub.internalId == internalId1) };
+                return new [] { _taskManager.GetAllPublications().FirstOrDefault(pub => string.Concat(TrangaSettings.CleanIdRex.Matches(pub.internalId)) == string.Concat(TrangaSettings.CleanIdRex.Matches(internalId1))) };
             case "/Publications/FromConnector":
                 variables.TryGetValue("connectorName", out string? connectorName1);
                 variables.TryGetValue("title", out string? title);
@@ -292,7 +288,7 @@ public class RequestHandler
                 Connector? connector2 = _taskManager.GetAvailableConnectors().FirstOrDefault(con => con.Key == connectorName2).Value;
                 if (connector2 is null)
                     return null;
-                Publication? publication = _taskManager.GetAllPublications().FirstOrDefault(pub => pub.internalId == internalId2);
+                Publication? publication = _taskManager.GetAllPublications().FirstOrDefault(pub => string.Concat(TrangaSettings.CleanIdRex.Matches(pub.internalId)) == string.Concat(TrangaSettings.CleanIdRex.Matches(internalId2)));
                 if (publication is null)
                     return null;
         

Tranga/Connector.cs

@@ -187,9 +187,7 @@ public abstract class Connector
     public bool CheckChapterIsDownloaded(Publication publication, Chapter chapter)
     {
         string newFilePath = GetArchiveFilePath(publication, chapter);
-        if (!Directory.Exists(Path.Join(downloadLocation, publication.folderName)))
-            return false;
-        FileInfo[] archives = new DirectoryInfo(Path.Join(downloadLocation, publication.folderName)).GetFiles();
+        FileInfo[] archives = new DirectoryInfo(Path.Join(downloadLocation, publication.folderName)).GetFiles("*.cbz");
         Regex chapterRex = new(@"(Vol.[0-9]*)*Ch.[0-9]+");
         
         if (File.Exists(newFilePath))

Tranga/TaskManager.cs

@@ -180,7 +180,7 @@ public class TaskManager
                 {
                     return _allTasks.Where(mTask =>
                         mTask is MonitorPublicationTask mpt && mpt.connectorName == connectorName &&
-                        mpt.publication.internalId == internalId);
+                        string.Concat(TrangaSettings.CleanIdRex.Matches(mpt.publication.internalId)) == string.Concat(TrangaSettings.CleanIdRex.Matches(internalId)));
                 }
                 else
                     return _allTasks.Where(tTask =>
@@ -200,7 +200,7 @@ public class TaskManager
                 {
                     return _allTasks.Where(mTask =>
                         mTask is DownloadChapterTask dct && dct.connectorName == connectorName &&
-                        dct.publication.internalId == internalId &&
+                        string.Concat(TrangaSettings.CleanIdRex.Matches(dct.publication.internalId)) == string.Concat(TrangaSettings.CleanIdRex.Matches(internalId)) &&
                         dct.chapter.sortNumber == chapterSortNumber);
                 }
                 else

Tranga/TrangaSettings.cs

@@ -16,6 +16,7 @@ public class TrangaSettings
     [JsonIgnore] public string coverImageCache => Path.Join(workingDirectory, "imageCache");
     public HashSet<LibraryManager> libraryManagers { get; }
     public HashSet<NotificationManager> notificationManagers { get; }
+    [JsonIgnore] public static Regex CleanIdRex = new (@"([a-zA-Z0-9]*-*_*)*");
 
     public TrangaSettings(string downloadLocation, string workingDirectory, HashSet<LibraryManager>? libraryManagers,
         HashSet<NotificationManager>? notificationManagers)