修复导入在线书籍时的问题 (#42)

Richasy · web-flow · commit efa1c18b2a5f · 2022-06-10T21:51:12.000+08:00
diff --git a/src/CleanReader.App/Controls/Popups/BookInformationDialog.xaml.cs b/src/CleanReader.App/Controls/Popups/BookInformationDialog.xaml.cs
@@ -38,10 +38,7 @@ public override void OnPrimaryButtonClick()
                 _viewModel.Book.Author = AuthorBox.Text;
             }
 
-            if (string.IsNullOrEmpty(CoverBox.Text))
-            {
-                _viewModel.Book.Cover = CoverBox.Text;
-            }
+            _viewModel.Cover = CoverBox.Text;
 
             if (!string.IsNullOrEmpty(DescriptionBox.Text))
             {
diff --git a/src/CleanReader.App/Pages/MainPage.xaml.cs b/src/CleanReader.App/Pages/MainPage.xaml.cs
@@ -111,10 +111,6 @@ private async void OnLoadedAsync(object sender, RoutedEventArgs e)
             {
                 await _libraryViewModel.CheckContinueReadingAsync();
             }
-            else
-            {
-                await _libraryViewModel.CheckOpenFileOrImportAsync();
-            }
 
 #if !DEBUG
             _viewModel.CheckGithubUpdateCommand.Execute().Subscribe();
diff --git a/src/CleanReader.App/Program.cs b/src/CleanReader.App/Program.cs
@@ -1,11 +1,15 @@
 ﻿// Copyright (c) Richasy. All rights reserved.
 
 using System;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
+using CleanReader.ViewModels.Desktop;
 using Microsoft.UI.Dispatching;
 using Microsoft.Windows.AppLifecycle;
+using Windows.ApplicationModel.Activation;
+using Windows.Storage;
 
 namespace CleanReader.App;
 
@@ -41,15 +45,14 @@ private static bool DecideRedirection()
         var isRedirect = false;
 
         var args = AppInstance.GetCurrent().GetActivatedEventArgs();
-        var kind = args.Kind;
 
         try
         {
             var keyInstance = AppInstance.FindOrRegisterForKey("CleanReader");
 
             if (keyInstance.IsCurrent)
             {
-                keyInstance.Activated += OnActivated;
+                keyInstance.Activated += OnActivatedAsync;
             }
             else
             {
@@ -59,6 +62,7 @@ private static bool DecideRedirection()
         }
         catch (Exception)
         {
+            isRedirect = true;
         }
 
         return isRedirect;
@@ -78,9 +82,9 @@ private static bool DecideRedirection()
     private static void RedirectActivationTo(AppActivationArguments args, AppInstance keyInstance)
     {
         redirectEventHandle = CreateEvent(IntPtr.Zero, true, false, null);
-        Task.Run(() =>
+        Task.Run(async () =>
         {
-            keyInstance.RedirectActivationToAsync(args).AsTask().Wait();
+            await keyInstance.RedirectActivationToAsync(args);
             SetEvent(redirectEventHandle);
         });
         uint cWMO_DEFAULT = 0;
@@ -93,6 +97,17 @@ private static void RedirectActivationTo(AppActivationArguments args, AppInstanc
            out var handleIndex);
     }
 
-    private static void OnActivated(object sender, AppActivationArguments args)
-        => _ = args.Kind;
+    private static async void OnActivatedAsync(object sender, AppActivationArguments args)
+    {
+        if (args.Kind == ExtendedActivationKind.File)
+        {
+            var fileArgs = args.Data as FileActivatedEventArgs;
+            var file = fileArgs.Files.FirstOrDefault();
+            if (file is StorageFile f)
+            {
+                AppViewModel.Instance.InitializeFilePath = f.Path;
+                await LibraryViewModel.Instance.CheckOpenFileOrImportAsync();
+            }
+        }
+    }
 }
diff --git a/src/Services/EpubService/EpubService.Epub.cs b/src/Services/EpubService/EpubService.Epub.cs
@@ -58,6 +58,11 @@ private async Task CreateOpfFileAsync()
             foreach (var file in _files.Where(p => !p.Equals(Configuration.TitlePagePath, StringComparison.OrdinalIgnoreCase)))
             {
                 var pathName = Path.GetFileNameWithoutExtension(file);
+                if (!_chapterNames.ContainsKey(pathName))
+                {
+                    continue;
+                }
+
                 var fileName = NormalizeTitle(_chapterNames[pathName]);
                 manifestBuilder.AppendLine(new string(' ', 12) + $"<item id=\"ch{pathName}\" href=\"Pages/{pathName}.html\" media-type=\"application/xhtml+xml\"/>");
                 spineBuilder.AppendLine(new string(' ', 12) + $"<itemref idref=\"ch{pathName}\"/>");
diff --git a/src/Services/EpubService/EpubService.Txt.cs b/src/Services/EpubService/EpubService.Txt.cs
@@ -48,7 +48,7 @@ private static async Task GenerateHtmlFromTxtAsync(string title, string[] lines,
                                              .Replace("{{body}}", string.Join(string.Empty, lines.Select(p => $"<p>{p}</p>")));
             if (_chapterNames == null)
             {
-                _chapterNames = new System.Collections.Generic.Dictionary<string, string>();
+                _chapterNames = new Dictionary<string, string>();
             }
 
             _chapterNames.Add(index.ToString("0000"), title);
diff --git a/src/Services/NovelService/Models/Source/SearchConfig.cs b/src/Services/NovelService/Models/Source/SearchConfig.cs
@@ -21,5 +21,10 @@ public class SearchConfig : BookInformationConfigBase
         /// 是否需要进一步请求书籍详情.
         /// </summary>
         public bool NeedDetail { get; set; }
+
+        /// <summary>
+        /// 是否需要对关键词进行Url编码.
+        /// </summary>
+        public bool EncodingKeyword { get; set; }
     }
 }
diff --git a/src/Services/NovelService/NovelService.Chapter.cs b/src/Services/NovelService/NovelService.Chapter.cs
@@ -14,7 +14,9 @@ public partial class NovelService
     {
         private static void InitializeChapter(Chapter chapter, ChapterConfig chapterConfig, HtmlNode node)
         {
-            var titleNode = node.QuerySelector(chapterConfig.Title?.Rule);
+            var titleNode = string.IsNullOrEmpty(chapterConfig.Title?.Rule)
+                ? node
+                : node.QuerySelector(chapterConfig.Title?.Rule);
 
             if (titleNode != null)
             {
diff --git a/src/Services/NovelService/NovelService.cs b/src/Services/NovelService/NovelService.cs
@@ -83,7 +83,9 @@ public async Task<List<Book>> SearchBookAsync(string sourceId, string bookName)
                 }
                 else
                 {
-                    var keyword = HttpUtility.UrlEncode(bookName, encoding);
+                    var keyword = searchConfig.EncodingKeyword
+                        ? HttpUtility.UrlEncode(bookName, encoding)
+                        : bookName;
                     var searchUrl = searchConfig.SearchUrl + keyword;
                     doc = await GetHtmlDocumentAsync(searchUrl, encoding);
                 }
diff --git a/src/ViewModels/ViewModels.Desktop/LibraryViewModel/LibraryViewModel.Import.cs b/src/ViewModels/ViewModels.Desktop/LibraryViewModel/LibraryViewModel.Import.cs
@@ -3,6 +3,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Reactive.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -129,8 +130,8 @@ private async Task<Book> GenerateBookEntryFromEpubFileAsync(string path)
             var progressDialog = ServiceLocator.Instance.GetService<ICustomDialog>(AppConstants.ProgressDialog);
             progressDialog.InjectData(StringResources.MovingFile);
             progressDialog.InjectTask(_fileToolkit.CopyAsync(path, destPath));
-            await progressDialog.ShowAsync();
 
+            await progressDialog.ShowAsync();
             var book = GetBookEntryFromLocalPath(destPath);
 
             try
diff --git a/src/ViewModels/ViewModels.Desktop/LibraryViewModel/LibraryViewModel.cs b/src/ViewModels/ViewModels.Desktop/LibraryViewModel/LibraryViewModel.cs
@@ -257,26 +257,31 @@ await Task.Run(async () =>
                 {
                     book = await LibraryContext.Books.FirstOrDefaultAsync(p => p.Path.Equals(Path.GetFileName(path)));
                 });
-                AppViewModel.Instance.RequestRead(book);
+
+                DispatcherQueue.TryEnqueue(() =>
+                {
+                    AppViewModel.Instance.RequestRead(book);
+                });
             }
             else
             {
                 if (Path.GetExtension(path).Equals(".epub", StringComparison.OrdinalIgnoreCase))
                 {
                     GetBookEntryFromEpubFileCommand.Execute(path)
-                        .Subscribe(async b =>
+                        .ObserveOn(RxApp.MainThreadScheduler)
+                        .Subscribe(b =>
                         {
-                            await InsertBookEntryAsync(b);
-
-                            DispatcherQueue.TryEnqueue(() =>
+                            DispatcherQueue.TryEnqueue(async () =>
                             {
+                                await InsertBookEntryAsync(b);
                                 AppViewModel.Instance.RequestRead(b);
                             });
                         });
                 }
                 else if (Path.GetExtension(path).Equals(".txt", StringComparison.OrdinalIgnoreCase))
                 {
                     GetBookEntryFromTxtFileCommand.Execute(path)
+                        .ObserveOn(RxApp.MainThreadScheduler)
                         .Subscribe(async b =>
                         {
                             await InsertBookEntryAsync(b);
diff --git a/src/ViewModels/ViewModels.Desktop/ShelfPageViewModel/ShelfPageViewModel.cs b/src/ViewModels/ViewModels.Desktop/ShelfPageViewModel/ShelfPageViewModel.cs
@@ -134,6 +134,11 @@ private async Task InitializeViewModelAsync()
             await InitializeShelvesAsync();
             CurrentBookType = _settingsToolkit.ReadLocalSetting(SettingNames.BookType, VMConstants.Shelf.AllType);
             CurrentSort = _settingsToolkit.ReadLocalSetting(SettingNames.SortType, VMConstants.Shelf.SortRead);
+
+            if (!string.IsNullOrEmpty(AppViewModel.Instance.InitializeFilePath))
+            {
+                await LibraryViewModel.Instance.CheckOpenFileOrImportAsync();
+            }
         }
 
         private async Task InitializeShelvesAsync()

Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,7 @@ public override void OnPrimaryButtonClick()`
`38`	`38`	`_viewModel.Book.Author = AuthorBox.Text;`
`39`	`39`	`}`
`40`	`40`
`41`		`- if (string.IsNullOrEmpty(CoverBox.Text))`
`42`		`- {`
`43`		`- _viewModel.Book.Cover = CoverBox.Text;`
`44`		`- }`
	`41`	`+ _viewModel.Cover = CoverBox.Text;`
`45`	`42`
`46`	`43`	`if (!string.IsNullOrEmpty(DescriptionBox.Text))`
`47`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -111,10 +111,6 @@ private async void OnLoadedAsync(object sender, RoutedEventArgs e)`
`111`	`111`	`{`
`112`	`112`	`await _libraryViewModel.CheckContinueReadingAsync();`
`113`	`113`	`}`
`114`		`- else`
`115`		`- {`
`116`		`- await _libraryViewModel.CheckOpenFileOrImportAsync();`
`117`		`- }`
`118`	`114`
`119`	`115`	`#if !DEBUG`
`120`	`116`	`_viewModel.CheckGithubUpdateCommand.Execute().Subscribe();`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ private static async Task GenerateHtmlFromTxtAsync(string title, string[] lines,`
`48`	`48`	`.Replace("{{body}}", string.Join(string.Empty, lines.Select(p => $"<p>{p}</p>")));`
`49`	`49`	`if (_chapterNames == null)`
`50`	`50`	`{`
`51`		`- _chapterNames = new System.Collections.Generic.Dictionary<string, string>();`
	`51`	`+ _chapterNames = new Dictionary<string, string>();`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`_chapterNames.Add(index.ToString("0000"), title);`
Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,10 @@ public class SearchConfig : BookInformationConfigBase`
`21`	`21`	`/// 是否需要进一步请求书籍详情.`
`22`	`22`	`/// </summary>`
`23`	`23`	`public bool NeedDetail { get; set; }`
	`24`	`+`
	`25`	`+ /// <summary>`
	`26`	`+ /// 是否需要对关键词进行Url编码.`
	`27`	`+ /// </summary>`
	`28`	`+ public bool EncodingKeyword { get; set; }`
`24`	`29`	`}`
`25`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,9 @@ public partial class NovelService`
`14`	`14`	`{`
`15`	`15`	`private static void InitializeChapter(Chapter chapter, ChapterConfig chapterConfig, HtmlNode node)`
`16`	`16`	`{`
`17`		`- var titleNode = node.QuerySelector(chapterConfig.Title?.Rule);`
	`17`	`+ var titleNode = string.IsNullOrEmpty(chapterConfig.Title?.Rule)`
	`18`	`+ ? node`
	`19`	`+ : node.QuerySelector(chapterConfig.Title?.Rule);`
`18`	`20`
`19`	`21`	`if (titleNode != null)`
`20`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,9 @@ public async Task<List<Book>> SearchBookAsync(string sourceId, string bookName)`
`83`	`83`	`}`
`84`	`84`	`else`
`85`	`85`	`{`
`86`		`- var keyword = HttpUtility.UrlEncode(bookName, encoding);`
	`86`	`+ var keyword = searchConfig.EncodingKeyword`
	`87`	`+ ? HttpUtility.UrlEncode(bookName, encoding)`
	`88`	`+ : bookName;`
`87`	`89`	`var searchUrl = searchConfig.SearchUrl + keyword;`
`88`	`90`	`doc = await GetHtmlDocumentAsync(searchUrl, encoding);`
`89`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -257,26 +257,31 @@ await Task.Run(async () =>`
`257`	`257`	`{`
`258`	`258`	`book = await LibraryContext.Books.FirstOrDefaultAsync(p => p.Path.Equals(Path.GetFileName(path)));`
`259`	`259`	`});`
`260`		`- AppViewModel.Instance.RequestRead(book);`
	`260`	`+`
	`261`	`+ DispatcherQueue.TryEnqueue(() =>`
	`262`	`+ {`
	`263`	`+ AppViewModel.Instance.RequestRead(book);`
	`264`	`+ });`
`261`	`265`	`}`
`262`	`266`	`else`
`263`	`267`	`{`
`264`	`268`	`if (Path.GetExtension(path).Equals(".epub", StringComparison.OrdinalIgnoreCase))`
`265`	`269`	`{`
`266`	`270`	`GetBookEntryFromEpubFileCommand.Execute(path)`
`267`		`- .Subscribe(async b =>`
	`271`	`+ .ObserveOn(RxApp.MainThreadScheduler)`
	`272`	`+ .Subscribe(b =>`
`268`	`273`	`{`
`269`		`- await InsertBookEntryAsync(b);`
`270`		`-`
`271`		`- DispatcherQueue.TryEnqueue(() =>`
	`274`	`+ DispatcherQueue.TryEnqueue(async () =>`
`272`	`275`	`{`
	`276`	`+ await InsertBookEntryAsync(b);`
`273`	`277`	`AppViewModel.Instance.RequestRead(b);`
`274`	`278`	`});`
`275`	`279`	`});`
`276`	`280`	`}`
`277`	`281`	`else if (Path.GetExtension(path).Equals(".txt", StringComparison.OrdinalIgnoreCase))`
`278`	`282`	`{`
`279`	`283`	`GetBookEntryFromTxtFileCommand.Execute(path)`
	`284`	`+ .ObserveOn(RxApp.MainThreadScheduler)`
`280`	`285`	`.Subscribe(async b =>`
`281`	`286`	`{`
`282`	`287`	`await InsertBookEntryAsync(b);`