Web Converter improved

.github/workflows/githubpages.yml

@@ -8,6 +8,7 @@ on:
   push:
     branches:
       - 'master'
+      - 'webconverter'
 
 jobs:
   publish:
@@ -40,12 +41,9 @@ jobs:
         run: dotnet publish src/WebConverter/WebConverter.csproj -c Release -p:PublishProfile=src/WebConverter/Properties/PublishProfiles/PublishSite.pubxml --no-restore
       - name: Create .nojekyll file
         run: touch src/WebConverter/bin/Release/net7.0/publish/wwwroot/.nojekyll
-      - name: Update relative paths
-        working-directory: src/WebConverter/bin/Release/net7.0/publish/wwwroot
-        run: |
-            sed -i "s/return Response.redirect(\'\/\', 303);/return Response.redirect(\'\/${{github.event.repository.name}}\/\', 303);/g" service-worker.js
       - name: Update service-worker-assets.js hashes
         working-directory: src/WebConverter/bin/Release/net7.0/publish/wwwroot
+        if: false
         run: |
           jsFile=$(<service-worker-assets.js)
           # remove JavaScript from contents so it can be interpreted as JSON

README.md

@@ -8,7 +8,7 @@
 [![Website](https://img.shields.io/website?up_message=online&down_message=offline&url=https%3A%2F%2Fsungaila.github.io%2FPDFtoImage%2F&style=flat-square&label=website)](https://sungaila.github.io/PDFtoImage/)
 [![GitHub license](https://img.shields.io/github/license/sungaila/PDFtoImage?style=flat-square)](https://github.com/sungaila/PDFtoImage/blob/master/LICENSE)
 
-A .NET library to render [PDF files](https://en.wikipedia.org/wiki/PDF) into images. Give it a try on [GitHub Pages](https://sungaila.github.io/PDFtoImage/)!
+A .NET library to render [PDF files](https://en.wikipedia.org/wiki/PDF) into images.
 
 This .NET library is built on top of
 * [PDFium](https://pdfium.googlesource.com/pdfium/) (native PDF renderer)

src/WebConverter/Client/Program.cs

@@ -3,8 +3,6 @@
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.JSInterop;
 using System;
 using System.Linq;
 using System.Net.Http;
@@ -16,8 +14,6 @@
 {
 	public class Program
 	{
-		private static Logger<Program>? logger;
-
 		public static event EventHandler<HandledFileArgs>? FilesHandled;
 
 		public static async Task Main(string[] args)
@@ -31,10 +27,8 @@
 			builder.Services.AddWebShareService();
 
 			var host = builder.Build();
 			var navigationManager = host.Services.GetService<NavigationManager>()!;
 
-			logger = host.Services.GetService<Logger<Program>>()!;
-
 			if (host.Services.GetService<FileHandlingService>() is FileHandlingService service && await service.IsSupportedAsync())
 			{
 				await service.SetConsumerAsync(async (launchParams) =>
@@ -52,7 +46,7 @@
 			await host.RunAsync();
 		}
 
 		public class HandledFileArgs : EventArgs
 		{
 			public KristofferStrube.Blazor.FileAPI.File File { get; }
 
@@ -61,11 +55,5 @@
 				File = file;
 			}
 		}
-
-		[JSInvokable]
-		public static void ReceiveWebShareTarget(string title, string text, string url, IJSObjectReference objRef)
-		{
-			logger?.LogWarning($"Hey! {title}, {text}, {url}, {objRef}");
-		}
 	}
 }

src/WebConverter/Models/FileStringyfied.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Text.Json.Serialization;
+
+namespace PDFtoImage.WebConverter.Models
+{
+	public partial record FileStringyfied(
+		[property: JsonPropertyName("name")]
+		[property: JsonRequired]
+		string Name,
+
+		[property: JsonPropertyName("lastModified")]
+		[property: JsonRequired]
+		[property: JsonConverter(typeof(UnixDateTimeConverter))]
+		DateTimeOffset LastModified,
+
+		[property: JsonPropertyName("size")]
+		[property: JsonRequired]
+		int Size,
+
+		[property: JsonPropertyName("type")]
+		[property: JsonRequired]
+		string Type,
+
+		[property: JsonPropertyName("data")]
+		[property: JsonRequired]
+		string Data
+	)
+	{
+		public string GetData() => Data[(Data.IndexOf("base64,") + "base64,".Length)..];
+	};
+}

src/WebConverter/Models/FilesStringyfied.cs

@@ -0,0 +1,18 @@
+using System.Text.Json.Serialization;
+
+namespace PDFtoImage.WebConverter.Models
+{
+	public record FilesStringyfied(
+		[property: JsonPropertyName("title")]
+		string? Title,
+
+		[property: JsonPropertyName("text")]
+		string? Text,
+
+		[property: JsonPropertyName("url")]
+		string? Url,
+
+		[property: JsonPropertyName("files")]
+		FileStringyfied[]? Files
+	);
+}

src/WebConverter/Models/UnixDateTimeConverter.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace PDFtoImage.WebConverter.Models
+{
+	public class UnixDateTimeConverter : JsonConverter<DateTimeOffset>
+	{
+		public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+		{
+			return DateTimeOffset.FromUnixTimeMilliseconds(reader.GetInt64());
+		}
+
+		public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)
+		{
+			writer.WriteNumberValue(value.ToUnixTimeMilliseconds());
+		}
+	}
+}