Compare commits

..

No commits in common. "16238c590b7f66c9608f23f507722c5c5af9bb08" and "77eec0f69690891a03b9045c27663207e215bca4" have entirely different histories.

4 changed files with 12 additions and 13 deletions

View File

@ -50,7 +50,7 @@ jobs:
- name: Build and push Website - name: Build and push Website
uses: docker/build-push-action@v4.1.1 uses: docker/build-push-action@v4.1.1
with: with:
context: ./Website context: ./
file: ./Website/Dockerfile file: ./Website/Dockerfile
#platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6 #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
platforms: linux/amd64 platforms: linux/amd64

View File

@ -1,5 +1,4 @@
using System.Globalization; using System.Net;
using System.Net;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Tranga; using Tranga;
using Tranga.TrangaTasks; using Tranga.TrangaTasks;
@ -21,7 +20,7 @@ public class RequestHandler
new[] { "connectorName", "internalId", "onlyNew?", "onlyExisting?", "language?" }), new[] { "connectorName", "internalId", "onlyNew?", "onlyExisting?", "language?" }),
new(HttpMethod.Get, "/Tasks/Types", Array.Empty<string>()), new(HttpMethod.Get, "/Tasks/Types", Array.Empty<string>()),
new(HttpMethod.Post, "/Tasks/CreateMonitorTask", new(HttpMethod.Post, "/Tasks/CreateMonitorTask",
new[] { "connectorName", "internalId", "reoccurrenceTime", "language?", "ignoreChaptersBelow?" }), new[] { "connectorName", "internalId", "reoccurrenceTime", "language?" }),
//DEPRECATED new(HttpMethod.Post, "/Tasks/CreateUpdateLibraryTask", new[] { "reoccurrenceTime" }), //DEPRECATED new(HttpMethod.Post, "/Tasks/CreateUpdateLibraryTask", new[] { "reoccurrenceTime" }),
new(HttpMethod.Post, "/Tasks/CreateDownloadChaptersTask", new(HttpMethod.Post, "/Tasks/CreateDownloadChaptersTask",
new[] { "connectorName", "internalId", "chapters", "language?" }), new[] { "connectorName", "internalId", "chapters", "language?" }),
@ -152,7 +151,6 @@ public class RequestHandler
variables.TryGetValue("internalId", out string? internalId1); variables.TryGetValue("internalId", out string? internalId1);
variables.TryGetValue("reoccurrenceTime", out string? reoccurrenceTime1); variables.TryGetValue("reoccurrenceTime", out string? reoccurrenceTime1);
variables.TryGetValue("language", out string? language1); variables.TryGetValue("language", out string? language1);
variables.TryGetValue("ignoreChaptersBelow", out string? minChapter);
if (connectorName1 is null || internalId1 is null || reoccurrenceTime1 is null) if (connectorName1 is null || internalId1 is null || reoccurrenceTime1 is null)
return; return;
Connector? connector1 = Connector? connector1 =
@ -162,10 +160,7 @@ public class RequestHandler
Publication? publication1 = _taskManager.GetAllPublications().FirstOrDefault(pub => pub.internalId == internalId1); Publication? publication1 = _taskManager.GetAllPublications().FirstOrDefault(pub => pub.internalId == internalId1);
if (!publication1.HasValue) if (!publication1.HasValue)
return; return;
Publication pPublication1 = (Publication)publication1; _taskManager.AddTask(new MonitorPublicationTask(connectorName1, (Publication)publication1, TimeSpan.Parse(reoccurrenceTime1), language1 ?? "en"));
if (minChapter is not null)
pPublication1.ignoreChaptersBelow = float.Parse(minChapter,new NumberFormatInfo() { NumberDecimalSeparator = "." });
_taskManager.AddTask(new MonitorPublicationTask(connectorName1, pPublication1, TimeSpan.Parse(reoccurrenceTime1), language1 ?? "en"));
break; break;
case "/Tasks/CreateUpdateLibraryTask": // DEPRECATED case "/Tasks/CreateUpdateLibraryTask": // DEPRECATED
/*variables.TryGetValue("reoccurrenceTime", out string? reoccurrenceTime2); /*variables.TryGetValue("reoccurrenceTime", out string? reoccurrenceTime2);

View File

@ -9,7 +9,7 @@ namespace Tranga;
/// <summary> /// <summary>
/// Contains information on a Publication (Manga) /// Contains information on a Publication (Manga)
/// </summary> /// </summary>
public struct Publication public readonly struct Publication
{ {
public string sortName { get; } public string sortName { get; }
public List<string> authors { get; } public List<string> authors { get; }
@ -26,11 +26,11 @@ public struct Publication
public string folderName { get; } public string folderName { get; }
public string publicationId { get; } public string publicationId { get; }
public string internalId { get; } public string internalId { get; }
public float ignoreChaptersBelow { get; set; } public uint ignoreChaptersBelow { get; }
private static readonly Regex LegalCharacters = new Regex(@"[A-Z]*[a-z]*[0-9]* *\.*-*,*'*\'*\)*\(*~*!*"); private static readonly Regex LegalCharacters = new Regex(@"[A-Z]*[a-z]*[0-9]* *\.*-*,*'*\'*\)*\(*~*!*");
public Publication(string sortName, List<string> authors, string? description, Dictionary<string,string> altTitles, string[] tags, string? posterUrl, string? coverFileNameInCache, Dictionary<string,string>? links, int? year, string? originalLanguage, string status, string publicationId, string? folderName = null, float ignoreChaptersBelow = 0) public Publication(string sortName, List<string> authors, string? description, Dictionary<string,string> altTitles, string[] tags, string? posterUrl, string? coverFileNameInCache, Dictionary<string,string>? links, int? year, string? originalLanguage, string status, string publicationId, string? folderName = null, uint ignoreChaptersBelow = 0)
{ {
this.sortName = sortName; this.sortName = sortName;
this.authors = authors; this.authors = authors;

View File

@ -14,7 +14,11 @@ public class UpdateLibrariesTask : TrangaTask
protected override HttpStatusCode ExecuteTask(TaskManager taskManager, Logger? logger, CancellationToken? cancellationToken = null) protected override HttpStatusCode ExecuteTask(TaskManager taskManager, Logger? logger, CancellationToken? cancellationToken = null)
{ {
return HttpStatusCode.BadRequest; if (cancellationToken?.IsCancellationRequested ?? false)
return HttpStatusCode.RequestTimeout;
foreach(LibraryManager lm in taskManager.settings.libraryManagers)
lm.UpdateLibrary();
return HttpStatusCode.OK;
} }
public override TrangaTask Clone() public override TrangaTask Clone()