Merge pull request MicaApps#93 from MicaApps/gan601

zhuxb711 · web-flow · commit b2f43753756e · 2023-07-27T16:40:26.000+08:00
启动时尝试建库, 5.19 graph降到5.11版本解决莫名其妙的空引用异常, DefaultFolderTaskAsync返回Task
diff --git a/Mail/App.xaml.cs b/Mail/App.xaml.cs
@@ -1,13 +1,4 @@
-﻿using System;
-using System.Data;
-using System.Diagnostics;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.ApplicationModel.Core;
-using Windows.Storage;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Chloe;
+﻿using Chloe;
 using Chloe.Infrastructure;
 using Mail.Extensions;
 using Mail.Pages;
@@ -16,104 +7,65 @@
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Toolkit.Uwp.Helpers;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using Windows.ApplicationModel.Core;
+using Windows.Storage;
+using Windows.UI.Xaml;
 
 namespace Mail
 {
     sealed partial class App : Application
     {
-        public static IServiceProvider Services = null!;
+        public static IServiceProvider Services { get; private set; }
 
         public App()
         {
             InitializeComponent();
-            var services = new ServiceCollection();
-            RegisterServices(services);
-            Services = services.BuildServiceProvider();
+            Services = RegisterServices();
+        }
 
-            Suspending += OnSuspending;
+        private async Task InitalizeDatabaseAsync()
+        {
+            await Services.GetService<IDbContext>().Session.ExecuteReaderAsync(await PathIO.ReadTextAsync(Path.Combine(Package.Current.InstalledPath, "Assets", "sql.sql")));
         }
 
-        private void RegisterServices(IServiceCollection services)
+        private IServiceProvider RegisterServices()
         {
-            var connectionString = $"DataSource={ApplicationData.Current.LocalFolder.Path}\\mail.db";
-#if DEBUG
-            Trace.WriteLine($"{nameof(connectionString)}Path: {connectionString}");
-#endif
-            services.AddSingleton<OutlookService, OutlookService>()
-                .AddSingleton<ICacheService, CacheService>()
-                .AddSingleton<LocalCacheService>()
-                .AddSingleton<IMemoryCache>(_ => new MemoryCache(new MemoryCacheOptions()))
-                .AddTransient<IDbContext>(_ =>
-                {
-                    var db = new CustomDbContext(new SQLiteConnectionFactory(connectionString));
-                    return db;
-                })
-                .BuildServiceProvider();
+            return new ServiceCollection().AddSingleton<OutlookService, OutlookService>()
+                                          .AddSingleton<ICacheService, CacheService>()
+                                          .AddSingleton<LocalCacheService>()
+                                          .AddSingleton<IMemoryCache>(_ => new MemoryCache(new MemoryCacheOptions()))
+                                          .AddTransient<IDbContext>(_ => new CustomDbContext(new DbConnectionFactory(() => new SqliteConnection($"DataSource={ApplicationData.Current.LocalFolder.Path}\\mail.db"))))
+                                          .BuildServiceProvider();
         }
 
         protected override void OnWindowCreated(WindowCreatedEventArgs args)
         {
             CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = true;
         }
 
-        protected override void OnLaunched(LaunchActivatedEventArgs e)
+        protected override async void OnLaunched(LaunchActivatedEventArgs e)
         {
-            OnLaunchedOrActivated(e);
+            await HandleLaunchedOrActivatedAsync(e);
         }
 
-        protected override void OnActivated(IActivatedEventArgs args)
+        protected override async void OnActivated(IActivatedEventArgs args)
         {
-            OnLaunchedOrActivated(args);
+            await HandleLaunchedOrActivatedAsync(args);
         }
 
-        private void OnLaunchedOrActivated(IActivatedEventArgs args)
+        private async Task HandleLaunchedOrActivatedAsync(IActivatedEventArgs args)
         {
             SystemInformation.Instance.TrackAppUse(args);
 
-            if (Window.Current.Content is Frame RootFrame)
-            {
-                //Do something on activate
-            }
-            else
-            {
-                Window.Current.Content = new SplashPage(args.SplashScreen,
-                    args.PreviousExecutionState == ApplicationExecutionState.Terminated);
-            }
+            await InitalizeDatabaseAsync();
 
+            Window.Current.Content = new SplashPage(args.SplashScreen, args.PreviousExecutionState == ApplicationExecutionState.Terminated);
             Window.Current.Activate();
         }
-
-        private void OnSuspending(object sender, SuspendingEventArgs e)
-        {
-            var Deferral = e.SuspendingOperation.GetDeferral();
-
-            try
-            {
-                //TODO: 保存应用程序状态并停止任何后台活动
-            }
-            catch (Exception)
-            {
-            }
-            finally
-            {
-                Deferral.Complete();
-            }
-        }
-    }
-}
-
-public class SQLiteConnectionFactory : IDbConnectionFactory
-{
-    private readonly string _connString;
-
-    public SQLiteConnectionFactory(string connString)
-    {
-        _connString = connString;
-    }
-
-    public IDbConnection CreateConnection()
-    {
-        var conn = new SqliteConnection(_connString);
-        return conn;
     }
 }
diff --git a/Mail/Assets/sql.sql b/Mail/Assets/sql.sql
@@ -1,4 +1,4 @@
-﻿create table main.MailFolderData
+﻿create table if not exists main.MailFolderData
 (
     Id               NVARCHAR(255) not null
         primary key,
@@ -11,7 +11,7 @@
     ChildFolderCount INTEGER       not null
 );
 
-create table main.MailMessageContentData
+create table if not exists main.MailMessageContentData
 (
     MessageId      NVARCHAR(255) not null
         primary key,
@@ -20,7 +20,7 @@ create table main.MailMessageContentData
     ContentType    MEDIUMINT     not null
 );
 
-create table main.MailMessageData
+create table if not exists main.MailMessageData
 (
     MessageId               NVARCHAR(255) not null
         primary key,
@@ -30,7 +30,7 @@ create table main.MailMessageData
     SentTime                DATETIME
 );
 
-create table main.MailMessageRecipientData
+create table if not exists main.MailMessageRecipientData
 (
     Id            integer       not null
         constraint MailMessageRecipientData_pk
@@ -41,3 +41,5 @@ create table main.MailMessageRecipientData
     RecipientType MEDIUMINT     not null
 );
 
+create index if not exists MailMessageRecipientData_MessageId_index
+    on MailMessageRecipientData (MessageId);
diff --git a/Mail/Extensions/CustomDbContext.cs b/Mail/Extensions/CustomDbContext.cs
@@ -1,9 +1,9 @@
-﻿using System;
-using System.Data;
-using System.Threading.Tasks;
-using Chloe.Infrastructure;
+﻿using Chloe.Infrastructure;
 using Chloe.SQLite;
 using Mail.Services.Data.Enums;
+using System;
+using System.Data;
+using System.Threading.Tasks;
 
 namespace Mail.Extensions;
 
@@ -17,20 +17,22 @@ public class CustomDbContext : SQLiteContext
 {
     public CustomDbContext(IDbConnectionFactory dbConnectionFactory) : base(dbConnectionFactory)
     {
+
     }
 
-    public CustomDbContext(IDbConnectionFactory dbConnectionFactory, bool concurrencyMode) : base(dbConnectionFactory,
-        concurrencyMode)
+    public CustomDbContext(IDbConnectionFactory dbConnectionFactory, bool concurrencyMode) : base(dbConnectionFactory, concurrencyMode)
     {
+
     }
 
     public CustomDbContext(Func<IDbConnection> dbConnectionFactory) : base(dbConnectionFactory)
     {
+
     }
 
-    public CustomDbContext(Func<IDbConnection> dbConnectionFactory, bool concurrencyMode) : base(dbConnectionFactory,
-        concurrencyMode)
+    public CustomDbContext(Func<IDbConnection> dbConnectionFactory, bool concurrencyMode) : base(dbConnectionFactory, concurrencyMode)
     {
+
     }
 
     protected override Task<int> Delete<TEntity>(TEntity entity, string table, bool async)
diff --git a/Mail/Mail.csproj b/Mail/Mail.csproj
@@ -242,7 +242,7 @@
     <Content Include="Assets\Wide310x150Logo.scale-125.png" />
     <Content Include="Assets\Wide310x150Logo.scale-150.png" />
     <Content Include="Assets\Wide310x150Logo.scale-400.png" />
-    <None Include="sql.sql"/>
+    <Content Include="Assets\sql.sql"/>
     <Content Include="Properties\Default.rd.xml" />
     <Content Include="Assets\LockScreenLogo.scale-200.png" />
     <Content Include="Assets\SplashScreen.scale-200.png" />
diff --git a/Mail/Pages/MailFolderDetailsPage.xaml.cs b/Mail/Pages/MailFolderDetailsPage.xaml.cs
@@ -8,7 +8,6 @@
 using Windows.Storage;
 using Windows.Storage.Pickers;
 using Windows.UI;
-using Windows.UI.Core;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Input;
@@ -24,6 +23,7 @@
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Nito.AsyncEx;
+using Windows.UI.Core;
 
 namespace Mail.Pages
 {
@@ -262,21 +262,15 @@ private async void ListDetailsView_Tapped(object sender, TappedRoutedEventArgs e
             }
         }
 
-        private readonly Regex Rgx = new("cid:[^\"]+");
-
         private async Task LoadImageAndCacheAsync(MailMessageListDetailViewModel model, WebView browser)
         {
-            var attachmentFileList = await Service.GetMailAttachmentFileAsync(model).ToListAsync();
+            IReadOnlyList<MailMessageFileAttachmentData> attachmentFileList = await Service.GetMailAttachmentFileAsync(model).ToListAsync();
 
             if (browser.DataContext is MailMessageListDetailViewModel context)
             {
                 if (context.Id.Equals(model.Id))
                 {
-                    await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-                        browser.NavigateToString(ConvertContentTheme(
-                            Rgx.Replace(model.Content,
-                                Match => ReplaceHtmlInnerImageCidToBase64(Match, attachmentFileList)),
-                            model.ContentType == MailMessageContentType.Text)));
+                    browser.NavigateToString(ConvertContentTheme(new Regex("cid:[^\"]+").Replace(model.Content, Match => ReplaceHtmlInnerImageCidToBase64(Match, attachmentFileList)), model.ContentType == MailMessageContentType.Text));
                 }
             }
         }
diff --git a/Mail/Services/OutlookService.cs b/Mail/Services/OutlookService.cs
@@ -1,14 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using Windows.Storage;
-using Windows.Storage.FileProperties;
 using CommunityToolkit.Authentication;
 using Mail.Extensions.Graph;
 using Mail.Models;
@@ -26,6 +15,17 @@
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Windows.Storage;
+using Windows.Storage.FileProperties;
 
 namespace Mail.Services
 {
@@ -114,7 +114,6 @@ async IAsyncEnumerable<MailMessageData> IMailService.IFocusFilterSupport.GetMail
             }
         }
 
-
         private async Task<MailMessageData> GenAndSaveMailMessageDataAsync(string RootFolderId, Message message,
             string type = "Focused")
         {
@@ -143,7 +142,7 @@ private async Task<MailMessageData> GenAndSaveMailMessageDataAsync(string RootFo
 
         private GraphServiceClient GetClient() => Client ??= Provider.GetClient();
 
-        private async Task<MailFolderCollectionResponse?> DefaultFolderTaskAsync(string name,
+        private async Task DefaultFolderTaskAsync(string name,
             CancellationToken CancellationToken)
         {
             try
@@ -164,10 +163,8 @@ private async Task<MailMessageData> GenAndSaveMailMessageDataAsync(string RootFo
             }
             catch (Exception e)
             {
-                Trace.WriteLine(e);
+                Trace.WriteLine($"{nameof(DefaultFolderTaskAsync)}: {e}");
             }
-
-            return null;
         }
 
         public override async IAsyncEnumerable<MailFolderData> GetMailSuperFoldersAsync(
@@ -262,7 +259,6 @@ private async Task LoadMailChildFolderAsync(MailFolderData ParentMailFolder,
             }
         }
 
-
         public override async Task<MailFolderData> GetMailFolderDetailAsync(string RootFolderId,
             CancellationToken CancelToken = default)
         {
@@ -478,7 +474,11 @@ public override async Task<bool> MailForwardAsync(MailMessageListDetailViewModel
             if (message is null) return false;
 
             await me.Messages[Model.Id].Forward.PostAsync(new ForwardPostRequestBody
-                { ToRecipients = message.ToRecipients, Comment = ForwardContent });
+            {
+                Comment = ForwardContent,
+                ToRecipients = message.ToRecipients
+            });
+
             return true;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`		`-using System;`
`2`		`-using System.Data;`
`3`		`-using System.Threading.Tasks;`
`4`		`-using Chloe.Infrastructure;`
	`1`	`+using Chloe.Infrastructure;`
`5`	`2`	`using Chloe.SQLite;`
`6`	`3`	`using Mail.Services.Data.Enums;`
	`4`	`+using System;`
	`5`	`+using System.Data;`
	`6`	`+using System.Threading.Tasks;`
`7`	`7`
`8`	`8`	`namespace Mail.Extensions;`
`9`	`9`
`@@ -17,20 +17,22 @@ public class CustomDbContext : SQLiteContext`
`17`	`17`	`{`
`18`	`18`	`public CustomDbContext(IDbConnectionFactory dbConnectionFactory) : base(dbConnectionFactory)`
`19`	`19`	`{`
	`20`	`+`
`20`	`21`	`}`
`21`	`22`
`22`		`- public CustomDbContext(IDbConnectionFactory dbConnectionFactory, bool concurrencyMode) : base(dbConnectionFactory,`
`23`		`- concurrencyMode)`
	`23`	`+ public CustomDbContext(IDbConnectionFactory dbConnectionFactory, bool concurrencyMode) : base(dbConnectionFactory, concurrencyMode)`
`24`	`24`	`{`
	`25`	`+`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`public CustomDbContext(Func<IDbConnection> dbConnectionFactory) : base(dbConnectionFactory)`
`28`	`29`	`{`
	`30`	`+`
`29`	`31`	`}`
`30`	`32`
`31`		`- public CustomDbContext(Func<IDbConnection> dbConnectionFactory, bool concurrencyMode) : base(dbConnectionFactory,`
`32`		`- concurrencyMode)`
	`33`	`+ public CustomDbContext(Func<IDbConnection> dbConnectionFactory, bool concurrencyMode) : base(dbConnectionFactory, concurrencyMode)`
`33`	`34`	`{`
	`35`	`+`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`protected override Task<int> Delete<TEntity>(TEntity entity, string table, bool async)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`using Windows.Storage;`
`9`	`9`	`using Windows.Storage.Pickers;`
`10`	`10`	`using Windows.UI;`
`11`		`-using Windows.UI.Core;`
`12`	`11`	`using Windows.UI.Xaml;`
`13`	`12`	`using Windows.UI.Xaml.Controls;`
`14`	`13`	`using Windows.UI.Xaml.Input;`
`@@ -24,6 +23,7 @@`
`24`	`23`	`using Microsoft.Toolkit.Uwp.Helpers;`
`25`	`24`	`using Microsoft.Toolkit.Uwp.UI.Controls;`
`26`	`25`	`using Nito.AsyncEx;`
	`26`	`+using Windows.UI.Core;`
`27`	`27`
`28`	`28`	`namespace Mail.Pages`
`29`	`29`	`{`
`@@ -262,21 +262,15 @@ private async void ListDetailsView_Tapped(object sender, TappedRoutedEventArgs e`
`262`	`262`	`}`
`263`	`263`	`}`
`264`	`264`
`265`		`- private readonly Regex Rgx = new("cid:[^\"]+");`
`266`		`-`
`267`	`265`	`private async Task LoadImageAndCacheAsync(MailMessageListDetailViewModel model, WebView browser)`
`268`	`266`	`{`
`269`		`- var attachmentFileList = await Service.GetMailAttachmentFileAsync(model).ToListAsync();`
	`267`	`+ IReadOnlyList<MailMessageFileAttachmentData> attachmentFileList = await Service.GetMailAttachmentFileAsync(model).ToListAsync();`
`270`	`268`
`271`	`269`	`if (browser.DataContext is MailMessageListDetailViewModel context)`
`272`	`270`	`{`
`273`	`271`	`if (context.Id.Equals(model.Id))`
`274`	`272`	`{`
`275`		`- await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>`
`276`		`- browser.NavigateToString(ConvertContentTheme(`
`277`		`- Rgx.Replace(model.Content,`
`278`		`- Match => ReplaceHtmlInnerImageCidToBase64(Match, attachmentFileList)),`
`279`		`- model.ContentType == MailMessageContentType.Text)));`
	`273`	`+ browser.NavigateToString(ConvertContentTheme(new Regex("cid:[^\"]+").Replace(model.Content, Match => ReplaceHtmlInnerImageCidToBase64(Match, attachmentFileList)), model.ContentType == MailMessageContentType.Text));`
`280`	`274`	`}`
`281`	`275`	`}`
`282`	`276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,3 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Collections.ObjectModel;`
`4`		`-using System.Diagnostics;`
`5`		`-using System.IO;`
`6`		`-using System.Linq;`
`7`		`-using System.Runtime.CompilerServices;`
`8`		`-using System.Threading;`
`9`		`-using System.Threading.Tasks;`
`10`		`-using Windows.Storage;`
`11`		`-using Windows.Storage.FileProperties;`
`12`	`1`	`using CommunityToolkit.Authentication;`
`13`	`2`	`using Mail.Extensions.Graph;`
`14`	`3`	`using Mail.Models;`
`@@ -26,6 +15,17 @@`
`26`	`15`	`using Microsoft.IdentityModel.Tokens;`
`27`	`16`	`using Microsoft.Toolkit.Uwp.Helpers;`
`28`	`17`	`using Newtonsoft.Json;`
	`18`	`+using System;`
	`19`	`+using System.Collections.Generic;`
	`20`	`+using System.Collections.ObjectModel;`
	`21`	`+using System.Diagnostics;`
	`22`	`+using System.IO;`
	`23`	`+using System.Linq;`
	`24`	`+using System.Runtime.CompilerServices;`
	`25`	`+using System.Threading;`
	`26`	`+using System.Threading.Tasks;`
	`27`	`+using Windows.Storage;`
	`28`	`+using Windows.Storage.FileProperties;`
`29`	`29`
`30`	`30`	`namespace Mail.Services`
`31`	`31`	`{`
`@@ -114,7 +114,6 @@ async IAsyncEnumerable<MailMessageData> IMailService.IFocusFilterSupport.GetMail`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
`117`		`-`
`118`	`117`	`private async Task<MailMessageData> GenAndSaveMailMessageDataAsync(string RootFolderId, Message message,`
`119`	`118`	`string type = "Focused")`
`120`	`119`	`{`
`@@ -143,7 +142,7 @@ private async Task<MailMessageData> GenAndSaveMailMessageDataAsync(string RootFo`
`143`	`142`
`144`	`143`	`private GraphServiceClient GetClient() => Client ??= Provider.GetClient();`
`145`	`144`
`146`		`- private async Task<MailFolderCollectionResponse?> DefaultFolderTaskAsync(string name,`
	`145`	`+ private async Task DefaultFolderTaskAsync(string name,`
`147`	`146`	`CancellationToken CancellationToken)`
`148`	`147`	`{`
`149`	`148`	`try`
`@@ -164,10 +163,8 @@ private async Task<MailMessageData> GenAndSaveMailMessageDataAsync(string RootFo`
`164`	`163`	`}`
`165`	`164`	`catch (Exception e)`
`166`	`165`	`{`
`167`		`- Trace.WriteLine(e);`
	`166`	`+ Trace.WriteLine($"{nameof(DefaultFolderTaskAsync)}: {e}");`
`168`	`167`	`}`
`169`		`-`
`170`		`- return null;`
`171`	`168`	`}`
`172`	`169`
`173`	`170`	`public override async IAsyncEnumerable<MailFolderData> GetMailSuperFoldersAsync(`
`@@ -262,7 +259,6 @@ private async Task LoadMailChildFolderAsync(MailFolderData ParentMailFolder,`
`262`	`259`	`}`
`263`	`260`	`}`
`264`	`261`
`265`		`-`
`266`	`262`	`public override async Task<MailFolderData> GetMailFolderDetailAsync(string RootFolderId,`
`267`	`263`	`CancellationToken CancelToken = default)`
`268`	`264`	`{`
`@@ -478,7 +474,11 @@ public override async Task<bool> MailForwardAsync(MailMessageListDetailViewModel`
`478`	`474`	`if (message is null) return false;`
`479`	`475`
`480`	`476`	`await me.Messages[Model.Id].Forward.PostAsync(new ForwardPostRequestBody`
`481`		`- { ToRecipients = message.ToRecipients, Comment = ForwardContent });`
	`477`	`+ {`
	`478`	`+ Comment = ForwardContent,`
	`479`	`+ ToRecipients = message.ToRecipients`
	`480`	`+ });`
	`481`	`+`
`482`	`482`	`return true;`
`483`	`483`	`}`
`484`	`484`