#41 S3へのアップロードを実装

KoeBook.Core/Contracts/Services/IS3UploadService.cs

@@ -0,0 +1,6 @@
+namespace KoeBook.Core.Contracts.Services;
+
+public interface IS3UploadService
+{
+    ValueTask<string> UploadFileAsync(string filePath, CancellationToken cancellationToken);
+}

KoeBook.Core/EbookException.cs

@@ -74,4 +74,7 @@ public enum ExceptionType
 
     [EnumMember(Value = "表紙の画像の生成に失敗しました")]
     CreateCoverFileFailed,
+
+    [EnumMember(Value = "ファイルのアップロードに失敗しました")]
+    S3UploadFailed,
 }

KoeBook.Core/KoeBook.Core.csproj

@@ -9,6 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.300" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.307.25" />
     <PackageReference Include="Betalgo.OpenAI" Version="8.1.1" />
     <PackageReference Include="Claudia" Version="1.2.0" />
     <PackageReference Include="FastEnum" Version="1.8.0" />

KoeBook.Core/Services/S3UploadService.cs

@@ -0,0 +1,29 @@
+using Amazon.S3;
+using Amazon.S3.Transfer;
+using KoeBook.Core.Contracts.Services;
+
+namespace KoeBook.Core.Services;
+
+public class S3UploadService(IAmazonS3 s3Client) : IS3UploadService
+{
+    private readonly IAmazonS3 _s3Client = s3Client;
+
+    public async ValueTask<string> UploadFileAsync(string filePath, CancellationToken cancellationToken)
+    {
+        try
+        {
+            // 設定に移すのが面倒なので固定値
+            const string S3BucketName = "koebook-gakusai-storage";
+            var guid = Guid.NewGuid();
+            var fileName = Path.GetFileName(filePath);
+            var fileTransferUtility = new TransferUtility(_s3Client);
+            await fileTransferUtility.UploadAsync(filePath, S3BucketName, $"{guid}/{fileName}", cancellationToken);
+
+            return $"http://storage.koebook.oucc.org/{guid}/{Uri.EscapeDataString(fileName)}";
+        }
+        catch (AmazonS3Exception e)
+        {
+            throw new EbookException(ExceptionType.S3UploadFailed, innerException: e);
+        }
+    }
+}

KoeBook/App.xaml.cs

@@ -1,4 +1,5 @@
-using FastEnumUtility;
+using Amazon.S3;
+using FastEnumUtility;
 using KoeBook.Activation;
 using KoeBook.Components.Dialog;
 using KoeBook.Contracts.Services;
@@ -15,6 +16,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.UI.Xaml;
+using QRCoder;
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.UI.WindowsAndMessaging;
@@ -80,6 +82,8 @@ public App()
                 services.AddSingleton<IDisplayStateChangeService, DisplayStateChangeService>();
                 services.AddSingleton<ICreateCoverFileService, CreateCoverFileService>();
 
+                services.AddSingleton<QRCodeGenerator>();
+
                 // Views and ViewModels
                 services.AddTransient<SettingsViewModel>();
                 services.AddTransient<SettingsPage>();
@@ -96,6 +100,10 @@ public App()
                 // Configuration
                 services.Configure<LocalSettingsOptions>(context.Configuration.GetSection(nameof(LocalSettingsOptions)));
 
+                // AWS
+                services.AddDefaultAWSOptions(context.Configuration.GetAWSOptions());
+                services.AddAWSService<IAmazonS3>();
+
                 // Core Services Mock
                 var mockOptions = context.Configuration.GetSection(nameof(MockOptions)).Get<MockOptions>()!;
                 if (mockOptions.IAnalyzerService.HasValue && mockOptions.IAnalyzerService.Value)
@@ -111,7 +119,7 @@ public App()
             })
             .Build();
 
-        App.GetService<IAppNotificationService>().Initialize();
+        GetService<IAppNotificationService>().Initialize();
 
         UnhandledException += App_UnhandledException;
     }

KoeBook/Components/Dialog/DialogService.cs

@@ -16,7 +16,7 @@ public Task<ContentDialogResult> ShowAsync(
         string title,
         object content,
         string primaryText,
-        string closeText,
+        string? closeText,
         ContentDialogButton defaultButton,
         CancellationToken cancellationToken)
     {
@@ -36,7 +36,7 @@ public Task<ContentDialogResult> ShowAsync(
         string title,
         string content,
         string primaryText,
-        string closeText,
+        string? closeText,
         ContentDialogButton defaultButton,
         CancellationToken cancellationToken)
     {

KoeBook/Components/Dialog/SharedContentDialog.xaml.cs

@@ -8,7 +8,8 @@ public SharedContentDialog(string title, string primaryText, string? closeText,
     {
         Title = title;
         PrimaryButtonText = primaryText;
-        CloseButtonText = closeText;
+        if (closeText is not null)
+            CloseButtonText = closeText;
         DefaultButton = defaultButton;
         InitializeComponent();
     }

KoeBook/Contracts/Services/IDialogService.cs

@@ -8,15 +8,15 @@ Task<ContentDialogResult> ShowAsync(
         string title,
         object content,
         string primaryText,
-        string closeText,
+        string? closeText,
         ContentDialogButton defaultButton,
         CancellationToken cancellationToken);
 
     Task<ContentDialogResult> ShowAsync(
         string title,
         string content,
         string primaryText,
-        string closeText,
+        string? closeText,
         ContentDialogButton defaultButton,
         CancellationToken cancellationToken);
 

KoeBook/KoeBook.csproj

@@ -27,13 +27,16 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.300" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.307.25" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
     <PackageReference Include="FastEnum" Version="1.8.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
+    <PackageReference Include="QRCoder" Version="1.5.1" />
     <PackageReference Include="ReactiveProperty" Version="9.4.1" />
     <PackageReference Include="WinUIEx" Version="2.3.2" />
   </ItemGroup>
@@ -77,4 +80,6 @@
   <ItemGroup>
     <Resource Remove="Views\CreateStoryPage.xaml" />
   </ItemGroup>
+
+  <ProjectExtensions><VisualStudio><UserProperties appsettings_1local_1json__JsonSchema="https://json.schemastore.org/appsettings.json" /></VisualStudio></ProjectExtensions>
 </Project>

KoeBook/Models/GenerationTask.cs

@@ -1,6 +1,8 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using FastEnumUtility;
 using KoeBook.Core.Models;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media.Imaging;
 
 namespace KoeBook.Models;
 
@@ -39,7 +41,7 @@ public BookProperties ToBookProperties()
 
     public CancellationToken CancellationToken => CancellationTokenSource.Token;
 
-    public string Source => _rawSource is string uri ? uri : "AI生成";
+    public string Source => _rawSource is string uri ? uri : "Claudeによって生成されました。";
 
     private readonly object _rawSource;
 
@@ -49,7 +51,7 @@ public BookProperties ToBookProperties()
     {
         SourceType.Url => "URL",
         SourceType.FilePath => "ファイルパス",
-        SourceType.AiStory => "AI生成",
+        SourceType.AiStory => "生成方法",
         _ => string.Empty,
     };
 
@@ -93,6 +95,12 @@ public bool SkipEdit
 
     public bool Editable => State == GenerationState.Editting;
 
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(QrcodeVisibility))]
+    BitmapImage? _qrcode;
+
+    public Visibility QrcodeVisibility => Qrcode is null ? Visibility.Collapsed : Visibility.Visible;
+
     [ObservableProperty]
     private BookScripts? _bookScripts;
 

KoeBook/Services/DisplayStateChangeService.cs

@@ -1,6 +1,7 @@
 using KoeBook.Contracts.Services;
 using KoeBook.Core.Contracts.Services;
 using KoeBook.Core.Models;
+using Microsoft.UI.Dispatching;
 
 namespace KoeBook.Services;
 
@@ -11,7 +12,7 @@ internal class DisplayStateChangeService(IGenerationTaskService taskService) : I
     public void UpdateProgress(BookProperties bookProperties, int progress, int maximum)
     {
         var taskService = _taskService; // thisをキャプチャしないようにする
-        _ = App.MainWindow.DispatcherQueue.TryEnqueue(() =>
+        _ = App.MainWindow.DispatcherQueue.TryEnqueue(DispatcherQueuePriority.High, () =>
         {
             var task = taskService.GetProcessingTask(bookProperties.Id);
             task.MaximumProgress = maximum;
@@ -22,9 +23,11 @@ public void UpdateProgress(BookProperties bookProperties, int progress, int maxi
     public void UpdateState(BookProperties bookProperties, GenerationState state)
     {
         var taskService = _taskService; // thisをキャプチャしないようにする
-        _ = App.MainWindow.DispatcherQueue.TryEnqueue(() =>
+        _ = App.MainWindow.DispatcherQueue.TryEnqueue(DispatcherQueuePriority.High, () =>
         {
-            taskService.GetProcessingTask(bookProperties.Id).State = state;
+            var task = taskService.GetProcessingTask(bookProperties.Id);
+            if(task.State < state)
+                task.State = state;
         });
     }
 

KoeBook/Services/GenerationTaskRunnerService.cs

@@ -1,10 +1,15 @@
-using FastEnumUtility;
+using System.Diagnostics;
+using FastEnumUtility;
 using KoeBook.Contracts.Services;
 using KoeBook.Core;
 using KoeBook.Core.Contracts.Services;
 using KoeBook.Core.Models;
 using KoeBook.Models;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media.Imaging;
+using QRCoder;
 using Windows.Storage;
+using Windows.Storage.Streams;
 
 namespace KoeBook.Services;
 
@@ -13,19 +18,25 @@ public class GenerationTaskRunnerService
     private readonly IGenerationTaskService _taskService;
     private readonly IAnalyzerService _analyzerService;
     private readonly IEpubGenerateService _epubGenService;
+    private readonly IS3UploadService _uploadService;
+    private readonly QRCodeGenerator _qrCodeGenerator;
     private readonly IDialogService _dialogService;
     private readonly string _tempFolder = ApplicationData.Current.TemporaryFolder.Path;
 
     public GenerationTaskRunnerService(
         IGenerationTaskService taskService,
         IAnalyzerService analyzerService,
         IEpubGenerateService epubGenService,
+        IS3UploadService uploadService,
+        QRCodeGenerator qrCodeGenerator,
         IDialogService dialogService)
     {
         _taskService = taskService;
         _taskService.OnTasksChanged += TasksChanged;
         _analyzerService = analyzerService;
         _epubGenService = epubGenService;
+        _uploadService = uploadService;
+        _qrCodeGenerator = qrCodeGenerator;
         _dialogService = dialogService;
     }
 
@@ -83,14 +94,28 @@ private async ValueTask RunAsyncCore(GenerationTask task, bool firstStep)
                 task.State = GenerationState.Completed;
                 task.Progress = 1;
                 task.MaximumProgress = 1;
-                var fileName = Path.GetFileName(resultPath);
-                var resultDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "KoeBook");
-                if (!Directory.Exists(resultDirectory))
-                    Directory.CreateDirectory(resultDirectory);
-                File.Move(resultPath, Path.Combine(resultDirectory, fileName), true);
+
+                var resultUrl = await _uploadService.UploadFileAsync(resultPath, task.CancellationToken);
+                var qrCodeData = _qrCodeGenerator.CreateQrCode(resultUrl, QRCodeGenerator.ECCLevel.M);
+                var qrCode = new PngByteQRCode(qrCodeData).GetGraphic(20);
+                using (var ims = new InMemoryRandomAccessStream())
+                {
+                    using (var writer = new DataWriter(ims.GetOutputStreamAt(0)))
+                    {
+                        writer.WriteBytes(qrCode);
+                        await writer.StoreAsync().AsTask(task.CancellationToken);
+                    }
+                    task.Qrcode = new BitmapImage();
+                    await task.Qrcode.SetSourceAsync(ims).AsTask(task.CancellationToken);
+                }
+
+                await _dialogService.ShowAsync("title", new Image()
+                {
+                    Source = task.Qrcode,
+                }, "OK", null, ContentDialogButton.Primary, task.CancellationToken);
             }
             else
-                throw new InvalidOperationException();
+                throw new UnreachableException();
         }
         catch (OperationCanceledException)
         {

KoeBook/Startup.cs

@@ -44,6 +44,7 @@ public static IHostBuilder UseCoreStartup(this IHostBuilder builder)
                 .AddSingleton<IScrapingService, ScrapingAozoraService>()
                 .AddSingleton<IScrapingService, ScrapingNaroService>()
                 .AddSingleton<AiStoryAnalyzerService>()
+                .AddSingleton<IS3UploadService, S3UploadService>()
                 .AddSingleton<IStoryCreatorService, ClaudeStoryGeneratorService>();
             services.AddSingleton<IEpubCreateService, EpubCreateService>();
             services.AddSingleton<ISplitBraceService, SplitBraceService>();

KoeBook/Views/EditDetailsTab.xaml

@@ -103,6 +103,26 @@
                             Text="編集はできなくなります" />
                     </StackPanel>
 
+                    <TextBlock
+                        Visibility="{x:Bind ViewModel.Task.QrcodeVisibility, Mode=OneWay}"
+                        Style="{StaticResource SubtitleTextBlockStyle}"
+                        Margin="{StaticResource MediumTopMargin}"
+                        Text="出力結果" />
+                    <StackPanel
+                        Visibility="{x:Bind ViewModel.Task.QrcodeVisibility, Mode=OneWay}"
+                        Background="{ThemeResource CardBackgroundFillColorDefault}"
+                        BorderBrush="{ThemeResource CardStrokeColorDefault}"
+                        BorderThickness="1"
+                        Padding="12"
+                        Width="280"
+                        CornerRadius="12"
+                        HorizontalAlignment="Left"
+                        Margin="{StaticResource SmallTopMargin}">
+                        <Image
+                            MaxWidth="256"
+                            Source="{x:Bind ViewModel.Task.Qrcode, Mode=OneWay}"/>
+                    </StackPanel>
+
                     <TextBlock
                         Style="{StaticResource SubtitleTextBlockStyle}"
                         Margin="{StaticResource MediumTopMargin}"

KoeBook/appsettings.json

@@ -9,5 +9,9 @@
         "ISoundGenerationSelectorService": false,
         "ISoundGenerationService": false,
         "IStoryCreaterService": false
+    },
+    "AWS": {
+        "Profile": "KoeBook",
+        "Region": "ap-northeast-1"
     }
 }