From a404f45cccaae1a796b2389ceeed64931b41dc72 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 22 Dec 2021 09:16:47 +0800 Subject: [PATCH] 0.1.4 --- src/PhotoCollector/Data/AppDbContext.cs | 6 ++++++ src/PhotoCollector/Data/Photo.cs | 18 ++++++++++++++++++ src/PhotoCollector/MainForm.cs | 21 ++++++++++++++++----- src/PhotoCollector/PhotoCollector.csproj | 2 +- 4 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 src/PhotoCollector/Data/Photo.cs diff --git a/src/PhotoCollector/Data/AppDbContext.cs b/src/PhotoCollector/Data/AppDbContext.cs index b5a9828..1a0fb4d 100644 --- a/src/PhotoCollector/Data/AppDbContext.cs +++ b/src/PhotoCollector/Data/AppDbContext.cs @@ -12,6 +12,12 @@ namespace PhotoCollector.Data optionsBuilder.UseSqlite("Data Source=config.db"); } + protected override void OnModelCreating(ModelBuilder modelBuilder) + { + modelBuilder.Entity(); + modelBuilder.Entity(); + } + public static void Init() { using var db = new AppDbContext(); diff --git a/src/PhotoCollector/Data/Photo.cs b/src/PhotoCollector/Data/Photo.cs new file mode 100644 index 0000000..b961b32 --- /dev/null +++ b/src/PhotoCollector/Data/Photo.cs @@ -0,0 +1,18 @@ +using System.ComponentModel.DataAnnotations; + +namespace PhotoCollector.Data +{ + public class Photo + { + public Photo() + { + this.Key = Guid.NewGuid().ToString(); + } + + [Key] + public string Key { get; set; } + + public string Image { get; set; } + public string Path { get; set; } + } +} \ No newline at end of file diff --git a/src/PhotoCollector/MainForm.cs b/src/PhotoCollector/MainForm.cs index 9fbb8c5..c42a5fd 100644 --- a/src/PhotoCollector/MainForm.cs +++ b/src/PhotoCollector/MainForm.cs @@ -56,10 +56,10 @@ namespace PhotoCollector webView.CoreWebView2.Settings.AreDefaultContextMenusEnabled = false; webView.CoreWebView2.Settings.IsPinchZoomEnabled = false; webView.CoreWebView2.Settings.IsBuiltInErrorPageEnabled = false; -#if !DEBUG - webView.CoreWebView2.Settings.AreBrowserAcceleratorKeysEnabled = false; - webView.CoreWebView2.Settings.IsStatusBarEnabled = false; -#endif + //#if !DEBUG + // webView.CoreWebView2.Settings.AreBrowserAcceleratorKeysEnabled = false; + // webView.CoreWebView2.Settings.IsStatusBarEnabled = false; + //#endif webView.CoreWebView2.PermissionRequested += CoreWebView2_PermissionRequested; webView.CoreWebView2.Settings.UserAgent = $"{webView.CoreWebView2.Settings.UserAgent}|{AppContext.BaseDirectory}"; webView.CoreWebView2.WebMessageReceived += CoreWebView2_WebMessageReceived; @@ -68,10 +68,12 @@ namespace PhotoCollector await Program.WebHostStartAsync(); } } + public void Navigate(string url) { this.webView21.CoreWebView2.Navigate(url); } + private void AddEventHandler() { WebView2Interop.FuncList.Add("selectPath", o => @@ -145,8 +147,17 @@ namespace PhotoCollector { var file = o["file"]; Directory.CreateDirectory(Path.GetDirectoryName(file)); - File.WriteAllBytes(file, Convert.FromBase64String(o["base64"].Split(',')[1])); + var base64 = o["base64"].Split(',')[1]; + File.WriteAllBytes(file, Convert.FromBase64String(base64)); File.WriteAllText(file + ".meta", FileMd5(file)); + using var db = new AppDbContext(); + db.Set().Add(new Photo { Image = base64, Path = file }); + db.SaveChanges(); + //for (int i = 0; i < 10000; i++) + //{ + // db.Set().Add(new Photo { Image = base64, Path = file }); + // db.SaveChanges(); + //} } catch (Exception ex) { diff --git a/src/PhotoCollector/PhotoCollector.csproj b/src/PhotoCollector/PhotoCollector.csproj index e62276a..e7b6440 100644 --- a/src/PhotoCollector/PhotoCollector.csproj +++ b/src/PhotoCollector/PhotoCollector.csproj @@ -10,7 +10,7 @@ full True zh-Hans - 0.1.3 + 0.1.4