Compare commits
No commits in common. "e0e7abb62b4be17bbf23e430338c8fb843f041a7" and "5d98295c59f6d54f46ca9ef5a931375c8af1d391" have entirely different histories.
e0e7abb62b
...
5d98295c59
@ -40,11 +40,13 @@ public static class Tranga_Cli
|
|||||||
if (tmpPath.Length > 0)
|
if (tmpPath.Length > 0)
|
||||||
settings.downloadLocation = tmpPath;
|
settings.downloadLocation = tmpPath;
|
||||||
|
|
||||||
Console.WriteLine($"Komga BaseURL [{settings.libraryManagers.FirstOrDefault(lm => lm.GetType() == typeof(Komga))?.baseUrl}]:");
|
Komga? komga = (Komga?)settings.libraryManagers.FirstOrDefault(lm => lm.GetType() == typeof(Komga));
|
||||||
string? tmpUrlKomga = Console.ReadLine();
|
|
||||||
while (tmpUrlKomga is null)
|
Console.WriteLine($"Komga BaseURL [{komga?.baseUrl}]:");
|
||||||
tmpUrlKomga = Console.ReadLine();
|
string? tmpUrl = Console.ReadLine();
|
||||||
if (tmpUrlKomga.Length > 0)
|
while (tmpUrl is null)
|
||||||
|
tmpUrl = Console.ReadLine();
|
||||||
|
if (tmpUrl.Length > 0)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Username:");
|
Console.WriteLine("Username:");
|
||||||
string? tmpUser = Console.ReadLine();
|
string? tmpUser = Console.ReadLine();
|
||||||
@ -72,42 +74,7 @@ public static class Tranga_Cli
|
|||||||
} while (key != ConsoleKey.Enter);
|
} while (key != ConsoleKey.Enter);
|
||||||
|
|
||||||
settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga));
|
settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga));
|
||||||
settings.libraryManagers.Add(new Komga(tmpUrlKomga, tmpUser, tmpPass, logger));
|
settings.libraryManagers.Add(new Komga(tmpUrl, tmpUser, tmpPass, logger));
|
||||||
}
|
|
||||||
|
|
||||||
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? tmpUser = Console.ReadLine();
|
|
||||||
while (tmpUser is null || tmpUser.Length < 1)
|
|
||||||
tmpUser = Console.ReadLine();
|
|
||||||
|
|
||||||
Console.WriteLine("Password:");
|
|
||||||
string tmpPass = string.Empty;
|
|
||||||
ConsoleKey key;
|
|
||||||
do
|
|
||||||
{
|
|
||||||
var keyInfo = Console.ReadKey(intercept: true);
|
|
||||||
key = keyInfo.Key;
|
|
||||||
|
|
||||||
if (key == ConsoleKey.Backspace && tmpPass.Length > 0)
|
|
||||||
{
|
|
||||||
Console.Write("\b \b");
|
|
||||||
tmpPass = tmpPass[0..^1];
|
|
||||||
}
|
|
||||||
else if (!char.IsControl(keyInfo.KeyChar))
|
|
||||||
{
|
|
||||||
Console.Write("*");
|
|
||||||
tmpPass += keyInfo.KeyChar;
|
|
||||||
}
|
|
||||||
} while (key != ConsoleKey.Enter);
|
|
||||||
|
|
||||||
settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Kavita));
|
|
||||||
settings.libraryManagers.Add(new Kavita(tmpUrlKavita, tmpUser, tmpPass, logger));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.WriteLine("Tranga_CLI", "Loaded.");
|
logger.WriteLine("Tranga_CLI", "Loaded.");
|
||||||
|
@ -1,21 +1,11 @@
|
|||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Net.Http.Headers;
|
using System.Net.Http.Headers;
|
||||||
using Logging;
|
using Logging;
|
||||||
using Newtonsoft.Json;
|
|
||||||
using Newtonsoft.Json.Linq;
|
|
||||||
using Tranga.LibraryManagers;
|
|
||||||
|
|
||||||
namespace Tranga;
|
namespace Tranga;
|
||||||
|
|
||||||
public abstract class LibraryManager
|
public abstract class LibraryManager
|
||||||
{
|
{
|
||||||
public enum LibraryType : byte
|
|
||||||
{
|
|
||||||
Komga = 0,
|
|
||||||
Kavita = 1
|
|
||||||
}
|
|
||||||
|
|
||||||
public LibraryType libraryType;
|
|
||||||
public string baseUrl { get; }
|
public string baseUrl { get; }
|
||||||
protected string auth { get; } //Base64 encoded, if you use your password everywhere, you have problems
|
protected string auth { get; } //Base64 encoded, if you use your password everywhere, you have problems
|
||||||
protected Logger? logger;
|
protected Logger? logger;
|
||||||
@ -89,34 +79,4 @@ public abstract class LibraryManager
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class LibraryManagerJsonConverter : JsonConverter
|
|
||||||
{
|
|
||||||
public override bool CanConvert(Type objectType)
|
|
||||||
{
|
|
||||||
return (objectType == typeof(LibraryManager));
|
|
||||||
}
|
|
||||||
|
|
||||||
public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
|
|
||||||
{
|
|
||||||
JObject jo = JObject.Load(reader);
|
|
||||||
if (jo["libraryType"]!.Value<Int64>() == (Int64)LibraryType.Komga)
|
|
||||||
return jo.ToObject<Komga>(serializer)!;
|
|
||||||
|
|
||||||
if (jo["libraryType"]!.Value<Int64>() == (Int64)LibraryType.Kavita)
|
|
||||||
return jo.ToObject<Kavita>(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");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
@ -1,71 +1,15 @@
|
|||||||
using System.Text.Json;
|
using Logging;
|
||||||
using System.Text.Json.Nodes;
|
|
||||||
using Logging;
|
|
||||||
|
|
||||||
namespace Tranga.LibraryManagers;
|
namespace Tranga.LibraryManagers;
|
||||||
|
|
||||||
public class Kavita : LibraryManager
|
public class Kavita : LibraryManager
|
||||||
{
|
{
|
||||||
public Kavita(string baseUrl, string username, string password, Logger? logger)
|
|
||||||
: base(baseUrl, Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes($"{username}:{password}")), logger)
|
|
||||||
{
|
|
||||||
this.libraryType = LibraryType.Kavita;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Kavita(string baseUrl, string auth, Logger? logger) : base(baseUrl, auth, logger)
|
public Kavita(string baseUrl, string auth, Logger? logger) : base(baseUrl, auth, logger)
|
||||||
{
|
{
|
||||||
this.libraryType = LibraryType.Kavita;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void UpdateLibrary()
|
public override void UpdateLibrary()
|
||||||
{
|
{
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Updating Libraries");
|
throw new NotImplementedException();
|
||||||
foreach (KavitaLibrary lib in GetLibraries())
|
|
||||||
NetClient.MakePost($"{baseUrl}/api/Library/scan?libraryId={lib.id}", auth, logger);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Fetches all libraries available to the user
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>Array of KavitaLibrary</returns>
|
|
||||||
private IEnumerable<KavitaLibrary> GetLibraries()
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Getting Libraries");
|
|
||||||
Stream data = NetClient.MakeRequest($"{baseUrl}/api/Library", auth, logger);
|
|
||||||
if (data == Stream.Null)
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"No libraries returned");
|
|
||||||
return Array.Empty<KavitaLibrary>();
|
|
||||||
}
|
|
||||||
JsonArray? result = JsonSerializer.Deserialize<JsonArray>(data);
|
|
||||||
if (result is null)
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"No libraries returned");
|
|
||||||
return Array.Empty<KavitaLibrary>();
|
|
||||||
}
|
|
||||||
|
|
||||||
HashSet<KavitaLibrary> ret = new();
|
|
||||||
|
|
||||||
foreach (JsonNode? jsonNode in result)
|
|
||||||
{
|
|
||||||
var jObject = (JsonObject?)jsonNode;
|
|
||||||
string libraryId = jObject!["id"]!.GetValue<string>();
|
|
||||||
string libraryName = jObject!["name"]!.GetValue<string>();
|
|
||||||
ret.Add(new KavitaLibrary(libraryId, libraryName));
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
private struct KavitaLibrary
|
|
||||||
{
|
|
||||||
public string id { get; }
|
|
||||||
public string name { get; }
|
|
||||||
|
|
||||||
public KavitaLibrary(string id, string name)
|
|
||||||
{
|
|
||||||
this.id = id;
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -14,13 +14,11 @@ public class Komga : LibraryManager
|
|||||||
public Komga(string baseUrl, string username, string password, Logger? logger)
|
public Komga(string baseUrl, string username, string password, Logger? logger)
|
||||||
: base(baseUrl, Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes($"{username}:{password}")), logger)
|
: base(baseUrl, Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes($"{username}:{password}")), logger)
|
||||||
{
|
{
|
||||||
this.libraryType = LibraryType.Komga;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[JsonConstructor]
|
[JsonConstructor]
|
||||||
public Komga(string baseUrl, string auth, Logger? logger) : base(baseUrl, auth, logger)
|
public Komga(string baseUrl, string auth, Logger? logger) : base(baseUrl, auth, logger)
|
||||||
{
|
{
|
||||||
this.libraryType = LibraryType.Komga;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void UpdateLibrary()
|
public override void UpdateLibrary()
|
||||||
|
@ -29,7 +29,7 @@ public class TrangaSettings
|
|||||||
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>());
|
||||||
|
|
||||||
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)
|
if(logger is not null)
|
||||||
foreach(LibraryManager lm in settings.libraryManagers)
|
foreach(LibraryManager lm in settings.libraryManagers)
|
||||||
lm.AddLogger(logger);
|
lm.AddLogger(logger);
|
||||||
|
@ -106,6 +106,10 @@ public abstract class TrangaTask
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Don't call this
|
/// Don't call this
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <param name="writer"></param>
|
||||||
|
/// <param name="value"></param>
|
||||||
|
/// <param name="serializer"></param>
|
||||||
|
/// <exception cref="Exception"></exception>
|
||||||
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
|
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
|
||||||
{
|
{
|
||||||
throw new Exception("Dont call this");
|
throw new Exception("Dont call this");
|
||||||
|
Loading…
Reference in New Issue
Block a user