#36 AiStoryの属性を修正

OUCC · Apr 29, 2024 · e31a665 · e31a665
1 parent 935632c
commit e31a665
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 19 deletions.
diff --git a/Epub/KoeBook.Epub/Services/AiStoryAnalyzerService.cs b/Epub/KoeBook.Epub/Services/AiStoryAnalyzerService.cs
@@ -1,5 +1,4 @@
-using KoeBook.Core.Utilities;
-using KoeBook.Epub.Contracts.Services;
+using KoeBook.Epub.Contracts.Services;
 using KoeBook.Epub.Models;
 using KoeBook.Models;
 

diff --git a/KoeBook.Core/Models/AiStory.cs b/KoeBook.Core/Models/AiStory.cs
@@ -1,20 +1,26 @@
 using System.Xml.Serialization;
-using KoeBook.Core.Utilities;
 
 namespace KoeBook.Models;
 
-[XmlRoot("Book", IsNullable = false)]
+[XmlRoot("Book")]
 public record AiStory(
-    [XmlElement("Title", typeof(string), IsNullable = false)] string Title,
-    [XmlArray("Content", IsNullable = false), XmlArrayItem("Section", IsNullable = false)] AiStory.Section[] Sections)
+    [property: XmlElement("Title", typeof(string), IsNullable = false)] string Title,
+    [property: XmlArray("Content", IsNullable = false), XmlArrayItem("Section", IsNullable = false)] AiStory.Section[] Sections)
 {
+    private AiStory() : this("", []) { }
+
     public record Section(
-        [XmlElement("Paragraph", IsNullable = false)] Paragraph[] Paragraphs);
+        [property: XmlArrayItem("Paragraph", IsNullable = false)] Paragraph[] Paragraphs)
+    {
+        private Section() : this([]) { }
+    }
 
 
     public record Paragraph(
-        [XmlElement("Text", typeof(TextElement), IsNullable = false), XmlElement("Ruby", typeof(Ruby), IsNullable = false)] InlineElement[] Inlines)
+        [property: XmlElement("Text", typeof(TextElement), IsNullable = false), XmlElement("Ruby", typeof(Ruby), IsNullable = false)] InlineElement[] Inlines)
     {
+        private Paragraph() : this([]) { }
+
         public string GetText() => string.Concat(Inlines.Select(e => e.Text));
 
         public string GetScript() => string.Concat(Inlines.Select(e => e.Script));
@@ -26,19 +32,21 @@ public abstract record class InlineElement
         public abstract string Script { get; }
     }
 
-    public record TextElement([XmlText] string InnerText) : InlineElement
+    public record TextElement([property: XmlText] string InnerText) : InlineElement
     {
+        private TextElement() : this("") { }
+
         public override string Text => InnerText;
         public override string Script => InnerText;
     }
 
-
     public record Ruby(
-        [XmlElement("Rb", IsNullable = false)] string Rb,
-        [XmlElement("Rt", IsNullable = false)] string Rt) : InlineElement
+        [property: XmlElement("Rb", IsNullable = false)] string Rb,
+        [property: XmlElement("Rt", IsNullable = false)] string Rt) : InlineElement
     {
+        private Ruby() : this("", "") { }
+
         public override string Text => Rb;
         public override string Script => Rt;
     }
-
 }
diff --git a/KoeBook.Core/Models/BookProperties.cs b/KoeBook.Core/Models/BookProperties.cs
@@ -1,5 +1,4 @@
-using System.Diagnostics;
-using KoeBook.Models;
+using KoeBook.Models;
 
 namespace KoeBook.Core.Models;
 
@@ -21,6 +20,7 @@ public BookProperties(Guid id, AiStory aiStory)
     {
         Id = id;
         Source = aiStory;
+        SourceType = SourceType.AiStory;
     }
 
     public Guid Id { get; }

diff --git a/KoeBook/Models/GenerationTask.cs b/KoeBook/Models/GenerationTask.cs
@@ -66,7 +66,7 @@ public BookProperties ToBookProperties()
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(StateText))]
-    [NotifyPropertyChangedFor(nameof(SkipEditChangable))]
+    [NotifyPropertyChangedFor(nameof(SkipEditChangeable))]
     [NotifyPropertyChangedFor(nameof(Editable))]
     private GenerationState _state;
 
@@ -79,7 +79,7 @@ public bool SkipEdit
         get => _skipEdit;
         set
         {
-            if (_skipEdit != value && SkipEditChangable)
+            if (_skipEdit != value && SkipEditChangeable)
             {
                 OnPropertyChanging(nameof(SkipEdit));
                 _skipEdit = value;
@@ -89,7 +89,7 @@ public bool SkipEdit
     }
     private bool _skipEdit;
 
-    public bool SkipEditChangable => State < GenerationState.Editting;
+    public bool SkipEditChangeable => State < GenerationState.Editting;
 
     public bool Editable => State == GenerationState.Editting;
 

diff --git a/KoeBook/Views/EditDetailsTab.xaml b/KoeBook/Views/EditDetailsTab.xaml
@@ -61,7 +61,7 @@
                             Margin="{StaticResource XXSmallLeftTopRightBottomMargin}"
                             OffContent="編集する"
                             OnContent="編集しない"
-                            IsEnabled="{x:Bind ViewModel.Task.SkipEditChangable, Mode=OneWay}"
+                            IsEnabled="{x:Bind ViewModel.Task.SkipEditChangeable, Mode=OneWay}"
                             IsOn="{x:Bind ViewModel.Task.SkipEdit, Mode=TwoWay}"/>
 
                         <TextBlock