* syntax changes for arrays

* switching to tagging for nuget releases
* adding latest chapters to read-list-exports
* fixing defect with rate limit service

Author: holycardboard

.github/workflows/main.yml

@@ -6,7 +6,8 @@ name: CI
 # events but only for the main branch
 on:
   push:
-    branches: [ release/* ]
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -25,11 +26,17 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '8.x'
+
+      - name: Get version
+        id: version
+        run: |
+          echo "version-without-v=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
      
       - name: Publish Extensions Nuget Package
         id: publish_nuget_extensions
         uses: alirezanet/publish-nuget@v3.0.4
         with:
           PROJECT_FILE_PATH: src/MangaDexSharp/MangaDexSharp.csproj
-          TAG_COMMIT: true
-          NUGET_KEY: ${{secrets.NUGET_API_KEY}}
+          TAG_COMMIT: false
+          NUGET_KEY: ${{secrets.NUGET_API_KEY}}
+          VERSION_STATIC: ${{ steps.version.outputs.version-without-v }}

src/MangaDexSharp.UpdatesPoll/Program.cs

@@ -22,4 +22,4 @@ await srv.Poll(chapters =>
 		chapters.Length,
 		string.Join("\r\n\t", chapters.Select(t => $"{t.Chapter.Attributes?.Chapter} - Vol {t.Chapter.Attributes?.Volume} - {t.Chapter.Attributes?.Title}: Pages: {t.PageUrls.Length}")));
 	return Task.CompletedTask;
-}, langs: new[] { "en" });
+}, langs: ["en"]);

src/MangaDexSharp.Utilities.Cli/MangaDexSharp.Utilities.Cli.csproj

@@ -19,4 +19,10 @@
 		<ProjectReference Include="..\MangaDexSharp\MangaDexSharp.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <None Update="appsettings.json">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	</ItemGroup>
+
 </Project>

src/MangaDexSharp.Utilities.Cli/Services/ExportReadListService.cs

@@ -1,27 +1,28 @@
 namespace MangaDexSharp.Utilities.Cli.Services;
 
+using System.Text;
 using Writers;
-using MangaStatus = (Manga manga, ReadStatus status);
+using MangaStatus = (Manga manga, ReadStatus status, Chapter? chapter);
 
 public interface IExportReadListService
 {
-    Task WriteUsersMangaStatusToFile(string file, ReadStatus? status, CancellationToken token);
+    Task WriteUsersMangaStatusToFile(string file, ReadStatus? status, bool includeChapters, string lang, CancellationToken token);
 }
 
 internal class ExportReadListService(
     IRateLimitService _api,
     ILogger<ExportReadListService> _logger) : IExportReadListService
 {
-    public static Dictionary<string, Func<string, IRecordWriter<MangaStatus>>> GetWriters()
+    public static Dictionary<string, Func<string, IRecordWriter<MangaStatus>>> GetWriters(string lang)
     {
         return new()
         {
-            ["csv"] = p => new CsvRecordWriter<MangaStatus, CsvManga>(p, CsvManga.FromManga),
-            ["json"] = p => new JsonRecordWriter<MangaStatus, CsvManga>(p, CsvManga.FromManga),
+            ["csv"] = p => new CsvRecordWriter<MangaStatus, CsvManga>(p, t => CsvManga.FromManga(t, lang)),
+            ["json"] = p => new JsonRecordWriter<MangaStatus, CsvManga>(p, t => CsvManga.FromManga(t, lang)),
         };
     }
 
-    public async IAsyncEnumerable<MangaStatus> GetUsersMangaStatus(ReadStatus? status,
+    public async IAsyncEnumerable<MangaStatus> GetUsersMangaStatus(ReadStatus? status, bool includeChapters, string lang,
         [EnumeratorCancellation] CancellationToken token)
     {
         //Get all of the user's read statuses
@@ -52,22 +53,43 @@ public async IAsyncEnumerable<MangaStatus> GetUsersMangaStatus(ReadStatus? statu
             {
                 if (token.IsCancellationRequested) yield break;
                 var ms = readStatus.Statuses.TryGetValue(m.Id, out var s) ? s : ReadStatus.reading;
-                yield return (m, ms);
+                yield return await PopChapter(m, ms, includeChapters, lang, token);
             }
         }
     }
 
-    public async Task WriteUsersMangaStatusToFile(string file, ReadStatus? status, CancellationToken token)
+    public async Task<MangaStatus> PopChapter(Manga manga, ReadStatus status, bool chaps, string lang, CancellationToken token)
+    {
+        if (!chaps) return (manga, status, null);
+
+        var filter = new ChaptersFilter
+        {
+            Manga = manga.Id,
+            Limit = 1,
+            TranslatedLanguage = string.IsNullOrEmpty(lang) ? [] : [lang],
+            Order = new()
+            {
+                [ChaptersFilter.OrderKey.chapter] = OrderValue.desc
+            },
+            
+        };
+        var chapters = await _api.Request(t => t.Chapter.List(filter), token);
+        chapters.ThrowIfError();
+        var chapter = chapters.Data.FirstOrDefault();
+        return (manga, status, chapter);
+    }
+
+    public async Task WriteUsersMangaStatusToFile(string file, ReadStatus? status, bool includeChapters, string lang, CancellationToken token)
     {
         var ext = Path.GetExtension(file).Trim('.').ToLower();
-        if (!GetWriters().TryGetValue(ext, out var fetch))
+        if (!GetWriters(lang).TryGetValue(ext, out var fetch))
         {
             _logger.LogError("No writer found for {Ext}", ext);
             return;
         }
 
         using var writer = fetch(file);
-        var manga = GetUsersMangaStatus(status, token);
+        var manga = GetUsersMangaStatus(status, includeChapters, lang, token);
         await writer.Write(manga);
         _logger.LogInformation("Wrote read list to {File}", file);
     }
@@ -77,21 +99,51 @@ internal record class CsvManga(
         string Title,
         string CoverUrl,
         string TitleUrl,
-        string Status)
+        string Status,
+        [property: JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)] string? LatestChapterId,
+        [property: JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)] string? LatestChapterTitle,
+        [property: JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)] string? LatestChapterUrl)
     {
-        public static CsvManga FromManga(MangaStatus m)
+        public static CsvManga FromManga(MangaStatus m, string lang)
         {
+            string? DetermineChapterTitle()
+            {
+                if (m.chapter is null) return null;
+
+                var bob = new StringBuilder();
+                if (!string.IsNullOrEmpty(m.chapter.Attributes?.Volume))
+                    bob.Append($"Vol.{m.chapter.Attributes.Volume} ");
+                if (!string.IsNullOrEmpty(m.chapter.Attributes?.Chapter))
+                    bob.Append($"Ch.{m.chapter.Attributes.Chapter} ");
+                if (!string.IsNullOrEmpty(m.chapter.Attributes?.Title))
+                    bob.Append(m.chapter.Attributes.Title);
+                return bob.ToString().Trim();
+            }
+
+            string? DetermineChapterUrl()
+            {
+                if (m.chapter is null) return null;
+
+                if (!string.IsNullOrEmpty(m.chapter.Attributes?.ExternalUrl))
+                    return m.chapter.Attributes.ExternalUrl;
+
+                return $"https://mangadex.org/chapter/{m.chapter.Id}";
+            }
+
             var cover = m.manga.CoverArt().FirstOrDefault()?.Attributes;
             var coverUrl = cover is null
                 ? string.Empty
                 : $"https://uploads.mangadex.org/covers/{m.manga.Id}/{cover.FileName}";
 
             return new CsvManga(
                 m.manga.Id,
-                m.manga.Attributes?.Title?.PreferedOrFirst(t => t.Key == "en").Value ?? string.Empty,
+                m.manga.Attributes?.Title?.PreferedOrFirst(t => t.Key == lang).Value ?? string.Empty,
                 coverUrl,
                 $"https://mangadex.org/title/{m.manga.Id}",
-                m.status.ToString());
+                m.status.ToString(),
+                m.chapter?.Id,
+                DetermineChapterTitle(),
+                DetermineChapterUrl());
         }
     }
 }

src/MangaDexSharp.Utilities.Cli/Services/RateLimitService.cs

@@ -108,11 +108,12 @@ public async Task<T> Request<T>(Func<IMangaDex, Task<T>> request, int current, C
         await EnsureNotLimited(token);
         var result = await request(_md);
 
+        if (result.RateLimit.HasRateLimits)
+            _last = result.RateLimit;
+
         if (!result.ErrorOccurred) return result;
 
         var isTooMany = result.Errors.Any(e => e.Status == 429);
-        if (result.RateLimit.HasRateLimits)
-            _last = result.RateLimit;
 
         if (isTooMany)
             return await Request(request, current + 1, token);

src/MangaDexSharp.Utilities.Cli/Verbs/ExportReadListVerb.cs

@@ -6,9 +6,20 @@ namespace MangaDexSharp.Utilities.Cli.Verbs;
 public class ExportReadListOptions : AuthOptions
 {
     private const string FILE_PATH = "read-list.json";
+    private const bool INCLUDE_LATEST_CHAPTER = false;
+    private const string PREFERRED_LANGUAGE = "en";
 
     [Option('f', "file-path", HelpText = "The file path to export to (supports csv or json)", Default = FILE_PATH)]
     public string FilePath { get; set; } = FILE_PATH;
+
+    [Option('i', "include-latest-chapter", HelpText = "Whether or not to include the latest chapter's name and URL in the output (This will be VERY slow if you have a large read history).", Default = INCLUDE_LATEST_CHAPTER)]
+    public bool IncludeLatestChapter { get; set; } = INCLUDE_LATEST_CHAPTER;
+
+    [Option('r', "read-status", HelpText = "The read status to filter by (reading, on_hold, plan_to_read, dropped, re_reading, completed). Leaving empty will fetch all statuses", Default = null)]
+    public string? ReadStatus { get; set; }
+
+    [Option('l', "preferred-language", HelpText = "The preferred language to use for the latest chapters and titles", Default = PREFERRED_LANGUAGE)]
+    public string PreferredLanguage { get; set; } = PREFERRED_LANGUAGE;
 }
 
 internal class ExportReadListVerb(
@@ -18,9 +29,19 @@ internal class ExportReadListVerb(
 {
     public override async Task<bool> Execute(ExportReadListOptions options, CancellationToken token)
     {
+        ReadStatus? status = null;
+        if (!string.IsNullOrEmpty(options.ReadStatus) &&
+            Enum.TryParse<ReadStatus>(options.ReadStatus, true, out var result))
+            status = result;
+
         _cache.Auth = options;
         _logger.LogInformation("Writing read list to {FilePath}", options.FilePath);
-        await _export.WriteUsersMangaStatusToFile(options.FilePath, null, token);
+        await _export.WriteUsersMangaStatusToFile(
+            options.FilePath, 
+            status, 
+            options.IncludeLatestChapter, 
+            options.PreferredLanguage, 
+            token);
         _logger.LogInformation("Finished writing read list to {FilePath}", options.FilePath);
         return true;
     }

src/MangaDexSharp.sln

@@ -22,6 +22,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MangaDexSharp.Utilities.Cli", "MangaDexSharp.Utilities.Cli\MangaDexSharp.Utilities.Cli.csproj", "{6048923B-711D-4375-A6D3-34449A0FD8CD}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{C2A9AE7D-B515-4C8C-80C3-C3786784D698}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{291B57E7-1976-458E-9FF0-6AF336418815}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -52,6 +56,12 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{E2BA6C78-048B-4649-A7B2-D28C2DC69708} = {291B57E7-1976-458E-9FF0-6AF336418815}
+		{42298204-E183-426F-98CC-1FCB49AA1B6D} = {291B57E7-1976-458E-9FF0-6AF336418815}
+		{70686F17-80CE-41E5-BEAB-6A32C61D195D} = {C2A9AE7D-B515-4C8C-80C3-C3786784D698}
+		{6048923B-711D-4375-A6D3-34449A0FD8CD} = {C2A9AE7D-B515-4C8C-80C3-C3786784D698}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {073A21EC-20C2-4268-910E-27C3E4B107CC}
 	EndGlobalSection

src/MangaDexSharp/Helpers/FilterBuilder.cs

@@ -8,7 +8,7 @@ public class FilterBuilder
 	/// <summary>
 	/// All of that parameters in this builder
 	/// </summary>
-	public List<(string key, string value)> Parameters { get; } = new();
+	public List<(string key, string value)> Parameters { get; } = [];
 
 	/// <summary>
 	/// Adds an optional string value to the parameters

src/MangaDexSharp/Helpers/MangaDexAggregateChapterParser.cs

@@ -19,10 +19,10 @@ public class MangaDexAggregateChapterParser : JsonConverter<Dictionary<string, M
     public override Dictionary<string, MangaAggregate.ChapterData>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         if (reader.TokenType == JsonTokenType.StartObject)
-            return JsonSerializer.Deserialize<Dictionary<string, MangaAggregate.ChapterData>>(ref reader, options) ?? new();
+            return JsonSerializer.Deserialize<Dictionary<string, MangaAggregate.ChapterData>>(ref reader, options) ?? [];
 
         if (reader.TokenType != JsonTokenType.StartArray)
-            return new();
+            return [];
 
         var chapters = JsonSerializer.Deserialize<MangaAggregate.ChapterData[]>(ref reader, options);
         return chapters.ToDictionary(t => t.Chapter);

src/MangaDexSharp/Helpers/MangaDexDictionaryParser.cs

@@ -22,10 +22,10 @@ public class MangaDexDictionaryParser<TKey, TValue> : JsonConverter<Dictionary<T
         if (reader.TokenType == JsonTokenType.StartArray)
         {
             _ = JsonSerializer.Deserialize<string[]>(ref reader, options);
-            return new();
+            return [];
         }
 
-        return JsonSerializer.Deserialize<Dictionary<TKey, TValue>>(ref reader, options) ?? new();
+        return JsonSerializer.Deserialize<Dictionary<TKey, TValue>>(ref reader, options) ?? [];
     }
 
     /// <summary>
@@ -60,10 +60,10 @@ public class MangaDexDictionaryParser : JsonConverter<Localization>
 		if (reader.TokenType == JsonTokenType.StartArray)
 		{
 			_ = JsonSerializer.Deserialize<string[]>(ref reader, options);
-			return new Localization();
+			return [];
 		}
 
-		var dic = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options) ?? new();
+		var dic = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options) ?? [];
 
 		var lcl = new Localization();
 		foreach (var item in dic)