Compare commits
7 Commits
8b58e7dd13
...
02a382a99a
Author | SHA1 | Date | |
---|---|---|---|
02a382a99a | |||
c6c8f5cdf6 | |||
84842aed3c | |||
d9ced11cd1 | |||
25c90782dc | |||
e789c429cd | |||
93de471836 |
@ -18,7 +18,7 @@ TrangaSettings settings;
|
|||||||
if (File.Exists(settingsFilePath))
|
if (File.Exists(settingsFilePath))
|
||||||
settings = TrangaSettings.LoadSettings(settingsFilePath, logger);
|
settings = TrangaSettings.LoadSettings(settingsFilePath, logger);
|
||||||
else
|
else
|
||||||
settings = new TrangaSettings(downloadFolderPath, applicationFolderPath, new HashSet<LibraryManager>());
|
settings = new TrangaSettings(downloadFolderPath, applicationFolderPath, new HashSet<LibraryManager>(), new HashSet<NotificationManager>());
|
||||||
|
|
||||||
Directory.CreateDirectory(settings.workingDirectory);
|
Directory.CreateDirectory(settings.workingDirectory);
|
||||||
Directory.CreateDirectory(settings.downloadLocation);
|
Directory.CreateDirectory(settings.downloadLocation);
|
||||||
@ -243,7 +243,21 @@ app.MapDelete("/Queue/Dequeue", (string taskType, string? connectorName, string?
|
|||||||
app.MapGet("/Settings/Get", () => taskManager.settings);
|
app.MapGet("/Settings/Get", () => taskManager.settings);
|
||||||
|
|
||||||
app.MapPost("/Settings/Update",
|
app.MapPost("/Settings/Update",
|
||||||
(string? downloadLocation, string? komgaUrl, string? komgaAuth, string? kavitaUrl, string? kavitaUsername, string? kavitaPassword) =>
|
(string? downloadLocation, string? komgaUrl, string? komgaAuth, string? kavitaUrl, string? kavitaUsername,
|
||||||
taskManager.UpdateSettings(downloadLocation, komgaUrl, komgaAuth, kavitaUrl, kavitaUsername, kavitaPassword));
|
string? kavitaPassword, string? gotifyUrl, string? gotifyAppToken, string? lunaseaWebhook) =>
|
||||||
|
{
|
||||||
|
if (downloadLocation is not null && downloadLocation.Length > 0)
|
||||||
|
taskManager.settings.UpdateSettings(TrangaSettings.UpdateField.DownloadLocation, logger, downloadLocation);
|
||||||
|
if (komgaUrl is not null && komgaAuth is not null && komgaUrl.Length > 5 && komgaAuth.Length > 0)
|
||||||
|
taskManager.settings.UpdateSettings(TrangaSettings.UpdateField.Komga, logger, komgaUrl, komgaAuth);
|
||||||
|
if (kavitaUrl is not null && kavitaPassword is not null && kavitaUsername is not null && kavitaUrl.Length > 5 &&
|
||||||
|
kavitaUsername.Length > 0 && kavitaPassword.Length > 0)
|
||||||
|
taskManager.settings.UpdateSettings(TrangaSettings.UpdateField.Kavita, logger, kavitaUrl, kavitaUsername,
|
||||||
|
kavitaPassword);
|
||||||
|
if (gotifyUrl is not null && gotifyAppToken is not null && gotifyUrl.Length > 5 && gotifyAppToken.Length > 0)
|
||||||
|
taskManager.settings.UpdateSettings(TrangaSettings.UpdateField.Gotify, logger, gotifyUrl, gotifyAppToken);
|
||||||
|
if(lunaseaWebhook is not null && lunaseaWebhook.Length > 5)
|
||||||
|
taskManager.settings.UpdateSettings(TrangaSettings.UpdateField.LunaSea, logger, lunaseaWebhook);
|
||||||
|
});
|
||||||
|
|
||||||
app.Run();
|
app.Run();
|
@ -2,6 +2,7 @@
|
|||||||
using Logging;
|
using Logging;
|
||||||
using Tranga;
|
using Tranga;
|
||||||
using Tranga.LibraryManagers;
|
using Tranga.LibraryManagers;
|
||||||
|
using Tranga.NotificationManagers;
|
||||||
using Tranga.TrangaTasks;
|
using Tranga.TrangaTasks;
|
||||||
|
|
||||||
namespace Tranga_CLI;
|
namespace Tranga_CLI;
|
||||||
@ -30,7 +31,7 @@ public static class Tranga_Cli
|
|||||||
Logger logger = new(new[] { Logger.LoggerType.FileLogger }, null, Console.Out.Encoding, logFilePath);
|
Logger logger = new(new[] { Logger.LoggerType.FileLogger }, null, Console.Out.Encoding, logFilePath);
|
||||||
|
|
||||||
logger.WriteLine("Tranga_CLI", "Loading Taskmanager.");
|
logger.WriteLine("Tranga_CLI", "Loading Taskmanager.");
|
||||||
TrangaSettings settings = File.Exists(settingsFilePath) ? TrangaSettings.LoadSettings(settingsFilePath, logger) : new TrangaSettings(Directory.GetCurrentDirectory(), applicationFolderPath, new HashSet<LibraryManager>());
|
TrangaSettings settings = File.Exists(settingsFilePath) ? TrangaSettings.LoadSettings(settingsFilePath, logger) : new TrangaSettings(Directory.GetCurrentDirectory(), applicationFolderPath, new HashSet<LibraryManager>(), new HashSet<NotificationManager>());
|
||||||
|
|
||||||
|
|
||||||
logger.WriteLine("Tranga_CLI", "User Input");
|
logger.WriteLine("Tranga_CLI", "User Input");
|
||||||
@ -39,7 +40,7 @@ public static class Tranga_Cli
|
|||||||
while(tmpPath is null)
|
while(tmpPath is null)
|
||||||
tmpPath = Console.ReadLine();
|
tmpPath = Console.ReadLine();
|
||||||
if (tmpPath.Length > 0)
|
if (tmpPath.Length > 0)
|
||||||
settings.downloadLocation = tmpPath;
|
settings.UpdateSettings(TrangaSettings.UpdateField.DownloadLocation, logger, tmpPath);
|
||||||
|
|
||||||
Console.WriteLine($"Komga BaseURL [{settings.libraryManagers.FirstOrDefault(lm => lm.GetType() == typeof(Komga))?.baseUrl}]:");
|
Console.WriteLine($"Komga BaseURL [{settings.libraryManagers.FirstOrDefault(lm => lm.GetType() == typeof(Komga))?.baseUrl}]:");
|
||||||
string? tmpUrlKomga = Console.ReadLine();
|
string? tmpUrlKomga = Console.ReadLine();
|
||||||
@ -72,8 +73,7 @@ public static class Tranga_Cli
|
|||||||
}
|
}
|
||||||
} while (key != ConsoleKey.Enter);
|
} while (key != ConsoleKey.Enter);
|
||||||
|
|
||||||
settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga));
|
settings.UpdateSettings(TrangaSettings.UpdateField.Komga, logger, tmpUrlKomga, tmpKomgaUser, tmpKomgaPass);
|
||||||
settings.libraryManagers.Add(new Komga(tmpUrlKomga, tmpKomgaUser, tmpKomgaPass, logger));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Console.WriteLine($"Kavita BaseURL [{settings.libraryManagers.FirstOrDefault(lm => lm.GetType() == typeof(Kavita))?.baseUrl}]:");
|
Console.WriteLine($"Kavita BaseURL [{settings.libraryManagers.FirstOrDefault(lm => lm.GetType() == typeof(Kavita))?.baseUrl}]:");
|
||||||
@ -107,11 +107,26 @@ public static class Tranga_Cli
|
|||||||
}
|
}
|
||||||
} while (key != ConsoleKey.Enter);
|
} while (key != ConsoleKey.Enter);
|
||||||
|
|
||||||
settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Kavita));
|
settings.UpdateSettings(TrangaSettings.UpdateField.Kavita, logger, tmpUrlKavita, tmpKavitaUser, tmpKavitaPass);
|
||||||
settings.libraryManagers.Add(new Kavita(tmpUrlKavita, tmpKavitaUser, tmpKavitaPass, logger));
|
}
|
||||||
|
|
||||||
|
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, logger, tmpGotifyUrl, tmpGotifyAppToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.WriteLine("Tranga_CLI", "Loaded.");
|
logger.WriteLine("Tranga_CLI", "Loaded.");
|
||||||
|
foreach(NotificationManager nm in settings.notificationManagers)
|
||||||
|
nm.SendNotification("Tranga", "Loaded.");
|
||||||
TaskMode(settings, logger);
|
TaskMode(settings, logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=Gotify/@EntryIndexedValue">True</s:Boolean>
|
||||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Komga/@EntryIndexedValue">True</s:Boolean>
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=Komga/@EntryIndexedValue">True</s:Boolean>
|
||||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Manganato/@EntryIndexedValue">True</s:Boolean>
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=Manganato/@EntryIndexedValue">True</s:Boolean>
|
||||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Mangasee/@EntryIndexedValue">True</s:Boolean>
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=Mangasee/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
49
Tranga/NotificationManager.cs
Normal file
49
Tranga/NotificationManager.cs
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
using Logging;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
using Tranga.NotificationManagers;
|
||||||
|
|
||||||
|
namespace Tranga;
|
||||||
|
|
||||||
|
public abstract class NotificationManager
|
||||||
|
{
|
||||||
|
protected Logger? logger;
|
||||||
|
public NotificationManagerType notificationManagerType { get; }
|
||||||
|
|
||||||
|
protected NotificationManager(NotificationManagerType notificationManagerType, Logger? logger = null)
|
||||||
|
{
|
||||||
|
this.notificationManagerType = notificationManagerType;
|
||||||
|
this.logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum NotificationManagerType : byte { Gotify = 0, LunaSea = 1 }
|
||||||
|
|
||||||
|
public abstract void SendNotification(string title, string notificationText);
|
||||||
|
|
||||||
|
public class NotificationManagerJsonConverter : JsonConverter
|
||||||
|
{
|
||||||
|
public override bool CanConvert(Type objectType)
|
||||||
|
{
|
||||||
|
return (objectType == typeof(NotificationManager));
|
||||||
|
}
|
||||||
|
|
||||||
|
public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
JObject jo = JObject.Load(reader);
|
||||||
|
if (jo["notificationManagerType"]!.Value<byte>() == (byte)NotificationManagerType.Gotify)
|
||||||
|
return jo.ToObject<Gotify>(serializer)!;
|
||||||
|
|
||||||
|
throw new Exception();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool CanWrite => false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Don't call this
|
||||||
|
/// </summary>
|
||||||
|
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
throw new Exception("Dont call this");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
49
Tranga/NotificationManagers/Gotify.cs
Normal file
49
Tranga/NotificationManagers/Gotify.cs
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
using System.Text;
|
||||||
|
using Logging;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
|
namespace Tranga.NotificationManagers;
|
||||||
|
|
||||||
|
public class Gotify : NotificationManager
|
||||||
|
{
|
||||||
|
public string endpoint { get; }
|
||||||
|
public string appToken { get; }
|
||||||
|
private readonly HttpClient _client = new();
|
||||||
|
|
||||||
|
public Gotify(string endpoint, string appToken, Logger? logger = null) : base(NotificationManagerType.Gotify, logger)
|
||||||
|
{
|
||||||
|
this.endpoint = endpoint;
|
||||||
|
this.appToken = appToken;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void SendNotification(string title, string notificationText)
|
||||||
|
{
|
||||||
|
logger?.WriteLine(this.GetType().ToString(), $"Sending notification: {title} - {notificationText}");
|
||||||
|
MessageData message = new(title, notificationText);
|
||||||
|
HttpRequestMessage request = new(HttpMethod.Post, $"{endpoint}/message");
|
||||||
|
request.Headers.Add("X-Gotify-Key", this.appToken);
|
||||||
|
request.Content = new StringContent(JsonConvert.SerializeObject(message, Formatting.None), Encoding.UTF8, "application/json");
|
||||||
|
HttpResponseMessage response = _client.Send(request);
|
||||||
|
if (!response.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
StreamReader sr = new (response.Content.ReadAsStream());
|
||||||
|
logger?.WriteLine(this.GetType().ToString(), $"{response.StatusCode}: {sr.ReadToEnd()}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class MessageData
|
||||||
|
{
|
||||||
|
public string message { get; }
|
||||||
|
public long priority { get; }
|
||||||
|
public string title { get; }
|
||||||
|
public Dictionary<string, object> extras { get; }
|
||||||
|
|
||||||
|
public MessageData(string title, string message)
|
||||||
|
{
|
||||||
|
this.title = title;
|
||||||
|
this.message = message;
|
||||||
|
this.extras = new();
|
||||||
|
this.priority = 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
43
Tranga/NotificationManagers/LunaSea.cs
Normal file
43
Tranga/NotificationManagers/LunaSea.cs
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
using System.Text;
|
||||||
|
using Logging;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
|
namespace Tranga.NotificationManagers;
|
||||||
|
|
||||||
|
public class LunaSea : NotificationManager
|
||||||
|
{
|
||||||
|
public string webhook { get; }
|
||||||
|
private readonly HttpClient _client = new();
|
||||||
|
public LunaSea(string webhook, Logger? logger = null) : base(NotificationManagerType.LunaSea, logger)
|
||||||
|
{
|
||||||
|
this.webhook = webhook;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void SendNotification(string title, string notificationText)
|
||||||
|
{
|
||||||
|
logger?.WriteLine(this.GetType().ToString(), $"Sending notification: {title} - {notificationText}");
|
||||||
|
MessageData message = new(title, notificationText);
|
||||||
|
HttpRequestMessage request = new(HttpMethod.Post, webhook);
|
||||||
|
request.Content = new StringContent(JsonConvert.SerializeObject(message, Formatting.None), Encoding.UTF8, "application/json");
|
||||||
|
HttpResponseMessage response = _client.Send(request);
|
||||||
|
if (!response.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
StreamReader sr = new (response.Content.ReadAsStream());
|
||||||
|
logger?.WriteLine(this.GetType().ToString(), $"{response.StatusCode}: {sr.ReadToEnd()}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class MessageData
|
||||||
|
{
|
||||||
|
public string title { get; }
|
||||||
|
public string body { get; }
|
||||||
|
public string image { get; }
|
||||||
|
|
||||||
|
public MessageData(string title, string body)
|
||||||
|
{
|
||||||
|
this.title = title;
|
||||||
|
this.body = body;
|
||||||
|
this.image = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,7 +1,6 @@
|
|||||||
using Logging;
|
using Logging;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using Tranga.Connectors;
|
using Tranga.Connectors;
|
||||||
using Tranga.LibraryManagers;
|
|
||||||
using Tranga.TrangaTasks;
|
using Tranga.TrangaTasks;
|
||||||
|
|
||||||
namespace Tranga;
|
namespace Tranga;
|
||||||
@ -25,8 +24,9 @@ public class TaskManager
|
|||||||
/// <param name="workingDirectory">Path to the working directory</param>
|
/// <param name="workingDirectory">Path to the working directory</param>
|
||||||
/// <param name="imageCachePath">Path to the cover-image cache</param>
|
/// <param name="imageCachePath">Path to the cover-image cache</param>
|
||||||
/// <param name="libraryManagers"></param>
|
/// <param name="libraryManagers"></param>
|
||||||
|
/// <param name="notificationManagers"></param>
|
||||||
/// <param name="logger"></param>
|
/// <param name="logger"></param>
|
||||||
public TaskManager(string downloadFolderPath, string workingDirectory, string imageCachePath, HashSet<LibraryManager> libraryManagers, Logger? logger = null) : this(new TrangaSettings(downloadFolderPath, workingDirectory, libraryManagers), logger)
|
public TaskManager(string downloadFolderPath, string workingDirectory, string imageCachePath, HashSet<LibraryManager> libraryManagers, HashSet<NotificationManager> notificationManagers, Logger? logger = null) : this(new TrangaSettings(downloadFolderPath, workingDirectory, libraryManagers, notificationManagers), logger)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -48,23 +48,6 @@ public class TaskManager
|
|||||||
taskChecker.Start();
|
taskChecker.Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void UpdateSettings(string? downloadLocation, string? komgaUrl, string? komgaAuth, string? kavitaUrl, string? kavitaUsername, string? kavitaPassword)
|
|
||||||
{
|
|
||||||
if (komgaUrl is not null && komgaAuth is not null && komgaUrl.Length > 0 && komgaAuth.Length > 0)
|
|
||||||
{
|
|
||||||
settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga));
|
|
||||||
settings.libraryManagers.Add(new Komga(komgaUrl, komgaAuth, logger));
|
|
||||||
}
|
|
||||||
if (kavitaUrl is not null && kavitaUsername is not null && kavitaPassword is not null && kavitaUrl.Length > 0 && kavitaUsername.Length > 0 && kavitaPassword.Length > 0)
|
|
||||||
{
|
|
||||||
settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Kavita));
|
|
||||||
settings.libraryManagers.Add(new Kavita(kavitaUrl, kavitaUsername, kavitaPassword, logger));
|
|
||||||
}
|
|
||||||
if (downloadLocation is not null && downloadLocation.Length > 0)
|
|
||||||
settings.downloadLocation = downloadLocation;
|
|
||||||
ExportDataAndSettings();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Runs continuously until shutdown.
|
/// Runs continuously until shutdown.
|
||||||
/// Checks if tasks have to be executed (time elapsed)
|
/// Checks if tasks have to be executed (time elapsed)
|
||||||
@ -193,7 +176,9 @@ public class TaskManager
|
|||||||
{
|
{
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Removing Task {removeTask}");
|
logger?.WriteLine(this.GetType().ToString(), $"Removing Task {removeTask}");
|
||||||
_allTasks.Remove(removeTask);
|
_allTasks.Remove(removeTask);
|
||||||
if (removeTask.GetType() == typeof(DownloadChapterTask))
|
if (removeTask.parentTask is not null)
|
||||||
|
removeTask.parentTask.RemoveChildTask(removeTask);
|
||||||
|
if (removeTask.GetType() == typeof(DownloadChapterTask) && _runningDownloadChapterTasks.ContainsKey((DownloadChapterTask)removeTask))
|
||||||
{
|
{
|
||||||
_runningDownloadChapterTasks[(DownloadChapterTask)removeTask].Cancel();
|
_runningDownloadChapterTasks[(DownloadChapterTask)removeTask].Cancel();
|
||||||
_runningDownloadChapterTasks.Remove((DownloadChapterTask)removeTask);
|
_runningDownloadChapterTasks.Remove((DownloadChapterTask)removeTask);
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
using Logging;
|
using Logging;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using Tranga.LibraryManagers;
|
using Tranga.LibraryManagers;
|
||||||
|
using Tranga.NotificationManagers;
|
||||||
|
|
||||||
namespace Tranga;
|
namespace Tranga;
|
||||||
|
|
||||||
@ -8,32 +9,75 @@ public class TrangaSettings
|
|||||||
{
|
{
|
||||||
public string downloadLocation { get; set; }
|
public string downloadLocation { get; set; }
|
||||||
public string workingDirectory { get; set; }
|
public string workingDirectory { get; set; }
|
||||||
[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 knownPublicationsPath => Path.Join(workingDirectory, "knownPublications.json");
|
[JsonIgnore] public string knownPublicationsPath => Path.Join(workingDirectory, "knownPublications.json");
|
||||||
[JsonIgnore] public string coverImageCache => Path.Join(workingDirectory, "imageCache");
|
[JsonIgnore] public string coverImageCache => Path.Join(workingDirectory, "imageCache");
|
||||||
public HashSet<LibraryManager> libraryManagers { get; }
|
public HashSet<LibraryManager> libraryManagers { get; }
|
||||||
|
public HashSet<NotificationManager> notificationManagers { get; }
|
||||||
|
|
||||||
public TrangaSettings(string downloadLocation, string workingDirectory, HashSet<LibraryManager> libraryManagers)
|
public TrangaSettings(string downloadLocation, string workingDirectory, HashSet<LibraryManager>? libraryManagers,
|
||||||
|
HashSet<NotificationManager>? notificationManagers)
|
||||||
{
|
{
|
||||||
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;
|
this.libraryManagers = libraryManagers??new();
|
||||||
|
this.notificationManagers = notificationManagers??new();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static TrangaSettings LoadSettings(string importFilePath, Logger? logger)
|
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(), new HashSet<LibraryManager>());
|
return new TrangaSettings(Path.Join(Directory.GetCurrentDirectory(), "Downloads"),
|
||||||
|
Directory.GetCurrentDirectory(), new HashSet<LibraryManager>(), new HashSet<NotificationManager>());
|
||||||
|
|
||||||
string toRead = File.ReadAllText(importFilePath);
|
string toRead = File.ReadAllText(importFilePath);
|
||||||
TrangaSettings settings = JsonConvert.DeserializeObject<TrangaSettings>(toRead, new JsonSerializerSettings() { Converters = { new LibraryManager.LibraryManagerJsonConverter()} })!;
|
TrangaSettings settings = JsonConvert.DeserializeObject<TrangaSettings>(toRead,
|
||||||
if(logger is not null)
|
new JsonSerializerSettings { Converters = { new NotificationManager.NotificationManagerJsonConverter(), new LibraryManager.LibraryManagerJsonConverter() } })!;
|
||||||
foreach(LibraryManager lm in settings.libraryManagers)
|
if (logger is not null)
|
||||||
|
foreach (LibraryManager lm in settings.libraryManagers)
|
||||||
lm.AddLogger(logger);
|
lm.AddLogger(logger);
|
||||||
|
|
||||||
return settings;
|
return settings;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void UpdateSettings(UpdateField field, Logger? logger = null, params string[] values)
|
||||||
|
{
|
||||||
|
switch (field)
|
||||||
|
{
|
||||||
|
case UpdateField.DownloadLocation:
|
||||||
|
if (values.Length != 1)
|
||||||
|
return;
|
||||||
|
this.downloadLocation = values[0];
|
||||||
|
break;
|
||||||
|
case UpdateField.Komga:
|
||||||
|
if (values.Length != 2)
|
||||||
|
return;
|
||||||
|
libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga));
|
||||||
|
libraryManagers.Add(new Komga(values[0], values[1], 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], logger));
|
||||||
|
break;
|
||||||
|
case UpdateField.Gotify:
|
||||||
|
if (values.Length != 2)
|
||||||
|
return;
|
||||||
|
notificationManagers.RemoveWhere(nm => nm.GetType() == typeof(Gotify));
|
||||||
|
notificationManagers.Add(new Gotify(values[0], values[1], logger));
|
||||||
|
break;
|
||||||
|
case UpdateField.LunaSea:
|
||||||
|
if(values.Length != 1)
|
||||||
|
return;
|
||||||
|
notificationManagers.RemoveWhere(nm => nm.GetType() == typeof(LunaSea));
|
||||||
|
notificationManagers.Add(new LunaSea(values[0], logger));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum UpdateField { DownloadLocation, Komga, Kavita, Gotify, LunaSea}
|
||||||
}
|
}
|
@ -76,11 +76,8 @@ public abstract class TrangaTask
|
|||||||
|
|
||||||
public void ReplaceFailedChildTask(DownloadChapterTask failed, DownloadChapterTask newTask)
|
public void ReplaceFailedChildTask(DownloadChapterTask failed, DownloadChapterTask newTask)
|
||||||
{
|
{
|
||||||
if (!this.childTasks.Contains(failed))
|
this.RemoveChildTask(failed);
|
||||||
throw new ArgumentException($"Task {failed} is not childTask of {this}");
|
this.AddChildTask(newTask);
|
||||||
this.childTasks.Remove(failed);
|
|
||||||
this.childTasks.Add(newTask);
|
|
||||||
this.DecrementProgress(failed.progress);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddChildTask(TrangaTask childTask)
|
public void AddChildTask(TrangaTask childTask)
|
||||||
@ -88,6 +85,12 @@ public abstract class TrangaTask
|
|||||||
this.childTasks.Add(childTask);
|
this.childTasks.Add(childTask);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void RemoveChildTask(TrangaTask childTask)
|
||||||
|
{
|
||||||
|
this.childTasks.Remove(childTask);
|
||||||
|
this.DecrementProgress(childTask.progress);
|
||||||
|
}
|
||||||
|
|
||||||
public void IncrementProgress(double amount)
|
public void IncrementProgress(double amount)
|
||||||
{
|
{
|
||||||
this.lastChange = DateTime.Now;
|
this.lastChange = DateTime.Now;
|
||||||
|
@ -36,6 +36,9 @@ public class DownloadNewChaptersTask : TrangaTask
|
|||||||
taskManager.AddTask(newTask);
|
taskManager.AddTask(newTask);
|
||||||
this.childTasks.Add(newTask);
|
this.childTasks.Add(newTask);
|
||||||
}
|
}
|
||||||
|
if(newChapters.Count > 0)
|
||||||
|
foreach(NotificationManager nm in taskManager.settings.notificationManagers)
|
||||||
|
nm.SendNotification(pub.sortName, $"Downloading {newChapters.Count} new Chapters.");
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string ToString()
|
public override string ToString()
|
||||||
|
@ -126,17 +126,33 @@ function EnqueueTask(taskType, connectorName, publicationId){
|
|||||||
PostData(uri);
|
PostData(uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
function UpdateSettings(downloadLocation, komgaUrl, komgaAuth, kavitaUrl, kavitaUser, kavitaPass){
|
function UpdateDownloadLocation(downloadLocation){
|
||||||
var uri = apiUri + "/Settings/Update?"
|
var uri = apiUri + "/Settings/Update?"
|
||||||
if(downloadLocation != ""){
|
|
||||||
uri += "&downloadLocation="+downloadLocation;
|
uri += "&downloadLocation="+downloadLocation;
|
||||||
}
|
PostData(uri);
|
||||||
if(komgaUrl != "" && komgaAuth != ""){
|
}
|
||||||
|
|
||||||
|
function UpdateKomga(komgaUrl, komgaAuth){
|
||||||
|
var uri = apiUri + "/Settings/Update?"
|
||||||
uri += `&komgaUrl=${komgaUrl}&komgaAuth=${komgaAuth}`;
|
uri += `&komgaUrl=${komgaUrl}&komgaAuth=${komgaAuth}`;
|
||||||
}
|
PostData(uri);
|
||||||
if(kavitaUrl != "" && kavitaUser != "" && kavitaPass != ""){
|
}
|
||||||
|
|
||||||
|
function UpdateKavita(kavitaUrl, kavitaUser, kavitaPass){
|
||||||
|
var uri = apiUri + "/Settings/Update?"
|
||||||
uri += `&kavitaUrl=${kavitaUrl}&kavitaUsername=${kavitaUser}&kavitaPassword=${kavitaPass}`;
|
uri += `&kavitaUrl=${kavitaUrl}&kavitaUsername=${kavitaUser}&kavitaPassword=${kavitaPass}`;
|
||||||
}
|
PostData(uri);
|
||||||
|
}
|
||||||
|
|
||||||
|
function UpdateGotify(gotifyUrl, gotifyAppToken){
|
||||||
|
var uri = apiUri + "/Settings/Update?"
|
||||||
|
uri += `&gotifyUrl=${gotifyUrl}&gotifyAppToken=${gotifyAppToken}`;
|
||||||
|
PostData(uri);
|
||||||
|
}
|
||||||
|
|
||||||
|
function UpdateLunaSea(lunaseaWebhook){
|
||||||
|
var uri = apiUri + "/Settings/Update?"
|
||||||
|
uri += `&lunaseaWebhook=${lunaseaWebhook}`;
|
||||||
PostData(uri);
|
PostData(uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -133,6 +133,17 @@
|
|||||||
<label for="kavitaUsername"></label><input placeholder="Username" id="kavitaUsername" type="text">
|
<label for="kavitaUsername"></label><input placeholder="Username" id="kavitaUsername" type="text">
|
||||||
<label for="kavitaPassword"></label><input placeholder="Password" id="kavitaPassword" type="password">
|
<label for="kavitaPassword"></label><input placeholder="Password" id="kavitaPassword" type="password">
|
||||||
</div>
|
</div>
|
||||||
|
<div>
|
||||||
|
<span class="title">Gotify</span>
|
||||||
|
<div>Configured: <span id="gotifyConfigured">✅❌</span></div>
|
||||||
|
<label for="gotifyUrl"></label><input placeholder="URL" id="gotifyUrl" type="text">
|
||||||
|
<label for="gotifyAppToken"></label><input placeholder="App-Token" id="gotifyAppToken" type="text">
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span class="title">LunaSea</span>
|
||||||
|
<div>Configured: <span id="lunaseaConfigured">✅❌</span></div>
|
||||||
|
<label for="lunaseaWebhook"></label><input placeholder="Webhook-Url" id="lunaseaWebhook" type="text">
|
||||||
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label for="libraryUpdateTime" style="margin-right: 5px;">Update Time</label><input id="libraryUpdateTime" type="time" value="00:01:00" step="10">
|
<label for="libraryUpdateTime" style="margin-right: 5px;">Update Time</label><input id="libraryUpdateTime" type="time" value="00:01:00" step="10">
|
||||||
<input type="submit" value="Update" onclick="UpdateLibrarySettings()">
|
<input type="submit" value="Update" onclick="UpdateLibrarySettings()">
|
||||||
|
@ -33,9 +33,14 @@ const settingKomgaPass = document.querySelector("#komgaPassword");
|
|||||||
const settingKavitaUrl = document.querySelector("#kavitaUrl");
|
const settingKavitaUrl = document.querySelector("#kavitaUrl");
|
||||||
const settingKavitaUser = document.querySelector("#kavitaUsername");
|
const settingKavitaUser = document.querySelector("#kavitaUsername");
|
||||||
const settingKavitaPass = document.querySelector("#kavitaPassword");
|
const settingKavitaPass = document.querySelector("#kavitaPassword");
|
||||||
|
const settingGotifyUrl = document.querySelector("#gotifyUrl");
|
||||||
|
const settingGotifyAppToken = document.querySelector("#gotifyAppToken");
|
||||||
|
const settingLunaseaWebhook = document.querySelector("#lunaseaWebhook");
|
||||||
const libraryUpdateTime = document.querySelector("#libraryUpdateTime");
|
const libraryUpdateTime = document.querySelector("#libraryUpdateTime");
|
||||||
const settingKomgaConfigured = document.querySelector("#komgaConfigured");
|
const settingKomgaConfigured = document.querySelector("#komgaConfigured");
|
||||||
const settingKavitaConfigured = document.querySelector("#kavitaConfigured");
|
const settingKavitaConfigured = document.querySelector("#kavitaConfigured");
|
||||||
|
const settingGotifyConfigured = document.querySelector("#gotifyConfigured");
|
||||||
|
const settingLunaseaConfigured = document.querySelector("#lunaseaConfigured");
|
||||||
const settingApiUri = document.querySelector("#settingApiUri");
|
const settingApiUri = document.querySelector("#settingApiUri");
|
||||||
const tagTasksRunning = document.querySelector("#tasksRunningTag");
|
const tagTasksRunning = document.querySelector("#tasksRunningTag");
|
||||||
const tagTasksQueued = document.querySelector("#tasksQueuedTag");
|
const tagTasksQueued = document.querySelector("#tasksQueuedTag");
|
||||||
@ -284,15 +289,21 @@ function GetSettingsClick(){
|
|||||||
settingKomgaUrl.value = "";
|
settingKomgaUrl.value = "";
|
||||||
settingKomgaUser.value = "";
|
settingKomgaUser.value = "";
|
||||||
settingKomgaPass.value = "";
|
settingKomgaPass.value = "";
|
||||||
|
settingKomgaConfigured.innerText = "❌";
|
||||||
settingKavitaUrl.value = "";
|
settingKavitaUrl.value = "";
|
||||||
settingKavitaUser.value = "";
|
settingKavitaUser.value = "";
|
||||||
settingKavitaPass.value = "";
|
settingKavitaPass.value = "";
|
||||||
settingKomgaConfigured.innerText = "❌";
|
|
||||||
settingKavitaConfigured.innerText = "❌";
|
settingKavitaConfigured.innerText = "❌";
|
||||||
|
settingGotifyUrl.value = "";
|
||||||
|
settingGotifyAppToken.value = "";
|
||||||
|
settingGotifyConfigured.innerText = "❌";
|
||||||
|
settingLunaseaWebhook.value = "";
|
||||||
|
settingLunaseaConfigured.innerText = "❌";
|
||||||
|
|
||||||
settingApiUri.placeholder = apiUri;
|
settingApiUri.placeholder = apiUri;
|
||||||
|
|
||||||
GetSettings().then(json => {
|
GetSettings().then(json => {
|
||||||
|
console.log(json);
|
||||||
settingDownloadLocation.innerText = json.downloadLocation;
|
settingDownloadLocation.innerText = json.downloadLocation;
|
||||||
json.libraryManagers.forEach(lm => {
|
json.libraryManagers.forEach(lm => {
|
||||||
if(lm.libraryType == 0){
|
if(lm.libraryType == 0){
|
||||||
@ -307,6 +318,13 @@ function GetSettingsClick(){
|
|||||||
settingKavitaConfigured.innerText = "✅";
|
settingKavitaConfigured.innerText = "✅";
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
json.notificationManagers.forEach(nm => {
|
||||||
|
if(nm.notificationManagerType == 0){
|
||||||
|
settingGotifyConfigured.innerText = "✅";
|
||||||
|
} else if(nm.notificationManagerType == 1){
|
||||||
|
settingLunaseaConfigured.innerText = "✅";
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
GetKomgaTask().then(json => {
|
GetKomgaTask().then(json => {
|
||||||
@ -316,19 +334,24 @@ function GetSettingsClick(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
function UpdateLibrarySettings(){
|
function UpdateLibrarySettings(){
|
||||||
if(settingKomgaUser.value != "" && settingKomgaPass != ""){
|
if(settingKomgaUrl.value != "" && settingKomgaUser.value != "" && settingKomgaPass != ""){
|
||||||
var auth = utf8_to_b64(`${settingKomgaUser.value}:${settingKomgaPass.value}`);
|
var auth = utf8_to_b64(`${settingKomgaUser.value}:${settingKomgaPass.value}`);
|
||||||
console.log(auth);
|
console.log(auth);
|
||||||
|
UpdateKomga(settingKomgaUrl.value, auth);
|
||||||
if(settingKomgaUrl.value != "")
|
|
||||||
UpdateSettings("", settingKomgaUrl.value, auth, "", "");
|
|
||||||
else
|
|
||||||
UpdateSettings("", settingKomgaUrl.placeholder, auth, "", "");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(settingKavitaUrl.value != "" && settingKavitaUser.value != "" && settingKavitaPass.value != ""){
|
if(settingKavitaUrl.value != "" && settingKavitaUser.value != "" && settingKavitaPass.value != ""){
|
||||||
UpdateSettings("", "", "", settingKavitaUrl.value, settingKavitaUser.value, settingKavitaPass.value);
|
UpdateKavita(settingKavitaUrl.value, settingKavitaUser.value, settingKavitaPass.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(settingGotifyUrl.value != "" && settingGotifyAppToken.value != ""){
|
||||||
|
UpdateGotify(settingGotifyUrl.value, settingGotifyAppToken.value);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(settingLunaseaWebhook.value != ""){
|
||||||
|
UpdateLunaSea(settingLunaseaWebhook.value);
|
||||||
|
}
|
||||||
|
|
||||||
CreateUpdateLibraryTask(libraryUpdateTime.value);
|
CreateUpdateLibraryTask(libraryUpdateTime.value);
|
||||||
setTimeout(() => GetSettingsClick(), 200);
|
setTimeout(() => GetSettingsClick(), 200);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user