glax/Tranga
1
0
Fork 0
mirror of https://github.com/C9Glax/tranga.git synced 2025-02-22 23:30:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[postgres-Server-V2] Add parameter array to token gen

Browse Source
This commit is contained in:
Alessandro Benetton 2025-01-31 21:24:35 +01:00
parent a713a006dd
commit d6018b60ae
No known key found for this signature in database
GPG Key ID: ED63A304CE2C0303
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
API/Schema/Chapter.cs
View File

@ -18,7 +18,7 @@ public class Chapter : IComparable<Chapter>
public Chapter(string parentMangaId, string url, string chapterNumber, public Chapter(string parentMangaId, string url, string chapterNumber,
int? volumeNumber = null, string? title = null) int? volumeNumber = null, string? title = null)
{ {
ChapterId = TokenGen.CreateToken(typeof(Chapter), string.Join(parentMangaId, volumeNumber ?? 0, chapterNumber)); ChapterId = TokenGen.CreateToken(typeof(Chapter), parentMangaId, (volumeNumber ?? 0).ToString(), chapterNumber);
ParentMangaId = parentMangaId; ParentMangaId = parentMangaId;
Url = url; Url = url;
ChapterNumber = chapterNumber; ChapterNumber = chapterNumber;

2
API/Schema/Jobs/DownloadMangaCoverJob.cs
View File

@ -12,7 +12,7 @@ using static System.IO.UnixFileMode;
namespace API.Schema.Jobs; namespace API.Schema.Jobs;
public class DownloadMangaCoverJob(string chapterId, string? parentJobId = null, ICollection<string>? dependsOnJobsIds = null) public class DownloadMangaCoverJob(string chapterId, string? parentJobId = null, ICollection<string>? dependsOnJobsIds = null)
: Job(TokenGen.CreateToken(typeof(DownloadMangaCoverJob), ""), JobType.DownloadMangaCoverJob, 0, parentJobId, dependsOnJobsIds) : Job(TokenGen.CreateToken(typeof(DownloadMangaCoverJob)), JobType.DownloadMangaCoverJob, 0, parentJobId, dependsOnJobsIds)
{ {
[MaxLength(64)] [MaxLength(64)]
public string ChapterId { get; init; } = chapterId; public string ChapterId { get; init; } = chapterId;

2
API/Schema/Jobs/DownloadNewChaptersJob.cs
View File

@ -4,7 +4,7 @@ using API.Schema.MangaConnectors;
namespace API.Schema.Jobs; namespace API.Schema.Jobs;
public class DownloadNewChaptersJob(ulong recurrenceMs, string mangaId, string? parentJobId = null, ICollection<string>? dependsOnJobsIds = null) public class DownloadNewChaptersJob(ulong recurrenceMs, string mangaId, string? parentJobId = null, ICollection<string>? dependsOnJobsIds = null)
: Job(TokenGen.CreateToken(typeof(DownloadNewChaptersJob), ""), JobType.DownloadNewChaptersJob, recurrenceMs, parentJobId, dependsOnJobsIds) : Job(TokenGen.CreateToken(typeof(DownloadNewChaptersJob)), JobType.DownloadNewChaptersJob, recurrenceMs, parentJobId, dependsOnJobsIds)
{ {
[MaxLength(64)] [MaxLength(64)]
public string MangaId { get; init; } = mangaId; public string MangaId { get; init; } = mangaId;

2
API/Schema/Jobs/DownloadSingleChapterJob.cs
View File

@ -12,7 +12,7 @@ using static System.IO.UnixFileMode;
namespace API.Schema.Jobs; namespace API.Schema.Jobs;
public class DownloadSingleChapterJob(string chapterId, string? parentJobId = null, ICollection<string>? dependsOnJobsIds = null) public class DownloadSingleChapterJob(string chapterId, string? parentJobId = null, ICollection<string>? dependsOnJobsIds = null)
: Job(TokenGen.CreateToken(typeof(DownloadSingleChapterJob), ""), JobType.DownloadSingleChapterJob, 0, parentJobId, dependsOnJobsIds) : Job(TokenGen.CreateToken(typeof(DownloadSingleChapterJob)), JobType.DownloadSingleChapterJob, 0, parentJobId, dependsOnJobsIds)
{ {
[MaxLength(64)] [MaxLength(64)]
public string ChapterId { get; init; } = chapterId; public string ChapterId { get; init; } = chapterId;

2
API/Schema/Jobs/MoveFileOrFolderJob.cs
View File

@ -1,7 +1,7 @@
namespace API.Schema.Jobs; namespace API.Schema.Jobs;
public class MoveFileOrFolderJob(string fromLocation, string toLocation, string? parentJobId = null, ICollection<string>? dependsOnJobsIds = null) public class MoveFileOrFolderJob(string fromLocation, string toLocation, string? parentJobId = null, ICollection<string>? dependsOnJobsIds = null)
: Job(TokenGen.CreateToken(typeof(MoveFileOrFolderJob), ""), JobType.MoveFileOrFolderJob, 0, parentJobId, dependsOnJobsIds) : Job(TokenGen.CreateToken(typeof(MoveFileOrFolderJob)), JobType.MoveFileOrFolderJob, 0, parentJobId, dependsOnJobsIds)
{ {
public string FromLocation { get; init; } = fromLocation; public string FromLocation { get; init; } = fromLocation;
public string ToLocation { get; init; } = toLocation; public string ToLocation { get; init; } = toLocation;

2
API/Schema/Jobs/UpdateMetadataJob.cs
View File

@ -4,7 +4,7 @@ using API.Schema.MangaConnectors;
namespace API.Schema.Jobs; namespace API.Schema.Jobs;
public class UpdateMetadataJob(ulong recurrenceMs, string mangaId, string? parentJobId = null, ICollection<string>? dependsOnJobsIds = null) public class UpdateMetadataJob(ulong recurrenceMs, string mangaId, string? parentJobId = null, ICollection<string>? dependsOnJobsIds = null)
: Job(TokenGen.CreateToken(typeof(UpdateMetadataJob), ""), JobType.UpdateMetaDataJob, recurrenceMs, parentJobId, dependsOnJobsIds) : Job(TokenGen.CreateToken(typeof(UpdateMetadataJob)), JobType.UpdateMetaDataJob, recurrenceMs, parentJobId, dependsOnJobsIds)
{ {
[MaxLength(64)] [MaxLength(64)]
public string MangaId { get; init; } = mangaId; public string MangaId { get; init; } = mangaId;

2
API/Schema/Link.cs
View File

@ -7,7 +7,7 @@ namespace API.Schema;
public class Link(string linkProvider, string linkUrl) public class Link(string linkProvider, string linkUrl)
{ {
[MaxLength(64)] [MaxLength(64)]
public string LinkId { get; init; } = TokenGen.CreateToken(typeof(Link), string.Join(linkProvider, linkUrl)); public string LinkId { get; init; } = TokenGen.CreateToken(typeof(Link), linkProvider, linkUrl);
public string LinkProvider { get; init; } = linkProvider; public string LinkProvider { get; init; } = linkProvider;
public string LinkUrl { get; init; } = linkUrl; public string LinkUrl { get; init; } = linkUrl;

4
API/Schema/Manga.cs
View File

@ -1,4 +1,4 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
@ -57,7 +57,7 @@ public class Manga
string? coverFileNameInCache, uint year, string? originalLanguage, MangaReleaseStatus releaseStatus, string? coverFileNameInCache, uint year, string? originalLanguage, MangaReleaseStatus releaseStatus,
float ignoreChapterBefore, string mangaConnectorId) float ignoreChapterBefore, string mangaConnectorId)
{ {
MangaId = TokenGen.CreateToken(typeof(Manga), string.Join(MangaConnectorId, ConnectorId)); MangaId = TokenGen.CreateToken(typeof(Manga), MangaConnectorId, ConnectorId);
ConnectorId = connectorId; ConnectorId = connectorId;
Name = name; Name = name;
Description = description; Description = description;

2
API/Schema/MangaAltTitle.cs
View File

@ -8,7 +8,7 @@ namespace API.Schema;
public class MangaAltTitle(string language, string title) public class MangaAltTitle(string language, string title)
{ {
[MaxLength(64)] [MaxLength(64)]
public string AltTitleId { get; init; } = TokenGen.CreateToken("AltTitle", string.Join(language, title)); public string AltTitleId { get; init; } = TokenGen.CreateToken("AltTitle", language, title);
[MaxLength(8)] [MaxLength(8)]
public string Language { get; init; } = language; public string Language { get; init; } = language;
public string Title { get; set; } = title; public string Title { get; set; } = title;

2
API/Schema/Notification.cs
View File

@ -7,7 +7,7 @@ namespace API.Schema;
public class Notification(string title, string message = "", NotificationUrgency urgency = NotificationUrgency.Normal, DateTime? date = null) public class Notification(string title, string message = "", NotificationUrgency urgency = NotificationUrgency.Normal, DateTime? date = null)
{ {
[MaxLength(64)] [MaxLength(64)]
public string NotificationId { get; init; } = TokenGen.CreateToken("Notification", ""); public string NotificationId { get; init; } = TokenGen.CreateToken("Notification");
public NotificationUrgency Urgency { get; init; } = urgency; public NotificationUrgency Urgency { get; init; } = urgency;

8
API/TokenGen.cs
View File

@ -9,9 +9,9 @@ public static class TokenGen
private const int MaximumLength = 64; private const int MaximumLength = 64;
private const string Chars = "abcdefghijklmnopqrstuvwxyz0123456789"; private const string Chars = "abcdefghijklmnopqrstuvwxyz0123456789";
public static string CreateToken(Type t, string identifier) => CreateToken(t.Name, identifier); public static string CreateToken(Type t, params string[] identifiers) => CreateToken(t.Name, identifiers);
public static string CreateToken(string prefix, string identifier) public static string CreateToken(string prefix, params string[] identifiers)
{ {
@ -20,7 +20,7 @@ public static class TokenGen
int tokenLength = MaximumLength - prefix.Length - 1; int tokenLength = MaximumLength - prefix.Length - 1;
if (string.IsNullOrWhiteSpace(identifier)) if (identifiers.Length == 0)
{ {
// No identifier, just create a random token // No identifier, just create a random token
byte[] rng = new byte[tokenLength]; byte[] rng = new byte[tokenLength];
@ -31,7 +31,7 @@ public static class TokenGen
} }
// Identifier provided, create a token based on the identifier hashed // Identifier provided, create a token based on the identifier hashed
byte[] hash = MD5.HashData(Encoding.UTF8.GetBytes(identifier)); byte[] hash = MD5.HashData(Encoding.UTF8.GetBytes(string.Join("", identifiers)));
string token = Convert.ToHexStringLower(hash); string token = Convert.ToHexStringLower(hash);
return string.Join('-', prefix, token); return string.Join('-', prefix, token);