Compare commits
No commits in common. "140074208f8fa35621e0a2e4d7565613c92b3ebb" and "f9b5e05974ce5a6f58c8314f1a4d3bcdf9f90779" have entirely different histories.
140074208f
...
f9b5e05974
21
API/API.csproj
Normal file
21
API/API.csproj
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Content Include="..\.dockerignore">
|
||||||
|
<Link>.dockerignore</Link>
|
||||||
|
</Content>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\Tranga\Tranga.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
@ -2,10 +2,8 @@
|
|||||||
|
|
||||||
FROM mcr.microsoft.com/dotnet/sdk:7.0 as build-env
|
FROM mcr.microsoft.com/dotnet/sdk:7.0 as build-env
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
COPY Tranga /src/Tranga
|
COPY . /src/
|
||||||
COPY Logging /src/Logging
|
RUN dotnet restore /src/API/API.csproj
|
||||||
COPY Tranga.sln /src
|
|
||||||
RUN dotnet restore /src/Tranga/Tranga.csproj
|
|
||||||
RUN dotnet publish -c Release -o /publish
|
RUN dotnet publish -c Release -o /publish
|
||||||
|
|
||||||
FROM glax/tranga-base:latest as runtime
|
FROM glax/tranga-base:latest as runtime
|
52
API/Program.cs
Normal file
52
API/Program.cs
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using Logging;
|
||||||
|
using Tranga;
|
||||||
|
using Tranga.NotificationManagers;
|
||||||
|
using Tranga.LibraryManagers;
|
||||||
|
|
||||||
|
namespace API;
|
||||||
|
|
||||||
|
public static class Program
|
||||||
|
{
|
||||||
|
public static void Main(string[] args)
|
||||||
|
{
|
||||||
|
string applicationFolderPath = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Tranga-API");
|
||||||
|
string downloadFolderPath = RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/Manga" : Path.Join(applicationFolderPath, "Manga");
|
||||||
|
string logsFolderPath = RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/var/logs/Tranga" : Path.Join(applicationFolderPath, "logs");
|
||||||
|
string logFilePath = Path.Join(logsFolderPath, $"log-{DateTime.Now:dd-M-yyyy-HH-mm-ss}.txt");
|
||||||
|
string settingsFilePath = Path.Join(applicationFolderPath, "settings.json");
|
||||||
|
|
||||||
|
Directory.CreateDirectory(logsFolderPath);
|
||||||
|
Logger logger = new(new[] { Logger.LoggerType.FileLogger, Logger.LoggerType.ConsoleLogger }, Console.Out, Console.Out.Encoding, logFilePath);
|
||||||
|
|
||||||
|
logger.WriteLine("Tranga",value: "\n"+
|
||||||
|
"-------------------------------------------\n"+
|
||||||
|
" Starting Tranga-API\n"+
|
||||||
|
"-------------------------------------------");
|
||||||
|
logger.WriteLine("Tranga", "Loading settings.");
|
||||||
|
|
||||||
|
TrangaSettings settings;
|
||||||
|
if (File.Exists(settingsFilePath))
|
||||||
|
settings = TrangaSettings.LoadSettings(settingsFilePath, logger);
|
||||||
|
else
|
||||||
|
settings = new TrangaSettings(downloadFolderPath, applicationFolderPath, new HashSet<LibraryManager>(), new HashSet<NotificationManager>(), logger);
|
||||||
|
|
||||||
|
Directory.CreateDirectory(settings.workingDirectory);
|
||||||
|
Directory.CreateDirectory(settings.downloadLocation);
|
||||||
|
Directory.CreateDirectory(settings.coverImageCache);
|
||||||
|
|
||||||
|
settings.logger?.WriteLine("Tranga",$"Application-Folder: {settings.workingDirectory}");
|
||||||
|
settings.logger?.WriteLine("Tranga",$"Settings-File-Path: {settings.settingsFilePath}");
|
||||||
|
settings.logger?.WriteLine("Tranga",$"Download-Folder-Path: {settings.downloadLocation}");
|
||||||
|
settings.logger?.WriteLine("Tranga",$"Logfile-Path: {logFilePath}");
|
||||||
|
settings.logger?.WriteLine("Tranga",$"Image-Cache-Path: {settings.coverImageCache}");
|
||||||
|
|
||||||
|
settings.logger?.WriteLine("Tranga", "Loading Taskmanager.");
|
||||||
|
TaskManager taskManager = new (settings);
|
||||||
|
|
||||||
|
Server server = new (6531, taskManager);
|
||||||
|
foreach(NotificationManager nm in taskManager.settings.notificationManagers)
|
||||||
|
nm.SendNotification("Tranga-API", "Started Tranga-API");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -5,7 +5,7 @@ using Tranga;
|
|||||||
using Tranga.Connectors;
|
using Tranga.Connectors;
|
||||||
using Tranga.TrangaTasks;
|
using Tranga.TrangaTasks;
|
||||||
|
|
||||||
namespace Tranga.API;
|
namespace API;
|
||||||
|
|
||||||
public class RequestHandler
|
public class RequestHandler
|
||||||
{
|
{
|
@ -6,13 +6,12 @@ using Logging;
|
|||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using Tranga;
|
using Tranga;
|
||||||
|
|
||||||
namespace Tranga.API;
|
namespace API;
|
||||||
|
|
||||||
public class Server
|
public class Server
|
||||||
{
|
{
|
||||||
private readonly HttpListener _listener = new ();
|
private readonly HttpListener _listener = new ();
|
||||||
private readonly RequestHandler _requestHandler;
|
private readonly RequestHandler _requestHandler;
|
||||||
private readonly TaskManager _taskManager;
|
|
||||||
internal readonly Logger? logger;
|
internal readonly Logger? logger;
|
||||||
|
|
||||||
private readonly Regex _validUrl =
|
private readonly Regex _validUrl =
|
||||||
@ -20,14 +19,12 @@ public class Server
|
|||||||
public Server(int port, TaskManager taskManager, Logger? logger = null)
|
public Server(int port, TaskManager taskManager, Logger? logger = null)
|
||||||
{
|
{
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
this._taskManager = taskManager;
|
|
||||||
if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||||
this._listener.Prefixes.Add($"http://*:{port}/");
|
this._listener.Prefixes.Add($"http://*:{port}/");
|
||||||
else
|
else
|
||||||
this._listener.Prefixes.Add($"http://localhost:{port}/");
|
this._listener.Prefixes.Add($"http://localhost:{port}/");
|
||||||
this._requestHandler = new RequestHandler(taskManager, this);
|
this._requestHandler = new RequestHandler(taskManager, this);
|
||||||
Thread listenThread = new Thread(Listen);
|
Listen();
|
||||||
listenThread.Start();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Listen()
|
private void Listen()
|
||||||
@ -35,7 +32,7 @@ public class Server
|
|||||||
this._listener.Start();
|
this._listener.Start();
|
||||||
foreach (string prefix in this._listener.Prefixes)
|
foreach (string prefix in this._listener.Prefixes)
|
||||||
this.logger?.WriteLine(this.GetType().ToString(), $"Listening on {prefix}");
|
this.logger?.WriteLine(this.GetType().ToString(), $"Listening on {prefix}");
|
||||||
while (this._listener.IsListening && _taskManager._continueRunning)
|
while (this._listener.IsListening)
|
||||||
{
|
{
|
||||||
HttpListenerContext context = this._listener.GetContextAsync().Result;
|
HttpListenerContext context = this._listener.GetContextAsync().Result;
|
||||||
Task t = new (() =>
|
Task t = new (() =>
|
@ -30,7 +30,7 @@ public class Logger : TextWriter
|
|||||||
{
|
{
|
||||||
_formattedConsoleLogger = new FormattedConsoleLogger(stdOut, encoding);
|
_formattedConsoleLogger = new FormattedConsoleLogger(stdOut, encoding);
|
||||||
}
|
}
|
||||||
else if (enabledLoggers.Contains(LoggerType.ConsoleLogger) && stdOut is null)
|
else
|
||||||
{
|
{
|
||||||
_formattedConsoleLogger = null;
|
_formattedConsoleLogger = null;
|
||||||
throw new ArgumentException($"stdOut can not be null for LoggerType {LoggerType.ConsoleLogger}");
|
throw new ArgumentException($"stdOut can not be null for LoggerType {LoggerType.ConsoleLogger}");
|
||||||
|
16
Tranga-CLI/Tranga-CLI.csproj
Normal file
16
Tranga-CLI/Tranga-CLI.csproj
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
|
<RootNamespace>Tranga_CLI</RootNamespace>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\Tranga\Tranga.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
@ -1,59 +1,139 @@
|
|||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
using Logging;
|
using Logging;
|
||||||
using Tranga.API;
|
using Tranga;
|
||||||
using Tranga.Connectors;
|
using Tranga.Connectors;
|
||||||
|
using Tranga.LibraryManagers;
|
||||||
using Tranga.NotificationManagers;
|
using Tranga.NotificationManagers;
|
||||||
using Tranga.TrangaTasks;
|
using Tranga.TrangaTasks;
|
||||||
|
|
||||||
namespace Tranga;
|
namespace Tranga_CLI;
|
||||||
|
|
||||||
public static class Tranga
|
/*
|
||||||
|
* This is written with pure hatred for readability.
|
||||||
|
* At some point do this properly.
|
||||||
|
* Read at own risk.
|
||||||
|
*/
|
||||||
|
|
||||||
|
public static class Tranga_Cli
|
||||||
{
|
{
|
||||||
public static void Main(string[] args)
|
public static void Main(string[] args)
|
||||||
{
|
{
|
||||||
string applicationFolderPath = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Tranga-API");
|
string applicationFolderPath = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Tranga");
|
||||||
string downloadFolderPath = RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/Manga" : Path.Join(applicationFolderPath, "Manga");
|
string logsFolderPath = Path.Join(applicationFolderPath, "logs");
|
||||||
string logsFolderPath = RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/var/log/Tranga" : Path.Join(applicationFolderPath, "log");
|
|
||||||
string logFilePath = Path.Join(logsFolderPath, $"log-{DateTime.Now:dd-M-yyyy-HH-mm-ss}.txt");
|
string logFilePath = Path.Join(logsFolderPath, $"log-{DateTime.Now:dd-M-yyyy-HH-mm-ss}.txt");
|
||||||
string settingsFilePath = Path.Join(applicationFolderPath, "settings.json");
|
string settingsFilePath = Path.Join(applicationFolderPath, "settings.json");
|
||||||
|
|
||||||
|
Directory.CreateDirectory(applicationFolderPath);
|
||||||
Directory.CreateDirectory(logsFolderPath);
|
Directory.CreateDirectory(logsFolderPath);
|
||||||
Logger logger = new(new[] { Logger.LoggerType.FileLogger }, Console.Out, Console.Out.Encoding, logFilePath);
|
|
||||||
|
|
||||||
logger.WriteLine("Tranga",value: "\n"+
|
Console.WriteLine($"Logfile-Path: {logFilePath}");
|
||||||
"-------------------------------------------\n"+
|
Console.WriteLine($"Settings-File-Path: {settingsFilePath}");
|
||||||
" Starting Tranga-API\n"+
|
|
||||||
"-------------------------------------------");
|
|
||||||
logger.WriteLine("Tranga", "Loading settings.");
|
|
||||||
|
|
||||||
TrangaSettings settings = File.Exists(settingsFilePath)
|
Logger logger = new(new[] { Logger.LoggerType.FileLogger }, null, Console.Out.Encoding, logFilePath);
|
||||||
? TrangaSettings.LoadSettings(settingsFilePath)
|
|
||||||
: new TrangaSettings(downloadFolderPath, applicationFolderPath);
|
|
||||||
|
|
||||||
Directory.CreateDirectory(settings.workingDirectory);
|
logger.WriteLine("Tranga_CLI", "Loading Taskmanager.");
|
||||||
Directory.CreateDirectory(settings.downloadLocation);
|
TrangaSettings settings = File.Exists(settingsFilePath) ? TrangaSettings.LoadSettings(settingsFilePath, logger) : new TrangaSettings(Directory.GetCurrentDirectory(), applicationFolderPath, new HashSet<LibraryManager>(), new HashSet<NotificationManager>(), logger);
|
||||||
Directory.CreateDirectory(settings.coverImageCache);
|
|
||||||
|
|
||||||
logger.WriteLine("Tranga",$"Application-Folder: {settings.workingDirectory}");
|
|
||||||
logger.WriteLine("Tranga",$"Settings-File-Path: {settings.settingsFilePath}");
|
|
||||||
logger.WriteLine("Tranga",$"Download-Folder-Path: {settings.downloadLocation}");
|
|
||||||
logger.WriteLine("Tranga",$"Logfile-Path: {logFilePath}");
|
|
||||||
logger.WriteLine("Tranga",$"Image-Cache-Path: {settings.coverImageCache}");
|
|
||||||
|
|
||||||
logger.WriteLine("Tranga", "Loading Taskmanager.");
|
settings.logger?.WriteLine("Tranga_CLI", "User Input");
|
||||||
TaskManager taskManager = new (settings, logger);
|
Console.WriteLine($"Output folder path [{settings.downloadLocation}]:");
|
||||||
|
string? tmpPath = Console.ReadLine();
|
||||||
|
while(tmpPath is null)
|
||||||
|
tmpPath = Console.ReadLine();
|
||||||
|
if (tmpPath.Length > 0)
|
||||||
|
settings.UpdateSettings(TrangaSettings.UpdateField.DownloadLocation, tmpPath);
|
||||||
|
|
||||||
Server _ = new (6531, taskManager);
|
Console.WriteLine($"Komga BaseURL [{settings.libraryManagers.FirstOrDefault(lm => lm.GetType() == typeof(Komga))?.baseUrl}]:");
|
||||||
foreach(NotificationManager nm in taskManager.commonObjects.notificationManagers)
|
string? tmpUrlKomga = Console.ReadLine();
|
||||||
nm.SendNotification("Tranga-API", "Started Tranga-API");
|
while (tmpUrlKomga is null)
|
||||||
|
tmpUrlKomga = Console.ReadLine();
|
||||||
|
if (tmpUrlKomga.Length > 0)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Username:");
|
||||||
|
string? tmpKomgaUser = Console.ReadLine();
|
||||||
|
while (tmpKomgaUser is null || tmpKomgaUser.Length < 1)
|
||||||
|
tmpKomgaUser = Console.ReadLine();
|
||||||
|
|
||||||
TaskMode(taskManager, logger);
|
Console.WriteLine("Password:");
|
||||||
|
string tmpKomgaPass = string.Empty;
|
||||||
|
ConsoleKey key;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
var keyInfo = Console.ReadKey(intercept: true);
|
||||||
|
key = keyInfo.Key;
|
||||||
|
|
||||||
|
if (key == ConsoleKey.Backspace && tmpKomgaPass.Length > 0)
|
||||||
|
{
|
||||||
|
Console.Write("\b \b");
|
||||||
|
tmpKomgaPass = tmpKomgaPass[0..^1];
|
||||||
|
}
|
||||||
|
else if (!char.IsControl(keyInfo.KeyChar))
|
||||||
|
{
|
||||||
|
Console.Write("*");
|
||||||
|
tmpKomgaPass += keyInfo.KeyChar;
|
||||||
|
}
|
||||||
|
} while (key != ConsoleKey.Enter);
|
||||||
|
|
||||||
|
settings.UpdateSettings(TrangaSettings.UpdateField.Komga, tmpUrlKomga, tmpKomgaUser, tmpKomgaPass);
|
||||||
|
}
|
||||||
|
|
||||||
|
Console.WriteLine($"Kavita BaseURL [{settings.libraryManagers.FirstOrDefault(lm => lm.GetType() == typeof(Kavita))?.baseUrl}]:");
|
||||||
|
string? tmpUrlKavita = Console.ReadLine();
|
||||||
|
while (tmpUrlKavita is null)
|
||||||
|
tmpUrlKavita = Console.ReadLine();
|
||||||
|
if (tmpUrlKavita.Length > 0)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Username:");
|
||||||
|
string? tmpKavitaUser = Console.ReadLine();
|
||||||
|
while (tmpKavitaUser is null || tmpKavitaUser.Length < 1)
|
||||||
|
tmpKavitaUser = Console.ReadLine();
|
||||||
|
|
||||||
|
Console.WriteLine("Password:");
|
||||||
|
string tmpKavitaPass = string.Empty;
|
||||||
|
ConsoleKey key;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
var keyInfo = Console.ReadKey(intercept: true);
|
||||||
|
key = keyInfo.Key;
|
||||||
|
|
||||||
|
if (key == ConsoleKey.Backspace && tmpKavitaPass.Length > 0)
|
||||||
|
{
|
||||||
|
Console.Write("\b \b");
|
||||||
|
tmpKavitaPass = tmpKavitaPass[0..^1];
|
||||||
|
}
|
||||||
|
else if (!char.IsControl(keyInfo.KeyChar))
|
||||||
|
{
|
||||||
|
Console.Write("*");
|
||||||
|
tmpKavitaPass += keyInfo.KeyChar;
|
||||||
|
}
|
||||||
|
} while (key != ConsoleKey.Enter);
|
||||||
|
|
||||||
|
settings.UpdateSettings(TrangaSettings.UpdateField.Kavita, tmpUrlKavita, tmpKavitaUser, tmpKavitaPass);
|
||||||
|
}
|
||||||
|
|
||||||
|
Console.WriteLine($"Gotify BaseURL [{((Gotify?)settings.notificationManagers.FirstOrDefault(lm => lm.GetType() == typeof(Gotify)))?.endpoint}]:");
|
||||||
|
string? tmpGotifyUrl = Console.ReadLine();
|
||||||
|
while (tmpGotifyUrl is null)
|
||||||
|
tmpGotifyUrl = Console.ReadLine();
|
||||||
|
if (tmpGotifyUrl.Length > 0)
|
||||||
|
{
|
||||||
|
Console.WriteLine("AppToken:");
|
||||||
|
string? tmpGotifyAppToken = Console.ReadLine();
|
||||||
|
while (tmpGotifyAppToken is null || tmpGotifyAppToken.Length < 1)
|
||||||
|
tmpGotifyAppToken = Console.ReadLine();
|
||||||
|
|
||||||
|
settings.UpdateSettings(TrangaSettings.UpdateField.Gotify, tmpGotifyUrl, tmpGotifyAppToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.WriteLine("Tranga_CLI", "Loaded.");
|
||||||
|
foreach(NotificationManager nm in settings.notificationManagers)
|
||||||
|
nm.SendNotification("Tranga", "Loaded.");
|
||||||
|
TaskMode(settings, logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void TaskMode(TaskManager taskManager, Logger logger)
|
private static void TaskMode(TrangaSettings settings, Logger logger)
|
||||||
{
|
{
|
||||||
|
TaskManager taskManager = new (settings);
|
||||||
ConsoleKey selection = ConsoleKey.EraseEndOfFile;
|
ConsoleKey selection = ConsoleKey.EraseEndOfFile;
|
||||||
PrintMenu(taskManager, taskManager.settings.downloadLocation);
|
PrintMenu(taskManager, taskManager.settings.downloadLocation);
|
||||||
while (selection != ConsoleKey.Q)
|
while (selection != ConsoleKey.Q)
|
||||||
@ -80,22 +160,22 @@ public static class Tranga
|
|||||||
Console.ReadKey();
|
Console.ReadKey();
|
||||||
break;
|
break;
|
||||||
case ConsoleKey.C:
|
case ConsoleKey.C:
|
||||||
CreateTask(taskManager);
|
CreateTask(taskManager, logger);
|
||||||
Console.WriteLine("Press any key.");
|
Console.WriteLine("Press any key.");
|
||||||
Console.ReadKey();
|
Console.ReadKey();
|
||||||
break;
|
break;
|
||||||
case ConsoleKey.D:
|
case ConsoleKey.D:
|
||||||
DeleteTask(taskManager);
|
DeleteTask(taskManager, logger);
|
||||||
Console.WriteLine("Press any key.");
|
Console.WriteLine("Press any key.");
|
||||||
Console.ReadKey();
|
Console.ReadKey();
|
||||||
break;
|
break;
|
||||||
case ConsoleKey.E:
|
case ConsoleKey.E:
|
||||||
ExecuteTaskNow(taskManager);
|
ExecuteTaskNow(taskManager, logger);
|
||||||
Console.WriteLine("Press any key.");
|
Console.WriteLine("Press any key.");
|
||||||
Console.ReadKey();
|
Console.ReadKey();
|
||||||
break;
|
break;
|
||||||
case ConsoleKey.S:
|
case ConsoleKey.S:
|
||||||
SearchTasks(taskManager);
|
SearchTasks(taskManager, logger);
|
||||||
Console.WriteLine("Press any key.");
|
Console.WriteLine("Press any key.");
|
||||||
Console.ReadKey();
|
Console.ReadKey();
|
||||||
break;
|
break;
|
||||||
@ -179,9 +259,9 @@ public static class Tranga
|
|||||||
Console.WriteLine($"{"",-30}{"F: Show Log",-30}{"Q: Exit",-30}");
|
Console.WriteLine($"{"",-30}{"F: Show Log",-30}{"Q: Exit",-30}");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void PrintTasks(TrangaTask[] tasks, Logger? logger)
|
private static void PrintTasks(TrangaTask[] tasks, Logger logger)
|
||||||
{
|
{
|
||||||
logger?.WriteLine("Tranga_CLI", "Printing Tasks");
|
logger.WriteLine("Tranga_CLI", "Printing Tasks");
|
||||||
int taskCount = tasks.Length;
|
int taskCount = tasks.Length;
|
||||||
int taskRunningCount = tasks.Count(task => task.state == TrangaTask.ExecutionState.Running);
|
int taskRunningCount = tasks.Count(task => task.state == TrangaTask.ExecutionState.Running);
|
||||||
int taskEnqueuedCount = tasks.Count(task => task.state == TrangaTask.ExecutionState.Enqueued);
|
int taskEnqueuedCount = tasks.Count(task => task.state == TrangaTask.ExecutionState.Enqueued);
|
||||||
@ -200,19 +280,19 @@ public static class Tranga
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static TrangaTask[] SelectTasks(TrangaTask[] tasks, Logger? logger)
|
private static TrangaTask[] SelectTasks(TrangaTask[] tasks, Logger logger)
|
||||||
{
|
{
|
||||||
logger?.WriteLine("Tranga_CLI", "Menu: Select task");
|
logger.WriteLine("Tranga_CLI", "Menu: Select task");
|
||||||
if (tasks.Length < 1)
|
if (tasks.Length < 1)
|
||||||
{
|
{
|
||||||
Console.Clear();
|
Console.Clear();
|
||||||
Console.WriteLine("There are no available Tasks.");
|
Console.WriteLine("There are no available Tasks.");
|
||||||
logger?.WriteLine("Tranga_CLI", "No available Tasks.");
|
logger.WriteLine("Tranga_CLI", "No available Tasks.");
|
||||||
return Array.Empty<TrangaTask>();
|
return Array.Empty<TrangaTask>();
|
||||||
}
|
}
|
||||||
PrintTasks(tasks, logger);
|
PrintTasks(tasks, logger);
|
||||||
|
|
||||||
logger?.WriteLine("Tranga_CLI", "Selecting Task to Remove (from queue)");
|
logger.WriteLine("Tranga_CLI", "Selecting Task to Remove (from queue)");
|
||||||
Console.WriteLine("Enter q to abort");
|
Console.WriteLine("Enter q to abort");
|
||||||
Console.WriteLine($"Select Task(s) (0-{tasks.Length - 1}):");
|
Console.WriteLine($"Select Task(s) (0-{tasks.Length - 1}):");
|
||||||
|
|
||||||
@ -224,7 +304,7 @@ public static class Tranga
|
|||||||
{
|
{
|
||||||
Console.Clear();
|
Console.Clear();
|
||||||
Console.WriteLine("aborted.");
|
Console.WriteLine("aborted.");
|
||||||
logger?.WriteLine("Tranga_CLI", "aborted");
|
logger.WriteLine("Tranga_CLI", "aborted");
|
||||||
return Array.Empty<TrangaTask>();
|
return Array.Empty<TrangaTask>();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -250,7 +330,7 @@ public static class Tranga
|
|||||||
if (connector is null)
|
if (connector is null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Publication? publication = SelectPublication(taskManager, connector);
|
Publication? publication = SelectPublication(taskManager, connector, logger);
|
||||||
if (publication is null)
|
if (publication is null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -306,10 +386,10 @@ public static class Tranga
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void CreateTask(TaskManager taskManager)
|
private static void CreateTask(TaskManager taskManager, Logger logger)
|
||||||
{
|
{
|
||||||
taskManager.commonObjects.logger?.WriteLine("Tranga_CLI", "Menu: Creating Task");
|
logger.WriteLine("Tranga_CLI", "Menu: Creating Task");
|
||||||
TrangaTask.Task? tmpTask = SelectTaskType(taskManager.commonObjects.logger);
|
TrangaTask.Task? tmpTask = SelectTaskType(logger);
|
||||||
if (tmpTask is null)
|
if (tmpTask is null)
|
||||||
return;
|
return;
|
||||||
TrangaTask.Task task = (TrangaTask.Task)tmpTask;
|
TrangaTask.Task task = (TrangaTask.Task)tmpTask;
|
||||||
@ -317,7 +397,7 @@ public static class Tranga
|
|||||||
Connector? connector = null;
|
Connector? connector = null;
|
||||||
if (task != TrangaTask.Task.UpdateLibraries)
|
if (task != TrangaTask.Task.UpdateLibraries)
|
||||||
{
|
{
|
||||||
connector = SelectConnector(taskManager.GetAvailableConnectors().Values.ToArray(), taskManager.commonObjects.logger);
|
connector = SelectConnector(taskManager.GetAvailableConnectors().Values.ToArray(), logger);
|
||||||
if (connector is null)
|
if (connector is null)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -325,22 +405,22 @@ public static class Tranga
|
|||||||
Publication? publication = null;
|
Publication? publication = null;
|
||||||
if (task != TrangaTask.Task.UpdateLibraries)
|
if (task != TrangaTask.Task.UpdateLibraries)
|
||||||
{
|
{
|
||||||
publication = SelectPublication(taskManager, connector!);
|
publication = SelectPublication(taskManager, connector!, logger);
|
||||||
if (publication is null)
|
if (publication is null)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (task is TrangaTask.Task.MonitorPublication)
|
if (task is TrangaTask.Task.MonitorPublication)
|
||||||
{
|
{
|
||||||
TimeSpan reoccurrence = SelectReoccurrence(taskManager.commonObjects.logger);
|
TimeSpan reoccurrence = SelectReoccurrence(logger);
|
||||||
taskManager.commonObjects.logger?.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
|
logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
|
||||||
|
|
||||||
TrangaTask newTask = new MonitorPublicationTask(connector!.name, (Publication)publication!, reoccurrence, "en");
|
TrangaTask newTask = new MonitorPublicationTask(connector!.name, (Publication)publication!, reoccurrence, "en");
|
||||||
taskManager.AddTask(newTask);
|
taskManager.AddTask(newTask);
|
||||||
Console.WriteLine(newTask);
|
Console.WriteLine(newTask);
|
||||||
}else if (task is TrangaTask.Task.DownloadChapter)
|
}else if (task is TrangaTask.Task.DownloadChapter)
|
||||||
{
|
{
|
||||||
foreach (Chapter chapter in SelectChapters(connector!, (Publication)publication!, taskManager.commonObjects.logger))
|
foreach (Chapter chapter in SelectChapters(connector!, (Publication)publication!, logger))
|
||||||
{
|
{
|
||||||
TrangaTask newTask = new DownloadChapterTask(connector!.name, (Publication)publication, chapter, "en");
|
TrangaTask newTask = new DownloadChapterTask(connector!.name, (Publication)publication, chapter, "en");
|
||||||
taskManager.AddTask(newTask);
|
taskManager.AddTask(newTask);
|
||||||
@ -349,31 +429,31 @@ public static class Tranga
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void ExecuteTaskNow(TaskManager taskManager)
|
private static void ExecuteTaskNow(TaskManager taskManager, Logger logger)
|
||||||
{
|
{
|
||||||
taskManager.commonObjects.logger?.WriteLine("Tranga_CLI", "Menu: Executing Task");
|
logger.WriteLine("Tranga_CLI", "Menu: Executing Task");
|
||||||
TrangaTask[] tasks = taskManager.GetAllTasks().Where(nTask => nTask.state is not TrangaTask.ExecutionState.Running).ToArray();
|
TrangaTask[] tasks = taskManager.GetAllTasks().Where(nTask => nTask.state is not TrangaTask.ExecutionState.Running).ToArray();
|
||||||
|
|
||||||
TrangaTask[] selectedTasks = SelectTasks(tasks, taskManager.commonObjects.logger);
|
TrangaTask[] selectedTasks = SelectTasks(tasks, logger);
|
||||||
taskManager.commonObjects.logger?.WriteLine("Tranga_CLI", $"Sending {selectedTasks.Length} Tasks to TaskManager");
|
logger.WriteLine("Tranga_CLI", $"Sending {selectedTasks.Length} Tasks to TaskManager");
|
||||||
foreach(TrangaTask task in selectedTasks)
|
foreach(TrangaTask task in selectedTasks)
|
||||||
taskManager.ExecuteTaskNow(task);
|
taskManager.ExecuteTaskNow(task);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void DeleteTask(TaskManager taskManager)
|
private static void DeleteTask(TaskManager taskManager, Logger logger)
|
||||||
{
|
{
|
||||||
taskManager.commonObjects.logger?.WriteLine("Tranga_CLI", "Menu: Delete Task");
|
logger.WriteLine("Tranga_CLI", "Menu: Delete Task");
|
||||||
TrangaTask[] tasks = taskManager.GetAllTasks();
|
TrangaTask[] tasks = taskManager.GetAllTasks();
|
||||||
|
|
||||||
TrangaTask[] selectedTasks = SelectTasks(tasks, taskManager.commonObjects.logger);
|
TrangaTask[] selectedTasks = SelectTasks(tasks, logger);
|
||||||
taskManager.commonObjects.logger?.WriteLine("Tranga_CLI", $"Sending {selectedTasks.Length} Tasks to TaskManager");
|
logger.WriteLine("Tranga_CLI", $"Sending {selectedTasks.Length} Tasks to TaskManager");
|
||||||
foreach(TrangaTask task in selectedTasks)
|
foreach(TrangaTask task in selectedTasks)
|
||||||
taskManager.DeleteTask(task);
|
taskManager.DeleteTask(task);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static TrangaTask.Task? SelectTaskType(Logger? logger)
|
private static TrangaTask.Task? SelectTaskType(Logger logger)
|
||||||
{
|
{
|
||||||
logger?.WriteLine("Tranga_CLI", "Menu: Select TaskType");
|
logger.WriteLine("Tranga_CLI", "Menu: Select TaskType");
|
||||||
Console.Clear();
|
Console.Clear();
|
||||||
string[] taskNames = Enum.GetNames<TrangaTask.Task>();
|
string[] taskNames = Enum.GetNames<TrangaTask.Task>();
|
||||||
|
|
||||||
@ -393,7 +473,7 @@ public static class Tranga
|
|||||||
{
|
{
|
||||||
Console.Clear();
|
Console.Clear();
|
||||||
Console.WriteLine("aborted.");
|
Console.WriteLine("aborted.");
|
||||||
logger?.WriteLine("Tranga_CLI", "aborted.");
|
logger.WriteLine("Tranga_CLI", "aborted.");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -406,22 +486,22 @@ public static class Tranga
|
|||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
Console.WriteLine($"Exception: {e.Message}");
|
Console.WriteLine($"Exception: {e.Message}");
|
||||||
logger?.WriteLine("Tranga_CLI", e.Message);
|
logger.WriteLine("Tranga_CLI", e.Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static TimeSpan SelectReoccurrence(Logger? logger)
|
private static TimeSpan SelectReoccurrence(Logger logger)
|
||||||
{
|
{
|
||||||
logger?.WriteLine("Tranga_CLI", "Menu: Select Reoccurrence");
|
logger.WriteLine("Tranga_CLI", "Menu: Select Reoccurrence");
|
||||||
Console.WriteLine("Select reoccurrence Timer (Format hh:mm:ss):");
|
Console.WriteLine("Select reoccurrence Timer (Format hh:mm:ss):");
|
||||||
return TimeSpan.Parse(Console.ReadLine()!, new CultureInfo("en-US"));
|
return TimeSpan.Parse(Console.ReadLine()!, new CultureInfo("en-US"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Chapter[] SelectChapters(Connector connector, Publication publication, Logger? logger)
|
private static Chapter[] SelectChapters(Connector connector, Publication publication, Logger logger)
|
||||||
{
|
{
|
||||||
logger?.WriteLine("Tranga_CLI", "Menu: Select Chapters");
|
logger.WriteLine("Tranga_CLI", "Menu: Select Chapters");
|
||||||
Chapter[] availableChapters = connector.GetChapters(publication, "en");
|
Chapter[] availableChapters = connector.GetChapters(publication, "en");
|
||||||
int cIndex = 0;
|
int cIndex = 0;
|
||||||
Console.WriteLine("Chapters:");
|
Console.WriteLine("Chapters:");
|
||||||
@ -460,9 +540,9 @@ public static class Tranga
|
|||||||
return connector.SelectChapters(publication, selectedChapters);
|
return connector.SelectChapters(publication, selectedChapters);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Connector? SelectConnector(Connector[] connectors, Logger? logger)
|
private static Connector? SelectConnector(Connector[] connectors, Logger logger)
|
||||||
{
|
{
|
||||||
logger?.WriteLine("Tranga_CLI", "Menu: Select Connector");
|
logger.WriteLine("Tranga_CLI", "Menu: Select Connector");
|
||||||
Console.Clear();
|
Console.Clear();
|
||||||
|
|
||||||
int cIndex = 0;
|
int cIndex = 0;
|
||||||
@ -481,7 +561,7 @@ public static class Tranga
|
|||||||
{
|
{
|
||||||
Console.Clear();
|
Console.Clear();
|
||||||
Console.WriteLine("aborted.");
|
Console.WriteLine("aborted.");
|
||||||
logger?.WriteLine("Tranga_CLI", "aborted.");
|
logger.WriteLine("Tranga_CLI", "aborted.");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -493,15 +573,15 @@ public static class Tranga
|
|||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
Console.WriteLine($"Exception: {e.Message}");
|
Console.WriteLine($"Exception: {e.Message}");
|
||||||
logger?.WriteLine("Tranga_CLI", e.Message);
|
logger.WriteLine("Tranga_CLI", e.Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Publication? SelectPublication(TaskManager taskManager, Connector connector)
|
private static Publication? SelectPublication(TaskManager taskManager, Connector connector, Logger logger)
|
||||||
{
|
{
|
||||||
taskManager.commonObjects.logger?.WriteLine("Tranga_CLI", "Menu: Select Publication");
|
logger.WriteLine("Tranga_CLI", "Menu: Select Publication");
|
||||||
|
|
||||||
Console.Clear();
|
Console.Clear();
|
||||||
Console.WriteLine($"Connector: {connector.name}");
|
Console.WriteLine($"Connector: {connector.name}");
|
||||||
@ -512,7 +592,7 @@ public static class Tranga
|
|||||||
|
|
||||||
if (publications.Length < 1)
|
if (publications.Length < 1)
|
||||||
{
|
{
|
||||||
taskManager.commonObjects.logger?.WriteLine("Tranga_CLI", "No publications returned");
|
logger.WriteLine("Tranga_CLI", "No publications returned");
|
||||||
Console.WriteLine($"No publications for query '{query}' returned;");
|
Console.WriteLine($"No publications for query '{query}' returned;");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@ -533,7 +613,7 @@ public static class Tranga
|
|||||||
{
|
{
|
||||||
Console.Clear();
|
Console.Clear();
|
||||||
Console.WriteLine("aborted.");
|
Console.WriteLine("aborted.");
|
||||||
taskManager.commonObjects.logger?.WriteLine("Tranga_CLI", "aborted.");
|
logger.WriteLine("Tranga_CLI", "aborted.");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -545,21 +625,21 @@ public static class Tranga
|
|||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
Console.WriteLine($"Exception: {e.Message}");
|
Console.WriteLine($"Exception: {e.Message}");
|
||||||
taskManager.commonObjects.logger?.WriteLine("Tranga_CLI", e.Message);
|
logger.WriteLine("Tranga_CLI", e.Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void SearchTasks(TaskManager taskManager)
|
private static void SearchTasks(TaskManager taskManager, Logger logger)
|
||||||
{
|
{
|
||||||
taskManager.commonObjects.logger?.WriteLine("Tranga_CLI", "Menu: Search task");
|
logger.WriteLine("Tranga_CLI", "Menu: Search task");
|
||||||
Console.Clear();
|
Console.Clear();
|
||||||
Console.WriteLine("Enter search query:");
|
Console.WriteLine("Enter search query:");
|
||||||
string? query = Console.ReadLine();
|
string? query = Console.ReadLine();
|
||||||
while (query is null || query.Length < 4)
|
while (query is null || query.Length < 4)
|
||||||
query = Console.ReadLine();
|
query = Console.ReadLine();
|
||||||
PrintTasks(taskManager.GetAllTasks().Where(qTask =>
|
PrintTasks(taskManager.GetAllTasks().Where(qTask =>
|
||||||
qTask.ToString().ToLower().Contains(query, StringComparison.OrdinalIgnoreCase)).ToArray(), taskManager.commonObjects.logger);
|
qTask.ToString().ToLower().Contains(query, StringComparison.OrdinalIgnoreCase)).ToArray(), logger);
|
||||||
}
|
}
|
||||||
}
|
}
|
12
Tranga.sln
12
Tranga.sln
@ -2,8 +2,12 @@
|
|||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tranga", ".\Tranga\Tranga.csproj", "{545E81B9-D96B-4C8F-A97F-2C02414DE566}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tranga", ".\Tranga\Tranga.csproj", "{545E81B9-D96B-4C8F-A97F-2C02414DE566}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tranga-CLI", "Tranga-CLI\Tranga-CLI.csproj", "{4899E3B2-B259-479A-B43E-042D043E9501}"
|
||||||
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logging", "Logging\Logging.csproj", "{415BE889-BB7D-426F-976F-8D977876A462}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logging", "Logging\Logging.csproj", "{415BE889-BB7D-426F-976F-8D977876A462}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "API", "API\API.csproj", "{A8AB1F5F-D174-49DC-AED2-0909B93BA7B6}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@ -14,9 +18,17 @@ Global
|
|||||||
{545E81B9-D96B-4C8F-A97F-2C02414DE566}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{545E81B9-D96B-4C8F-A97F-2C02414DE566}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{545E81B9-D96B-4C8F-A97F-2C02414DE566}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{545E81B9-D96B-4C8F-A97F-2C02414DE566}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{545E81B9-D96B-4C8F-A97F-2C02414DE566}.Release|Any CPU.Build.0 = Release|Any CPU
|
{545E81B9-D96B-4C8F-A97F-2C02414DE566}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{4899E3B2-B259-479A-B43E-042D043E9501}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{4899E3B2-B259-479A-B43E-042D043E9501}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{4899E3B2-B259-479A-B43E-042D043E9501}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{4899E3B2-B259-479A-B43E-042D043E9501}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{415BE889-BB7D-426F-976F-8D977876A462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{415BE889-BB7D-426F-976F-8D977876A462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{415BE889-BB7D-426F-976F-8D977876A462}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{415BE889-BB7D-426F-976F-8D977876A462}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{415BE889-BB7D-426F-976F-8D977876A462}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{415BE889-BB7D-426F-976F-8D977876A462}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{415BE889-BB7D-426F-976F-8D977876A462}.Release|Any CPU.Build.0 = Release|Any CPU
|
{415BE889-BB7D-426F-976F-8D977876A462}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{A8AB1F5F-D174-49DC-AED2-0909B93BA7B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{A8AB1F5F-D174-49DC-AED2-0909B93BA7B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{A8AB1F5F-D174-49DC-AED2-0909B93BA7B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{A8AB1F5F-D174-49DC-AED2-0909B93BA7B6}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
@ -1,124 +0,0 @@
|
|||||||
using Logging;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
using Tranga.LibraryManagers;
|
|
||||||
using Tranga.NotificationManagers;
|
|
||||||
|
|
||||||
namespace Tranga;
|
|
||||||
|
|
||||||
public class CommonObjects
|
|
||||||
{
|
|
||||||
public HashSet<LibraryManager> libraryManagers { get; init; }
|
|
||||||
public HashSet<NotificationManager> notificationManagers { get; init; }
|
|
||||||
public Logger? logger { get; init; }
|
|
||||||
[JsonIgnore]private string settingsFilePath { get; init; }
|
|
||||||
|
|
||||||
public CommonObjects(HashSet<LibraryManager>? libraryManagers, HashSet<NotificationManager>? notificationManagers, Logger? logger, string settingsFilePath)
|
|
||||||
{
|
|
||||||
this.libraryManagers = libraryManagers??new();
|
|
||||||
this.notificationManagers = notificationManagers??new();
|
|
||||||
this.logger = logger;
|
|
||||||
this.settingsFilePath = settingsFilePath;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static CommonObjects LoadSettings(string settingsFilePath, Logger? logger)
|
|
||||||
{
|
|
||||||
if (!File.Exists(settingsFilePath))
|
|
||||||
return new CommonObjects(null, null, logger, settingsFilePath);
|
|
||||||
|
|
||||||
string toRead = File.ReadAllText(settingsFilePath);
|
|
||||||
TrangaSettings.SettingsJsonObject settings = JsonConvert.DeserializeObject<TrangaSettings.SettingsJsonObject>(
|
|
||||||
toRead,
|
|
||||||
new JsonSerializerSettings
|
|
||||||
{
|
|
||||||
Converters =
|
|
||||||
{
|
|
||||||
new NotificationManager.NotificationManagerJsonConverter(),
|
|
||||||
new LibraryManager.LibraryManagerJsonConverter()
|
|
||||||
}
|
|
||||||
})!;
|
|
||||||
|
|
||||||
if(settings.co is null)
|
|
||||||
return new CommonObjects(null, null, logger, settingsFilePath);
|
|
||||||
|
|
||||||
if (logger is not null)
|
|
||||||
{
|
|
||||||
foreach (LibraryManager lm in settings.co.libraryManagers)
|
|
||||||
lm.AddLogger(logger);
|
|
||||||
foreach(NotificationManager nm in settings.co.notificationManagers)
|
|
||||||
nm.AddLogger(logger);
|
|
||||||
}
|
|
||||||
|
|
||||||
return settings.co;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ExportSettings()
|
|
||||||
{
|
|
||||||
TrangaSettings.SettingsJsonObject? settings = null;
|
|
||||||
if (File.Exists(settingsFilePath))
|
|
||||||
{
|
|
||||||
bool inUse = true;
|
|
||||||
while (inUse)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
using FileStream stream = new (settingsFilePath, FileMode.Open, FileAccess.Read, FileShare.None);
|
|
||||||
stream.Close();
|
|
||||||
inUse = false;
|
|
||||||
}
|
|
||||||
catch (IOException)
|
|
||||||
{
|
|
||||||
inUse = true;
|
|
||||||
Thread.Sleep(50);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
string toRead = File.ReadAllText(settingsFilePath);
|
|
||||||
settings = JsonConvert.DeserializeObject<TrangaSettings.SettingsJsonObject>(toRead,
|
|
||||||
new JsonSerializerSettings
|
|
||||||
{
|
|
||||||
Converters =
|
|
||||||
{
|
|
||||||
new NotificationManager.NotificationManagerJsonConverter(),
|
|
||||||
new LibraryManager.LibraryManagerJsonConverter()
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
settings = new TrangaSettings.SettingsJsonObject(settings?.ts, this);
|
|
||||||
File.WriteAllText(settingsFilePath, JsonConvert.SerializeObject(settings));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void UpdateSettings(TrangaSettings.UpdateField field, params string[] values)
|
|
||||||
{
|
|
||||||
switch (field)
|
|
||||||
{
|
|
||||||
case TrangaSettings.UpdateField.Komga:
|
|
||||||
if (values.Length != 2)
|
|
||||||
return;
|
|
||||||
libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga));
|
|
||||||
libraryManagers.Add(new Komga(values[0], values[1], this.logger));
|
|
||||||
break;
|
|
||||||
case TrangaSettings.UpdateField.Kavita:
|
|
||||||
if (values.Length != 3)
|
|
||||||
return;
|
|
||||||
libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Kavita));
|
|
||||||
libraryManagers.Add(new Kavita(values[0], values[1], values[2], this.logger));
|
|
||||||
break;
|
|
||||||
case TrangaSettings.UpdateField.Gotify:
|
|
||||||
if (values.Length != 2)
|
|
||||||
return;
|
|
||||||
notificationManagers.RemoveWhere(nm => nm.GetType() == typeof(Gotify));
|
|
||||||
Gotify newGotify = new(values[0], values[1], this.logger);
|
|
||||||
notificationManagers.Add(newGotify);
|
|
||||||
newGotify.SendNotification("Success!", "Gotify was added to Tranga!");
|
|
||||||
break;
|
|
||||||
case TrangaSettings.UpdateField.LunaSea:
|
|
||||||
if(values.Length != 1)
|
|
||||||
return;
|
|
||||||
notificationManagers.RemoveWhere(nm => nm.GetType() == typeof(LunaSea));
|
|
||||||
LunaSea newLunaSea = new(values[0], this.logger);
|
|
||||||
notificationManagers.Add(newLunaSea);
|
|
||||||
newLunaSea.SendNotification("Success!", "LunaSea was added to Tranga!");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
ExportSettings();
|
|
||||||
}
|
|
||||||
}
|
|
@ -14,14 +14,12 @@ namespace Tranga.Connectors;
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public abstract class Connector
|
public abstract class Connector
|
||||||
{
|
{
|
||||||
protected CommonObjects commonObjects;
|
|
||||||
protected TrangaSettings settings { get; }
|
protected TrangaSettings settings { get; }
|
||||||
internal DownloadClient downloadClient { get; init; } = null!;
|
internal DownloadClient downloadClient { get; init; } = null!;
|
||||||
|
|
||||||
protected Connector(TrangaSettings settings, CommonObjects commonObjects)
|
protected Connector(TrangaSettings settings)
|
||||||
{
|
{
|
||||||
this.settings = settings;
|
this.settings = settings;
|
||||||
this.commonObjects = commonObjects;
|
|
||||||
if (!Directory.Exists(settings.coverImageCache))
|
if (!Directory.Exists(settings.coverImageCache))
|
||||||
Directory.CreateDirectory(settings.coverImageCache);
|
Directory.CreateDirectory(settings.coverImageCache);
|
||||||
}
|
}
|
||||||
@ -65,11 +63,11 @@ public abstract class Connector
|
|||||||
Chapter[] newChapters = this.GetChapters(publication, language);
|
Chapter[] newChapters = this.GetChapters(publication, language);
|
||||||
collection.Add(publication);
|
collection.Add(publication);
|
||||||
NumberFormatInfo decimalPoint = new (){ NumberDecimalSeparator = "." };
|
NumberFormatInfo decimalPoint = new (){ NumberDecimalSeparator = "." };
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), "Checking for duplicates");
|
settings.logger?.WriteLine(this.GetType().ToString(), "Checking for duplicates");
|
||||||
List<Chapter> newChaptersList = newChapters.Where(nChapter =>
|
List<Chapter> newChaptersList = newChapters.Where(nChapter =>
|
||||||
float.Parse(nChapter.chapterNumber, decimalPoint) > publication.ignoreChaptersBelow &&
|
float.Parse(nChapter.chapterNumber, decimalPoint) > publication.ignoreChaptersBelow &&
|
||||||
!nChapter.CheckChapterIsDownloaded(settings.downloadLocation)).ToList();
|
!nChapter.CheckChapterIsDownloaded(settings.downloadLocation)).ToList();
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"{newChaptersList.Count} new chapters.");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"{newChaptersList.Count} new chapters.");
|
||||||
|
|
||||||
return newChaptersList;
|
return newChaptersList;
|
||||||
}
|
}
|
||||||
@ -163,19 +161,19 @@ public abstract class Connector
|
|||||||
/// <param name="publication">Publication to retrieve Cover for</param>
|
/// <param name="publication">Publication to retrieve Cover for</param>
|
||||||
public void CopyCoverFromCacheToDownloadLocation(Publication publication)
|
public void CopyCoverFromCacheToDownloadLocation(Publication publication)
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Cloning cover {publication.sortName} -> {publication.internalId}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Cloning cover {publication.sortName} -> {publication.internalId}");
|
||||||
//Check if Publication already has a Folder and cover
|
//Check if Publication already has a Folder and cover
|
||||||
string publicationFolder = publication.CreatePublicationFolder(settings.downloadLocation);
|
string publicationFolder = publication.CreatePublicationFolder(settings.downloadLocation);
|
||||||
DirectoryInfo dirInfo = new (publicationFolder);
|
DirectoryInfo dirInfo = new (publicationFolder);
|
||||||
if (dirInfo.EnumerateFiles().Any(info => info.Name.Contains("cover", StringComparison.InvariantCultureIgnoreCase)))
|
if (dirInfo.EnumerateFiles().Any(info => info.Name.Contains("cover", StringComparison.InvariantCultureIgnoreCase)))
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Cover exists {publication.sortName}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Cover exists {publication.sortName}");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
string fileInCache = Path.Join(settings.coverImageCache, publication.coverFileNameInCache);
|
string fileInCache = Path.Join(settings.coverImageCache, publication.coverFileNameInCache);
|
||||||
string newFilePath = Path.Join(publicationFolder, $"cover.{Path.GetFileName(fileInCache).Split('.')[^1]}" );
|
string newFilePath = Path.Join(publicationFolder, $"cover.{Path.GetFileName(fileInCache).Split('.')[^1]}" );
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Cloning cover {fileInCache} -> {newFilePath}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Cloning cover {fileInCache} -> {newFilePath}");
|
||||||
File.Copy(fileInCache, newFilePath, true);
|
File.Copy(fileInCache, newFilePath, true);
|
||||||
if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||||
File.SetUnixFileMode(newFilePath, GroupRead | GroupWrite | OtherRead | OtherWrite | UserRead | UserWrite);
|
File.SetUnixFileMode(newFilePath, GroupRead | GroupWrite | OtherRead | OtherWrite | UserRead | UserWrite);
|
||||||
@ -213,7 +211,7 @@ public abstract class Connector
|
|||||||
{
|
{
|
||||||
if (cancellationToken?.IsCancellationRequested ?? false)
|
if (cancellationToken?.IsCancellationRequested ?? false)
|
||||||
return HttpStatusCode.RequestTimeout;
|
return HttpStatusCode.RequestTimeout;
|
||||||
commonObjects.logger?.WriteLine("Connector", $"Downloading Images for {saveArchiveFilePath}");
|
settings.logger?.WriteLine("Connector", $"Downloading Images for {saveArchiveFilePath}");
|
||||||
//Check if Publication Directory already exists
|
//Check if Publication Directory already exists
|
||||||
string directoryPath = Path.GetDirectoryName(saveArchiveFilePath)!;
|
string directoryPath = Path.GetDirectoryName(saveArchiveFilePath)!;
|
||||||
if (!Directory.Exists(directoryPath))
|
if (!Directory.Exists(directoryPath))
|
||||||
@ -231,7 +229,7 @@ public abstract class Connector
|
|||||||
{
|
{
|
||||||
string[] split = imageUrl.Split('.');
|
string[] split = imageUrl.Split('.');
|
||||||
string extension = split[^1];
|
string extension = split[^1];
|
||||||
commonObjects.logger?.WriteLine("Connector", $"Downloading Image {chapter + 1:000}/{imageUrls.Length:000} {parentTask.publication.sortName} {parentTask.publication.internalId} Vol.{parentTask.chapter.volumeNumber} Ch.{parentTask.chapter.chapterNumber} {parentTask.progress:P2}");
|
settings.logger?.WriteLine("Connector", $"Downloading Image {chapter + 1:000}/{imageUrls.Length:000} {parentTask.publication.sortName} {parentTask.publication.internalId} Vol.{parentTask.chapter.volumeNumber} Ch.{parentTask.chapter.chapterNumber} {parentTask.progress:P2}");
|
||||||
HttpStatusCode status = DownloadImage(imageUrl, Path.Join(tempFolder, $"{chapter++}.{extension}"), requestType, referrer);
|
HttpStatusCode status = DownloadImage(imageUrl, Path.Join(tempFolder, $"{chapter++}.{extension}"), requestType, referrer);
|
||||||
if ((int)status < 200 || (int)status >= 300)
|
if ((int)status < 200 || (int)status >= 300)
|
||||||
return status;
|
return status;
|
||||||
@ -243,7 +241,7 @@ public abstract class Connector
|
|||||||
if(comicInfoPath is not null)
|
if(comicInfoPath is not null)
|
||||||
File.Copy(comicInfoPath, Path.Join(tempFolder, "ComicInfo.xml"));
|
File.Copy(comicInfoPath, Path.Join(tempFolder, "ComicInfo.xml"));
|
||||||
|
|
||||||
commonObjects.logger?.WriteLine("Connector", $"Creating archive {saveArchiveFilePath}");
|
settings.logger?.WriteLine("Connector", $"Creating archive {saveArchiveFilePath}");
|
||||||
//ZIP-it and ship-it
|
//ZIP-it and ship-it
|
||||||
ZipFile.CreateFromDirectory(tempFolder, saveArchiveFilePath);
|
ZipFile.CreateFromDirectory(tempFolder, saveArchiveFilePath);
|
||||||
if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||||
@ -265,7 +263,7 @@ public abstract class Connector
|
|||||||
using MemoryStream ms = new();
|
using MemoryStream ms = new();
|
||||||
coverResult.result.CopyTo(ms);
|
coverResult.result.CopyTo(ms);
|
||||||
File.WriteAllBytes(saveImagePath, ms.ToArray());
|
File.WriteAllBytes(saveImagePath, ms.ToArray());
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Saving image to {saveImagePath}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Saving image to {saveImagePath}");
|
||||||
return filename;
|
return filename;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -18,7 +18,7 @@ public class MangaDex : Connector
|
|||||||
Author,
|
Author,
|
||||||
}
|
}
|
||||||
|
|
||||||
public MangaDex(TrangaSettings settings, CommonObjects commonObjects) : base(settings, commonObjects)
|
public MangaDex(TrangaSettings settings) : base(settings)
|
||||||
{
|
{
|
||||||
name = "MangaDex";
|
name = "MangaDex";
|
||||||
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
||||||
@ -28,12 +28,12 @@ public class MangaDex : Connector
|
|||||||
{(byte)RequestType.AtHomeServer, 40},
|
{(byte)RequestType.AtHomeServer, 40},
|
||||||
{(byte)RequestType.CoverUrl, 250},
|
{(byte)RequestType.CoverUrl, 250},
|
||||||
{(byte)RequestType.Author, 250}
|
{(byte)RequestType.Author, 250}
|
||||||
}, commonObjects.logger);
|
}, settings.logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override Publication[] GetPublicationsInternal(string publicationTitle = "")
|
protected override Publication[] GetPublicationsInternal(string publicationTitle = "")
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})");
|
||||||
const int limit = 100; //How many values we want returned at once
|
const int limit = 100; //How many values we want returned at once
|
||||||
int offset = 0; //"Page"
|
int offset = 0; //"Page"
|
||||||
int total = int.MaxValue; //How many total results are there, is updated on first request
|
int total = int.MaxValue; //How many total results are there, is updated on first request
|
||||||
@ -59,7 +59,7 @@ public class MangaDex : Connector
|
|||||||
//Loop each Manga and extract information from JSON
|
//Loop each Manga and extract information from JSON
|
||||||
foreach (JsonNode? mangeNode in mangaInResult)
|
foreach (JsonNode? mangeNode in mangaInResult)
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting publication data. {++loadedPublicationData}/{total}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Getting publication data. {++loadedPublicationData}/{total}");
|
||||||
JsonObject manga = (JsonObject)mangeNode!;
|
JsonObject manga = (JsonObject)mangeNode!;
|
||||||
JsonObject attributes = manga["attributes"]!.AsObject();
|
JsonObject attributes = manga["attributes"]!.AsObject();
|
||||||
|
|
||||||
@ -146,13 +146,13 @@ public class MangaDex : Connector
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Done getting publications (title={publicationTitle})");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Done getting publications (title={publicationTitle})");
|
||||||
return publications.ToArray();
|
return publications.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override Chapter[] GetChapters(Publication publication, string language = "")
|
public override Chapter[] GetChapters(Publication publication, string language = "")
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters for {publication.sortName} {publication.internalId} (language={language})");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters for {publication.sortName} {publication.internalId} (language={language})");
|
||||||
const int limit = 100; //How many values we want returned at once
|
const int limit = 100; //How many values we want returned at once
|
||||||
int offset = 0; //"Page"
|
int offset = 0; //"Page"
|
||||||
int total = int.MaxValue; //How many total results are there, is updated on first request
|
int total = int.MaxValue; //How many total results are there, is updated on first request
|
||||||
@ -203,7 +203,7 @@ public class MangaDex : Connector
|
|||||||
{
|
{
|
||||||
NumberDecimalSeparator = "."
|
NumberDecimalSeparator = "."
|
||||||
};
|
};
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Done getting {chapters.Count} Chapters for {publication.internalId}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Done getting {chapters.Count} Chapters for {publication.internalId}");
|
||||||
return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
|
return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -211,7 +211,7 @@ public class MangaDex : Connector
|
|||||||
{
|
{
|
||||||
if (cancellationToken?.IsCancellationRequested ?? false)
|
if (cancellationToken?.IsCancellationRequested ?? false)
|
||||||
return HttpStatusCode.RequestTimeout;
|
return HttpStatusCode.RequestTimeout;
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
|
||||||
//Request URLs for Chapter-Images
|
//Request URLs for Chapter-Images
|
||||||
DownloadClient.RequestResult requestResult =
|
DownloadClient.RequestResult requestResult =
|
||||||
downloadClient.MakeRequest($"https://api.mangadex.org/at-home/server/{chapter.url}?forcePort443=false'", (byte)RequestType.AtHomeServer);
|
downloadClient.MakeRequest($"https://api.mangadex.org/at-home/server/{chapter.url}?forcePort443=false'", (byte)RequestType.AtHomeServer);
|
||||||
@ -238,10 +238,10 @@ public class MangaDex : Connector
|
|||||||
|
|
||||||
private string? GetCoverUrl(string publicationId, string? posterId)
|
private string? GetCoverUrl(string publicationId, string? posterId)
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting CoverUrl for {publicationId}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Getting CoverUrl for {publicationId}");
|
||||||
if (posterId is null)
|
if (posterId is null)
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"No posterId, aborting");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"No posterId, aborting");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -257,7 +257,7 @@ public class MangaDex : Connector
|
|||||||
string fileName = result["data"]!["attributes"]!["fileName"]!.GetValue<string>();
|
string fileName = result["data"]!["attributes"]!["fileName"]!.GetValue<string>();
|
||||||
|
|
||||||
string coverUrl = $"https://uploads.mangadex.org/covers/{publicationId}/{fileName}";
|
string coverUrl = $"https://uploads.mangadex.org/covers/{publicationId}/{fileName}";
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Got Cover-Url for {publicationId} -> {coverUrl}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Got Cover-Url for {publicationId} -> {coverUrl}");
|
||||||
return coverUrl;
|
return coverUrl;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -276,7 +276,7 @@ public class MangaDex : Connector
|
|||||||
|
|
||||||
string authorName = result["data"]!["attributes"]!["name"]!.GetValue<string>();
|
string authorName = result["data"]!["attributes"]!["name"]!.GetValue<string>();
|
||||||
ret.Add(authorName);
|
ret.Add(authorName);
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Got author {authorId} -> {authorName}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Got author {authorId} -> {authorName}");
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -10,18 +10,18 @@ public class MangaKatana : Connector
|
|||||||
{
|
{
|
||||||
public override string name { get; }
|
public override string name { get; }
|
||||||
|
|
||||||
public MangaKatana(TrangaSettings settings, CommonObjects commonObjects) : base(settings, commonObjects)
|
public MangaKatana(TrangaSettings settings) : base(settings)
|
||||||
{
|
{
|
||||||
this.name = "MangaKatana";
|
this.name = "MangaKatana";
|
||||||
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
||||||
{
|
{
|
||||||
{1, 60}
|
{1, 60}
|
||||||
}, commonObjects.logger);
|
}, settings.logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override Publication[] GetPublicationsInternal(string publicationTitle = "")
|
protected override Publication[] GetPublicationsInternal(string publicationTitle = "")
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})");
|
||||||
string sanitizedTitle = string.Concat(Regex.Matches(publicationTitle, "[A-z]* *")).ToLower().Replace(' ', '_');
|
string sanitizedTitle = string.Concat(Regex.Matches(publicationTitle, "[A-z]* *")).ToLower().Replace(' ', '_');
|
||||||
string requestUrl = $"https://mangakatana.com/?search={sanitizedTitle}&search_by=book_name";
|
string requestUrl = $"https://mangakatana.com/?search={sanitizedTitle}&search_by=book_name";
|
||||||
DownloadClient.RequestResult requestResult =
|
DownloadClient.RequestResult requestResult =
|
||||||
@ -135,7 +135,7 @@ public class MangaKatana : Connector
|
|||||||
|
|
||||||
public override Chapter[] GetChapters(Publication publication, string language = "")
|
public override Chapter[] GetChapters(Publication publication, string language = "")
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters for {publication.sortName} {publication.internalId} (language={language})");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters for {publication.sortName} {publication.internalId} (language={language})");
|
||||||
string requestUrl = $"https://mangakatana.com/manga/{publication.publicationId}";
|
string requestUrl = $"https://mangakatana.com/manga/{publication.publicationId}";
|
||||||
// Leaving this in for verification if the page exists
|
// Leaving this in for verification if the page exists
|
||||||
DownloadClient.RequestResult requestResult =
|
DownloadClient.RequestResult requestResult =
|
||||||
@ -149,7 +149,7 @@ public class MangaKatana : Connector
|
|||||||
NumberDecimalSeparator = "."
|
NumberDecimalSeparator = "."
|
||||||
};
|
};
|
||||||
List<Chapter> chapters = ParseChaptersFromHtml(publication, requestUrl);
|
List<Chapter> chapters = ParseChaptersFromHtml(publication, requestUrl);
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}");
|
||||||
return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
|
return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -182,7 +182,7 @@ public class MangaKatana : Connector
|
|||||||
{
|
{
|
||||||
if (cancellationToken?.IsCancellationRequested ?? false)
|
if (cancellationToken?.IsCancellationRequested ?? false)
|
||||||
return HttpStatusCode.RequestTimeout;
|
return HttpStatusCode.RequestTimeout;
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
|
||||||
string requestUrl = chapter.url;
|
string requestUrl = chapter.url;
|
||||||
// Leaving this in to check if the page exists
|
// Leaving this in to check if the page exists
|
||||||
DownloadClient.RequestResult requestResult =
|
DownloadClient.RequestResult requestResult =
|
||||||
|
@ -10,18 +10,18 @@ public class Manganato : Connector
|
|||||||
{
|
{
|
||||||
public override string name { get; }
|
public override string name { get; }
|
||||||
|
|
||||||
public Manganato(TrangaSettings settings, CommonObjects commonObjects) : base(settings, commonObjects)
|
public Manganato(TrangaSettings settings) : base(settings)
|
||||||
{
|
{
|
||||||
this.name = "Manganato";
|
this.name = "Manganato";
|
||||||
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
||||||
{
|
{
|
||||||
{1, 60}
|
{1, 60}
|
||||||
}, commonObjects.logger);
|
}, settings.logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override Publication[] GetPublicationsInternal(string publicationTitle = "")
|
protected override Publication[] GetPublicationsInternal(string publicationTitle = "")
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})");
|
||||||
string sanitizedTitle = string.Join('_', Regex.Matches(publicationTitle, "[A-z]*")).ToLower();
|
string sanitizedTitle = string.Join('_', Regex.Matches(publicationTitle, "[A-z]*")).ToLower();
|
||||||
string requestUrl = $"https://manganato.com/search/story/{sanitizedTitle}";
|
string requestUrl = $"https://manganato.com/search/story/{sanitizedTitle}";
|
||||||
DownloadClient.RequestResult requestResult =
|
DownloadClient.RequestResult requestResult =
|
||||||
@ -125,7 +125,7 @@ public class Manganato : Connector
|
|||||||
|
|
||||||
public override Chapter[] GetChapters(Publication publication, string language = "")
|
public override Chapter[] GetChapters(Publication publication, string language = "")
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters for {publication.sortName} {publication.internalId} (language={language})");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters for {publication.sortName} {publication.internalId} (language={language})");
|
||||||
string requestUrl = $"https://chapmanganato.com/{publication.publicationId}";
|
string requestUrl = $"https://chapmanganato.com/{publication.publicationId}";
|
||||||
DownloadClient.RequestResult requestResult =
|
DownloadClient.RequestResult requestResult =
|
||||||
downloadClient.MakeRequest(requestUrl, 1);
|
downloadClient.MakeRequest(requestUrl, 1);
|
||||||
@ -138,7 +138,7 @@ public class Manganato : Connector
|
|||||||
NumberDecimalSeparator = "."
|
NumberDecimalSeparator = "."
|
||||||
};
|
};
|
||||||
List<Chapter> chapters = ParseChaptersFromHtml(publication, requestResult.result);
|
List<Chapter> chapters = ParseChaptersFromHtml(publication, requestResult.result);
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}");
|
||||||
return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
|
return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -171,7 +171,7 @@ public class Manganato : Connector
|
|||||||
{
|
{
|
||||||
if (cancellationToken?.IsCancellationRequested ?? false)
|
if (cancellationToken?.IsCancellationRequested ?? false)
|
||||||
return HttpStatusCode.RequestTimeout;
|
return HttpStatusCode.RequestTimeout;
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
|
||||||
string requestUrl = chapter.url;
|
string requestUrl = chapter.url;
|
||||||
DownloadClient.RequestResult requestResult =
|
DownloadClient.RequestResult requestResult =
|
||||||
downloadClient.MakeRequest(requestUrl, 1);
|
downloadClient.MakeRequest(requestUrl, 1);
|
||||||
|
@ -15,13 +15,13 @@ public class Mangasee : Connector
|
|||||||
private IBrowser? _browser;
|
private IBrowser? _browser;
|
||||||
private const string ChromiumVersion = "1154303";
|
private const string ChromiumVersion = "1154303";
|
||||||
|
|
||||||
public Mangasee(TrangaSettings settings, CommonObjects commonObjects) : base(settings, commonObjects)
|
public Mangasee(TrangaSettings settings) : base(settings)
|
||||||
{
|
{
|
||||||
this.name = "Mangasee";
|
this.name = "Mangasee";
|
||||||
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
||||||
{
|
{
|
||||||
{ 1, 60 }
|
{ 1, 60 }
|
||||||
}, commonObjects.logger);
|
}, settings.logger);
|
||||||
|
|
||||||
Task d = new Task(DownloadBrowser);
|
Task d = new Task(DownloadBrowser);
|
||||||
d.Start();
|
d.Start();
|
||||||
@ -34,31 +34,31 @@ public class Mangasee : Connector
|
|||||||
browserFetcher.Remove(rev);
|
browserFetcher.Remove(rev);
|
||||||
if (!browserFetcher.LocalRevisions().Contains(ChromiumVersion))
|
if (!browserFetcher.LocalRevisions().Contains(ChromiumVersion))
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), "Downloading headless browser");
|
settings.logger?.WriteLine(this.GetType().ToString(), "Downloading headless browser");
|
||||||
DateTime last = DateTime.Now.Subtract(TimeSpan.FromSeconds(5));
|
DateTime last = DateTime.Now.Subtract(TimeSpan.FromSeconds(5));
|
||||||
browserFetcher.DownloadProgressChanged += (_, args) =>
|
browserFetcher.DownloadProgressChanged += (_, args) =>
|
||||||
{
|
{
|
||||||
double currentBytes = Convert.ToDouble(args.BytesReceived) / Convert.ToDouble(args.TotalBytesToReceive);
|
double currentBytes = Convert.ToDouble(args.BytesReceived) / Convert.ToDouble(args.TotalBytesToReceive);
|
||||||
if (args.TotalBytesToReceive == args.BytesReceived)
|
if (args.TotalBytesToReceive == args.BytesReceived)
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), "Browser downloaded.");
|
settings.logger?.WriteLine(this.GetType().ToString(), "Browser downloaded.");
|
||||||
}
|
}
|
||||||
else if (DateTime.Now > last.AddSeconds(5))
|
else if (DateTime.Now > last.AddSeconds(5))
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Browser download progress: {currentBytes:P2}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Browser download progress: {currentBytes:P2}");
|
||||||
last = DateTime.Now;
|
last = DateTime.Now;
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
if (!browserFetcher.CanDownloadAsync(ChromiumVersion).Result)
|
if (!browserFetcher.CanDownloadAsync(ChromiumVersion).Result)
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Can't download browser version {ChromiumVersion}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Can't download browser version {ChromiumVersion}");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await browserFetcher.DownloadAsync(ChromiumVersion);
|
await browserFetcher.DownloadAsync(ChromiumVersion);
|
||||||
}
|
}
|
||||||
|
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), "Starting browser.");
|
settings.logger?.WriteLine(this.GetType().ToString(), "Starting browser.");
|
||||||
this._browser = await Puppeteer.LaunchAsync(new LaunchOptions
|
this._browser = await Puppeteer.LaunchAsync(new LaunchOptions
|
||||||
{
|
{
|
||||||
Headless = true,
|
Headless = true,
|
||||||
@ -73,7 +73,7 @@ public class Mangasee : Connector
|
|||||||
|
|
||||||
protected override Publication[] GetPublicationsInternal(string publicationTitle = "")
|
protected override Publication[] GetPublicationsInternal(string publicationTitle = "")
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})");
|
||||||
string requestUrl = $"https://mangasee123.com/_search.php";
|
string requestUrl = $"https://mangasee123.com/_search.php";
|
||||||
DownloadClient.RequestResult requestResult =
|
DownloadClient.RequestResult requestResult =
|
||||||
downloadClient.MakeRequest(requestUrl, 1);
|
downloadClient.MakeRequest(requestUrl, 1);
|
||||||
@ -98,7 +98,7 @@ public class Mangasee : Connector
|
|||||||
queryFiltered = queryFiltered.Where(item => item.Value >= publicationTitle.Split(' ').Length - 1)
|
queryFiltered = queryFiltered.Where(item => item.Value >= publicationTitle.Split(' ').Length - 1)
|
||||||
.ToDictionary(item => item.Key, item => item.Value);
|
.ToDictionary(item => item.Key, item => item.Value);
|
||||||
|
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Got {queryFiltered.Count} Publications (title={publicationTitle})");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Got {queryFiltered.Count} Publications (title={publicationTitle})");
|
||||||
|
|
||||||
HashSet<Publication> ret = new();
|
HashSet<Publication> ret = new();
|
||||||
List<SearchResultItem> orderedFiltered =
|
List<SearchResultItem> orderedFiltered =
|
||||||
@ -111,7 +111,7 @@ public class Mangasee : Connector
|
|||||||
downloadClient.MakeRequest($"https://mangasee123.com/manga/{orderedItem.i}", 1);
|
downloadClient.MakeRequest($"https://mangasee123.com/manga/{orderedItem.i}", 1);
|
||||||
if ((int)requestResult.statusCode >= 200 || (int)requestResult.statusCode < 300)
|
if ((int)requestResult.statusCode >= 200 || (int)requestResult.statusCode < 300)
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Retrieving Publication info: {orderedItem.s} {index++}/{orderedFiltered.Count}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Retrieving Publication info: {orderedItem.s} {index++}/{orderedFiltered.Count}");
|
||||||
ret.Add(ParseSinglePublicationFromHtml(requestResult.result, orderedItem.s, orderedItem.i, orderedItem.a));
|
ret.Add(ParseSinglePublicationFromHtml(requestResult.result, orderedItem.s, orderedItem.i, orderedItem.a));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -235,7 +235,7 @@ public class Mangasee : Connector
|
|||||||
{
|
{
|
||||||
NumberDecimalSeparator = "."
|
NumberDecimalSeparator = "."
|
||||||
};
|
};
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}");
|
||||||
return ret.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
|
return ret.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -245,13 +245,13 @@ public class Mangasee : Connector
|
|||||||
return HttpStatusCode.RequestTimeout;
|
return HttpStatusCode.RequestTimeout;
|
||||||
while (this._browser is null && !(cancellationToken?.IsCancellationRequested??false))
|
while (this._browser is null && !(cancellationToken?.IsCancellationRequested??false))
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), "Waiting for headless browser to download...");
|
settings.logger?.WriteLine(this.GetType().ToString(), "Waiting for headless browser to download...");
|
||||||
Thread.Sleep(1000);
|
Thread.Sleep(1000);
|
||||||
}
|
}
|
||||||
if (cancellationToken?.IsCancellationRequested??false)
|
if (cancellationToken?.IsCancellationRequested??false)
|
||||||
return HttpStatusCode.RequestTimeout;
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
|
||||||
IPage page = _browser!.NewPageAsync().Result;
|
IPage page = _browser!.NewPageAsync().Result;
|
||||||
IResponse response = page.GoToAsync(chapter.url).Result;
|
IResponse response = page.GoToAsync(chapter.url).Result;
|
||||||
if (response.Ok)
|
if (response.Ok)
|
||||||
|
@ -13,26 +13,24 @@ public class TaskManager
|
|||||||
public HashSet<Publication> collection = new();
|
public HashSet<Publication> collection = new();
|
||||||
private HashSet<TrangaTask> _allTasks = new();
|
private HashSet<TrangaTask> _allTasks = new();
|
||||||
private readonly Dictionary<TrangaTask, CancellationTokenSource> _runningTasks = new ();
|
private readonly Dictionary<TrangaTask, CancellationTokenSource> _runningTasks = new ();
|
||||||
public bool _continueRunning = true;
|
private bool _continueRunning = true;
|
||||||
private readonly Connector[] _connectors;
|
private readonly Connector[] _connectors;
|
||||||
public TrangaSettings settings { get; }
|
public TrangaSettings settings { get; }
|
||||||
public CommonObjects commonObjects { get; init; }
|
|
||||||
|
|
||||||
public TaskManager(TrangaSettings settings, Logging.Logger? logger)
|
public TaskManager(TrangaSettings settings)
|
||||||
{
|
{
|
||||||
commonObjects = CommonObjects.LoadSettings(settings.settingsFilePath, logger);
|
settings.logger?.WriteLine("Tranga", value: "\n"+
|
||||||
commonObjects.logger?.WriteLine("Tranga", value: "\n"+
|
@"-----------------------------------------------------------------"+"\n"+
|
||||||
@"-----------------------------------------------------------------"+"\n"+
|
@" |¯¯¯¯¯¯|°|¯¯¯¯¯¯\ /¯¯¯¯¯¯| |¯¯¯\|¯¯¯| /¯¯¯¯¯¯\' /¯¯¯¯¯¯| "+"\n"+
|
||||||
@" |¯¯¯¯¯¯|°|¯¯¯¯¯¯\ /¯¯¯¯¯¯| |¯¯¯\|¯¯¯| /¯¯¯¯¯¯\' /¯¯¯¯¯¯| "+"\n"+
|
@" | | | x <|' / ! | | '| | (/¯¯¯\° / ! | "+ "\n"+
|
||||||
@" | | | x <|' / ! | | '| | (/¯¯¯\° / ! | "+ "\n"+
|
@" ¯|__|¯ |__|\\__\\ /___/¯|_'| |___|\\__| \\_____/' /___/¯|_'| "+ "\n"+
|
||||||
@" ¯|__|¯ |__|\\__\\ /___/¯|_'| |___|\\__| \\_____/' /___/¯|_'| "+ "\n"+
|
@"-----------------------------------------------------------------");
|
||||||
@"-----------------------------------------------------------------");
|
|
||||||
this._connectors = new Connector[]
|
this._connectors = new Connector[]
|
||||||
{
|
{
|
||||||
new MangaDex(settings, commonObjects),
|
new MangaDex(settings),
|
||||||
new Manganato(settings, commonObjects),
|
new Manganato(settings),
|
||||||
new Mangasee(settings, commonObjects),
|
new Mangasee(settings),
|
||||||
new MangaKatana(settings, commonObjects)
|
new MangaKatana(settings)
|
||||||
};
|
};
|
||||||
|
|
||||||
this.settings = settings;
|
this.settings = settings;
|
||||||
@ -49,7 +47,7 @@ public class TaskManager
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private void TaskCheckerThread()
|
private void TaskCheckerThread()
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), "Starting TaskCheckerThread.");
|
settings.logger?.WriteLine(this.GetType().ToString(), "Starting TaskCheckerThread.");
|
||||||
int waitingTasksCount = _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting);
|
int waitingTasksCount = _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting);
|
||||||
while (_continueRunning)
|
while (_continueRunning)
|
||||||
{
|
{
|
||||||
@ -148,7 +146,7 @@ public class TaskManager
|
|||||||
{
|
{
|
||||||
case TrangaTask.Task.UpdateLibraries:
|
case TrangaTask.Task.UpdateLibraries:
|
||||||
//Only one UpdateKomgaLibrary Task
|
//Only one UpdateKomgaLibrary Task
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Replacing old {newTask.task}-Task.");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Replacing old {newTask.task}-Task.");
|
||||||
if (GetTasksMatching(newTask).FirstOrDefault() is { } exists)
|
if (GetTasksMatching(newTask).FirstOrDefault() is { } exists)
|
||||||
_allTasks.Remove(exists);
|
_allTasks.Remove(exists);
|
||||||
_allTasks.Add(newTask);
|
_allTasks.Add(newTask);
|
||||||
@ -157,19 +155,19 @@ public class TaskManager
|
|||||||
default:
|
default:
|
||||||
if (!GetTasksMatching(newTask).Any())
|
if (!GetTasksMatching(newTask).Any())
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {newTask}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {newTask}");
|
||||||
_allTasks.Add(newTask);
|
_allTasks.Add(newTask);
|
||||||
ExportDataAndSettings();
|
ExportDataAndSettings();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void DeleteTask(TrangaTask removeTask)
|
public void DeleteTask(TrangaTask removeTask)
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Removing Task {removeTask}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Removing Task {removeTask}");
|
||||||
if(_allTasks.Contains(removeTask))
|
if(_allTasks.Contains(removeTask))
|
||||||
_allTasks.Remove(removeTask);
|
_allTasks.Remove(removeTask);
|
||||||
removeTask.parentTask?.RemoveChildTask(removeTask);
|
removeTask.parentTask?.RemoveChildTask(removeTask);
|
||||||
@ -321,7 +319,7 @@ public class TaskManager
|
|||||||
/// <param name="force">If force is true, tasks are aborted.</param>
|
/// <param name="force">If force is true, tasks are aborted.</param>
|
||||||
public void Shutdown(bool force = false)
|
public void Shutdown(bool force = false)
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Shutting down (forced={force})");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Shutting down (forced={force})");
|
||||||
_continueRunning = false;
|
_continueRunning = false;
|
||||||
ExportDataAndSettings();
|
ExportDataAndSettings();
|
||||||
|
|
||||||
@ -331,16 +329,16 @@ public class TaskManager
|
|||||||
//Wait for tasks to finish
|
//Wait for tasks to finish
|
||||||
while(_allTasks.Any(task => task.state is TrangaTask.ExecutionState.Running or TrangaTask.ExecutionState.Enqueued))
|
while(_allTasks.Any(task => task.state is TrangaTask.ExecutionState.Running or TrangaTask.ExecutionState.Enqueued))
|
||||||
Thread.Sleep(10);
|
Thread.Sleep(10);
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), "Tasks finished. Bye!");
|
settings.logger?.WriteLine(this.GetType().ToString(), "Tasks finished. Bye!");
|
||||||
Environment.Exit(0);
|
Environment.Exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ImportData()
|
private void ImportData()
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), "Importing Data");
|
settings.logger?.WriteLine(this.GetType().ToString(), "Importing Data");
|
||||||
if (File.Exists(settings.tasksFilePath))
|
if (File.Exists(settings.tasksFilePath))
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Importing tasks from {settings.tasksFilePath}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Importing tasks from {settings.tasksFilePath}");
|
||||||
string buffer = File.ReadAllText(settings.tasksFilePath);
|
string buffer = File.ReadAllText(settings.tasksFilePath);
|
||||||
this._allTasks = JsonConvert.DeserializeObject<HashSet<TrangaTask>>(buffer, new JsonSerializerSettings() { Converters = { new TrangaTask.TrangaTaskJsonConverter() } })!;
|
this._allTasks = JsonConvert.DeserializeObject<HashSet<TrangaTask>>(buffer, new JsonSerializerSettings() { Converters = { new TrangaTask.TrangaTaskJsonConverter() } })!;
|
||||||
}
|
}
|
||||||
@ -361,10 +359,10 @@ public class TaskManager
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private void ExportDataAndSettings()
|
private void ExportDataAndSettings()
|
||||||
{
|
{
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Exporting settings to {settings.settingsFilePath}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Exporting settings to {settings.settingsFilePath}");
|
||||||
settings.ExportSettings();
|
settings.ExportSettings();
|
||||||
|
|
||||||
commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Exporting tasks to {settings.tasksFilePath}");
|
settings.logger?.WriteLine(this.GetType().ToString(), $"Exporting tasks to {settings.tasksFilePath}");
|
||||||
while(IsFileInUse(settings.tasksFilePath))
|
while(IsFileInUse(settings.tasksFilePath))
|
||||||
Thread.Sleep(50);
|
Thread.Sleep(50);
|
||||||
File.WriteAllText(settings.tasksFilePath, JsonConvert.SerializeObject(this._allTasks));
|
File.WriteAllText(settings.tasksFilePath, JsonConvert.SerializeObject(this._allTasks));
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<OutputType>Exe</OutputType>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@ -17,11 +16,4 @@
|
|||||||
<ProjectReference Include="..\Logging\Logging.csproj" />
|
<ProjectReference Include="..\Logging\Logging.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Content Include="..\.dockerignore">
|
|
||||||
<Link>.dockerignore</Link>
|
|
||||||
<DependentUpon>Dockerfile</DependentUpon>
|
|
||||||
</Content>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
using System.Text.Json.Nodes;
|
using Logging;
|
||||||
using Logging;
|
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using Tranga.LibraryManagers;
|
using Tranga.LibraryManagers;
|
||||||
using Tranga.NotificationManagers;
|
using Tranga.NotificationManagers;
|
||||||
@ -13,31 +12,45 @@ public class TrangaSettings
|
|||||||
[JsonIgnore] public string settingsFilePath => Path.Join(workingDirectory, "settings.json");
|
[JsonIgnore] public string settingsFilePath => Path.Join(workingDirectory, "settings.json");
|
||||||
[JsonIgnore] public string tasksFilePath => Path.Join(workingDirectory, "tasks.json");
|
[JsonIgnore] public string tasksFilePath => Path.Join(workingDirectory, "tasks.json");
|
||||||
[JsonIgnore] public string coverImageCache => Path.Join(workingDirectory, "imageCache");
|
[JsonIgnore] public string coverImageCache => Path.Join(workingDirectory, "imageCache");
|
||||||
|
public HashSet<LibraryManager> libraryManagers { get; }
|
||||||
|
public HashSet<NotificationManager> notificationManagers { get; }
|
||||||
public ushort? version { get; set; }
|
public ushort? version { get; set; }
|
||||||
|
[JsonIgnore] public Logger? logger { get; init; }
|
||||||
|
|
||||||
public TrangaSettings(string downloadLocation, string workingDirectory)
|
public TrangaSettings(string downloadLocation, string workingDirectory, HashSet<LibraryManager>? libraryManagers,
|
||||||
|
HashSet<NotificationManager>? notificationManagers, Logger? logger)
|
||||||
{
|
{
|
||||||
if (downloadLocation.Length < 1 || workingDirectory.Length < 1)
|
if (downloadLocation.Length < 1 || workingDirectory.Length < 1)
|
||||||
throw new ArgumentException("Download-location and working-directory paths can not be empty!");
|
throw new ArgumentException("Download-location and working-directory paths can not be empty!");
|
||||||
this.workingDirectory = workingDirectory;
|
this.workingDirectory = workingDirectory;
|
||||||
this.downloadLocation = downloadLocation;
|
this.downloadLocation = downloadLocation;
|
||||||
|
this.libraryManagers = libraryManagers??new();
|
||||||
|
this.notificationManagers = notificationManagers??new();
|
||||||
|
this.logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static TrangaSettings LoadSettings(string importFilePath)
|
public static TrangaSettings LoadSettings(string importFilePath, Logger? logger)
|
||||||
{
|
{
|
||||||
if (!File.Exists(importFilePath))
|
if (!File.Exists(importFilePath))
|
||||||
return new TrangaSettings(Path.Join(Directory.GetCurrentDirectory(), "Downloads"), Directory.GetCurrentDirectory());
|
return new TrangaSettings(Path.Join(Directory.GetCurrentDirectory(), "Downloads"),
|
||||||
|
Directory.GetCurrentDirectory(), new HashSet<LibraryManager>(), new HashSet<NotificationManager>(), logger);
|
||||||
|
|
||||||
string toRead = File.ReadAllText(importFilePath);
|
string toRead = File.ReadAllText(importFilePath);
|
||||||
SettingsJsonObject settings = JsonConvert.DeserializeObject<SettingsJsonObject>(toRead,
|
TrangaSettings settings = JsonConvert.DeserializeObject<TrangaSettings>(toRead,
|
||||||
new JsonSerializerSettings { Converters = { new NotificationManager.NotificationManagerJsonConverter(), new LibraryManager.LibraryManagerJsonConverter() } })!;
|
new JsonSerializerSettings { Converters = { new NotificationManager.NotificationManagerJsonConverter(), new LibraryManager.LibraryManagerJsonConverter() } })!;
|
||||||
return settings.ts ?? new TrangaSettings(Path.Join(Directory.GetCurrentDirectory(), "Downloads"), Directory.GetCurrentDirectory());
|
if (logger is not null)
|
||||||
|
{
|
||||||
|
foreach (LibraryManager lm in settings.libraryManagers)
|
||||||
|
lm.AddLogger(logger);
|
||||||
|
foreach(NotificationManager nm in settings.notificationManagers)
|
||||||
|
nm.AddLogger(logger);
|
||||||
|
}
|
||||||
|
|
||||||
|
return settings;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ExportSettings()
|
public void ExportSettings()
|
||||||
{
|
{
|
||||||
SettingsJsonObject? settings = null;
|
|
||||||
if (File.Exists(settingsFilePath))
|
if (File.Exists(settingsFilePath))
|
||||||
{
|
{
|
||||||
bool inUse = true;
|
bool inUse = true;
|
||||||
@ -55,19 +68,8 @@ public class TrangaSettings
|
|||||||
Thread.Sleep(50);
|
Thread.Sleep(50);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
string toRead = File.ReadAllText(settingsFilePath);
|
|
||||||
settings = JsonConvert.DeserializeObject<SettingsJsonObject>(toRead,
|
|
||||||
new JsonSerializerSettings
|
|
||||||
{
|
|
||||||
Converters =
|
|
||||||
{
|
|
||||||
new NotificationManager.NotificationManagerJsonConverter(),
|
|
||||||
new LibraryManager.LibraryManagerJsonConverter()
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
settings = new SettingsJsonObject(this, settings?.co);
|
File.WriteAllText(settingsFilePath, JsonConvert.SerializeObject(this));
|
||||||
File.WriteAllText(settingsFilePath, JsonConvert.SerializeObject(settings));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void UpdateSettings(UpdateField field, params string[] values)
|
public void UpdateSettings(UpdateField field, params string[] values)
|
||||||
@ -79,21 +81,37 @@ public class TrangaSettings
|
|||||||
return;
|
return;
|
||||||
this.downloadLocation = values[0];
|
this.downloadLocation = values[0];
|
||||||
break;
|
break;
|
||||||
|
case UpdateField.Komga:
|
||||||
|
if (values.Length != 2)
|
||||||
|
return;
|
||||||
|
libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga));
|
||||||
|
libraryManagers.Add(new Komga(values[0], values[1], this.logger));
|
||||||
|
break;
|
||||||
|
case UpdateField.Kavita:
|
||||||
|
if (values.Length != 3)
|
||||||
|
return;
|
||||||
|
libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Kavita));
|
||||||
|
libraryManagers.Add(new Kavita(values[0], values[1], values[2], this.logger));
|
||||||
|
break;
|
||||||
|
case UpdateField.Gotify:
|
||||||
|
if (values.Length != 2)
|
||||||
|
return;
|
||||||
|
notificationManagers.RemoveWhere(nm => nm.GetType() == typeof(Gotify));
|
||||||
|
Gotify newGotify = new(values[0], values[1], this.logger);
|
||||||
|
notificationManagers.Add(newGotify);
|
||||||
|
newGotify.SendNotification("Success!", "Gotify was added to Tranga!");
|
||||||
|
break;
|
||||||
|
case UpdateField.LunaSea:
|
||||||
|
if(values.Length != 1)
|
||||||
|
return;
|
||||||
|
notificationManagers.RemoveWhere(nm => nm.GetType() == typeof(LunaSea));
|
||||||
|
LunaSea newLunaSea = new(values[0], this.logger);
|
||||||
|
notificationManagers.Add(newLunaSea);
|
||||||
|
newLunaSea.SendNotification("Success!", "LunaSea was added to Tranga!");
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
ExportSettings();
|
ExportSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum UpdateField { DownloadLocation, Komga, Kavita, Gotify, LunaSea}
|
public enum UpdateField { DownloadLocation, Komga, Kavita, Gotify, LunaSea}
|
||||||
|
|
||||||
internal class SettingsJsonObject
|
|
||||||
{
|
|
||||||
internal TrangaSettings? ts;
|
|
||||||
internal CommonObjects? co;
|
|
||||||
|
|
||||||
public SettingsJsonObject(TrangaSettings? ts, CommonObjects? co)
|
|
||||||
{
|
|
||||||
this.ts = ts;
|
|
||||||
this.co = co;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
@ -32,10 +32,10 @@ public class DownloadChapterTask : TrangaTask
|
|||||||
HttpStatusCode downloadSuccess = connector.DownloadChapter(this.publication, this.chapter, this, cancellationToken);
|
HttpStatusCode downloadSuccess = connector.DownloadChapter(this.publication, this.chapter, this, cancellationToken);
|
||||||
if ((int)downloadSuccess >= 200 && (int)downloadSuccess < 300)
|
if ((int)downloadSuccess >= 200 && (int)downloadSuccess < 300)
|
||||||
{
|
{
|
||||||
foreach(NotificationManager nm in taskManager.commonObjects.notificationManagers)
|
foreach(NotificationManager nm in taskManager.settings.notificationManagers)
|
||||||
nm.SendNotification("Chapter downloaded", $"{this.publication.sortName} {this.chapter.chapterNumber} {this.chapter.name}");
|
nm.SendNotification("Chapter downloaded", $"{this.publication.sortName} {this.chapter.chapterNumber} {this.chapter.name}");
|
||||||
|
|
||||||
foreach (LibraryManager lm in taskManager.commonObjects.libraryManagers)
|
foreach (LibraryManager lm in taskManager.settings.libraryManagers)
|
||||||
lm.UpdateLibrary();
|
lm.UpdateLibrary();
|
||||||
}
|
}
|
||||||
return downloadSuccess;
|
return downloadSuccess;
|
||||||
|
@ -66,7 +66,7 @@ public abstract class TrangaTask
|
|||||||
/// <param name="cancellationToken"></param>
|
/// <param name="cancellationToken"></param>
|
||||||
public void Execute(TaskManager taskManager, CancellationToken? cancellationToken = null)
|
public void Execute(TaskManager taskManager, CancellationToken? cancellationToken = null)
|
||||||
{
|
{
|
||||||
taskManager.commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Executing Task {this}");
|
taskManager.settings.logger?.WriteLine(this.GetType().ToString(), $"Executing Task {this}");
|
||||||
this.state = ExecutionState.Running;
|
this.state = ExecutionState.Running;
|
||||||
this.executionStarted = DateTime.Now;
|
this.executionStarted = DateTime.Now;
|
||||||
this.lastChange = DateTime.Now;
|
this.lastChange = DateTime.Now;
|
||||||
@ -89,7 +89,7 @@ public abstract class TrangaTask
|
|||||||
if (this is DownloadChapterTask)
|
if (this is DownloadChapterTask)
|
||||||
taskManager.DeleteTask(this);
|
taskManager.DeleteTask(this);
|
||||||
|
|
||||||
taskManager.commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Finished Executing Task {this}");
|
taskManager.settings.logger?.WriteLine(this.GetType().ToString(), $"Finished Executing Task {this}");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddChildTask(TrangaTask childTask)
|
public void AddChildTask(TrangaTask childTask)
|
||||||
|
Loading…
Reference in New Issue
Block a user