Added API: GET Manga

resolves #10

Logging/FileLogger.cs

@@ -4,7 +4,7 @@ namespace Logging;
 
 public class FileLogger : LoggerBase
 {
-    private string logFilePath { get; }
+    internal string logFilePath { get; }
     private const int MaxNumberOfLogFiles = 5;
 
     public FileLogger(string logFilePath, Encoding? encoding = null) : base (encoding)

Logging/Logger.cs

@@ -8,6 +8,7 @@ public class Logger : TextWriter
     private static readonly string LogDirectoryPath = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
         ? "/var/log/tranga-api"
         : Path.Join(Directory.GetCurrentDirectory(), "logs");
+    public string? logFilePath => _fileLogger?.logFilePath;
     public override Encoding Encoding { get; }
     public enum LoggerType
     {
@@ -69,4 +70,9 @@ public class Logger : TextWriter
     {
         return _memoryLogger.GetNewLines();
     }
+
+    public string[] GetLog()
+    {
+        return _memoryLogger.GetLogMessages();
+    }
 }

Logging/MemoryLogger.cs

@@ -24,7 +24,7 @@ public class MemoryLogger : LoggerBase
         }
     }
 
-    public string[] GetLogMessage()
+    public string[] GetLogMessages()
     {
         return Tail(Convert.ToUInt32(_logMessages.Count));
     }

Tranga/GlobalBase.cs

@@ -1,4 +1,5 @@
-using Logging;
+using System.Globalization;
+using Logging;
 using Newtonsoft.Json;
 using Tranga.LibraryConnectors;
 using Tranga.NotificationConnectors;
@@ -12,6 +13,7 @@ public abstract class GlobalBase
     protected HashSet<NotificationConnector> notificationConnectors { get; init; }
     protected HashSet<LibraryConnector> libraryConnectors { get; init; }
     protected List<Manga> cachedPublications { get; init; }
+    protected static readonly NumberFormatInfo numberFormatDecimalPoint = new (){ NumberDecimalSeparator = "." };
 
     protected GlobalBase(GlobalBase clone)
     {

Tranga/Manga.cs

@@ -28,7 +28,7 @@ public struct Manga
     public string? originalLanguage { get; }
     // ReSharper disable once MemberCanBePrivate.Global
     public string status { get; }
-    public string folderName { get; }
+    public string folderName { get; private set; }
     public string publicationId { get; }
     public string internalId { get; }
     public float ignoreChaptersBelow { get; set; }
@@ -73,6 +73,15 @@ public struct Manga
         return publicationFolder;
     }
 
+    public void MovePublicationFolder(string downloadDirectory, string newFolderName)
+    {
+        string oldPath = Path.Join(downloadDirectory, this.folderName);
+        this.folderName = newFolderName;
+        string newPath = CreatePublicationFolder(downloadDirectory);
+        if(Directory.Exists(oldPath))
+            Directory.Move(oldPath, newPath);
+    }
+
     public void SaveSeriesInfoJson(string downloadDirectory)
     {
         string publicationFolder = CreatePublicationFolder(downloadDirectory);

Tranga/MangaConnectors/MangaConnector.cs

@@ -52,10 +52,9 @@ public abstract class MangaConnector : GlobalBase
     {
         Log($"Getting new Chapters for {manga}");
         Chapter[] newChapters = this.GetChapters(manga, language);
-        NumberFormatInfo decimalPoint = new (){ NumberDecimalSeparator = "." };
         Log($"Checking for duplicates {manga}");
         List<Chapter> newChaptersList = newChapters.Where(nChapter =>
-            float.Parse(nChapter.chapterNumber, decimalPoint) > manga.ignoreChaptersBelow &&
+            float.Parse(nChapter.chapterNumber, numberFormatDecimalPoint) > manga.ignoreChaptersBelow &&
             !nChapter.CheckChapterIsDownloaded(settings.downloadLocation)).ToList();
         Log($"{newChaptersList.Count} new chapters. {manga}");
         

Tranga/MangaConnectors/MangaDex.cs

@@ -221,9 +221,8 @@ public class MangaDex : MangaConnector
         }
 
         //Return Chapters ordered by Chapter-Number
-        NumberFormatInfo chapterNumberFormatInfo = new() { NumberDecimalSeparator = "." };
         Log($"Got {chapters.Count} chapters. {manga}");
-        return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
+        return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, numberFormatDecimalPoint)).ToArray();
     }
 
     public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? progressToken = null)

Tranga/MangaConnectors/MangaKatana.cs

@@ -156,13 +156,9 @@ public class MangaKatana : MangaConnector
 			return Array.Empty<Chapter>();
 
 		//Return Chapters ordered by Chapter-Number
-		NumberFormatInfo chapterNumberFormatInfo = new()
-		{
-			NumberDecimalSeparator = "."
-		};
 		List<Chapter> chapters = ParseChaptersFromHtml(manga, requestUrl);
 		Log($"Got {chapters.Count} chapters. {manga}");
-		return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
+		return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, numberFormatDecimalPoint)).ToArray();
 	}
 
 	private List<Chapter> ParseChaptersFromHtml(Manga manga, string mangaUrl)

Tranga/MangaConnectors/Manganato.cs

@@ -144,13 +144,9 @@ public class Manganato : MangaConnector
             return Array.Empty<Chapter>();
         
         //Return Chapters ordered by Chapter-Number
-        NumberFormatInfo chapterNumberFormatInfo = new()
-        {
-            NumberDecimalSeparator = "."
-        };
         List<Chapter> chapters = ParseChaptersFromHtml(manga, requestResult.result);
         Log($"Got {chapters.Count} chapters. {manga}");
-        return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
+        return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, numberFormatDecimalPoint)).ToArray();
     }
 
     private List<Chapter> ParseChaptersFromHtml(Manga manga, Stream html)

Tranga/MangaConnectors/Mangasee.cs

@@ -235,12 +235,8 @@ public class Mangasee : MangaConnector
         }
 
         //Return Chapters ordered by Chapter-Number
-        NumberFormatInfo chapterNumberFormatInfo = new()
-        {
-            NumberDecimalSeparator = "."
-        };
         Log($"Got {chapters.Count} chapters. {manga}");
-        return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
+        return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, numberFormatDecimalPoint)).ToArray();
     }
 
     public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? progressToken = null)

Tranga/Server.cs

@@ -222,41 +222,80 @@ public class Server : GlobalBase
     private void HandlePost(HttpListenerRequest request, HttpListenerResponse response)
     {
         Dictionary<string, string> requestVariables = GetRequestVariables(request.Url!.Query);
-        string? connectorName, internalId, jobId;
-        MangaConnector connector;
+        string? connectorName, internalId, jobId, chapterNumStr, customFolderName;
+        MangaConnector? connector;
+        Manga? tmpManga;
         Manga manga;
         Job? job;
         string path = Regex.Match(request.Url!.LocalPath, @"[A-z0-9]+(\/[A-z0-9]+)*").Value;
         switch (path)
         {
+            case "Manga":
+                if(!requestVariables.TryGetValue("internalId", out internalId) ||
+                   !_parent.TryGetPublicationById(internalId, out tmpManga))
+                {
+                    SendResponse(HttpStatusCode.BadRequest, response);
+                    break;
+                }
+                manga = (Manga)tmpManga!;
+                SendResponse(HttpStatusCode.OK, response, manga);
+                break;
             case "Jobs/MonitorManga":
                 if(!requestVariables.TryGetValue("connector", out connectorName) ||
                    !requestVariables.TryGetValue("internalId", out internalId) ||
                    !requestVariables.TryGetValue("interval", out string? intervalStr) ||
-                   _parent.GetConnector(connectorName) is null ||
-                   _parent.GetPublicationById(internalId) is null ||
+                   !_parent.TryGetConnector(connectorName, out connector)||
+                   !_parent.TryGetPublicationById(internalId, out tmpManga) ||
                    !TimeSpan.TryParse(intervalStr, out TimeSpan interval))
                 {
                     SendResponse(HttpStatusCode.BadRequest, response);
                     break;
                 }
-                connector = _parent.GetConnector(connectorName)!;
-                manga = (Manga)_parent.GetPublicationById(internalId)!;
-                _parent.jobBoss.AddJob(new DownloadNewChapters(this, connector, manga, true, interval));
+
+                manga = (Manga)tmpManga!;
+                
+                if (requestVariables.TryGetValue("ignoreBelowChapterNum", out chapterNumStr))
+                {
+                    if (!float.TryParse(chapterNumStr, numberFormatDecimalPoint, out float chapterNum))
+                    {
+                        SendResponse(HttpStatusCode.BadRequest, response);
+                        break;
+                    }
+                    manga.ignoreChaptersBelow = chapterNum;
+                }
+                
+                if (requestVariables.TryGetValue("customFolderName", out customFolderName))
+                    manga.MovePublicationFolder(settings.downloadLocation, customFolderName);
+                
+                _parent.jobBoss.AddJob(new DownloadNewChapters(this, connector!, manga, true, interval));
                 SendResponse(HttpStatusCode.Accepted, response);
                 break;
             case "Jobs/DownloadNewChapters":
                 if(!requestVariables.TryGetValue("connector", out connectorName) ||
                    !requestVariables.TryGetValue("internalId", out internalId) ||
-                   _parent.GetConnector(connectorName) is null ||
-                   _parent.GetPublicationById(internalId) is null)
+                   !_parent.TryGetConnector(connectorName, out connector)||
+                   !_parent.TryGetPublicationById(internalId, out tmpManga))
                 {
                     SendResponse(HttpStatusCode.BadRequest, response);
                     break;
                 }
-                connector = _parent.GetConnector(connectorName)!;
-                manga = (Manga)_parent.GetPublicationById(internalId)!;
-                _parent.jobBoss.AddJob(new DownloadNewChapters(this, connector, manga, false));
+
+                manga = (Manga)tmpManga!;
+                
+                if (requestVariables.TryGetValue("ignoreBelowChapterNum", out chapterNumStr))
+                {
+                    if (!float.TryParse(chapterNumStr, numberFormatDecimalPoint, out float chapterNum))
+                    {
+                        SendResponse(HttpStatusCode.BadRequest, response);
+                        break;
+                    }
+                    manga.ignoreChaptersBelow = chapterNum;
+                }
+
+                if (requestVariables.TryGetValue("customFolderName", out customFolderName))
+                    manga.MovePublicationFolder(settings.downloadLocation, customFolderName);
+                
+                _parent.jobBoss.AddJob(new DownloadNewChapters(this, connector!, manga, false));
                 SendResponse(HttpStatusCode.Accepted, response);
                 break;
             case "Jobs/StartNow":
@@ -368,6 +407,27 @@ public class Server : GlobalBase
                     break;
                 }
                 break;
+            case "LogMessages":
+                if (logger is null || !File.Exists(logger?.logFilePath))
+                {
+                    SendResponse(HttpStatusCode.NotFound, response);
+                    break;
+                }
+                SendResponse(HttpStatusCode.OK, response, logger.GetLog());
+                break;
+            case "LogFile":
+                if (logger is null || !File.Exists(logger?.logFilePath))
+                {
+                    SendResponse(HttpStatusCode.NotFound, response);
+                    break;
+                }
+
+                string logDir = new FileInfo(logger.logFilePath).DirectoryName!;
+                string tmpFilePath = Path.Join(logDir, "Tranga.log");
+                File.Copy(logger.logFilePath, tmpFilePath);
+                SendResponse(HttpStatusCode.OK, response, new FileStream(tmpFilePath, FileMode.Open));
+                File.Delete(tmpFilePath);
+                break;
             default:
                 SendResponse(HttpStatusCode.BadRequest, response);
                 break;