Add ef migration & fix code format (#40)

* bugfix and upgrade to v2.0.2.0. * Add ef migration & code format
nodew · Nov 1, 2024 · f734851 · f734851
1 parent 3f6baf4
commit f734851
Show file tree

Hide file tree

Showing 5 changed files with 250 additions and 17 deletions.
diff --git a/PocketClient.Core/Data/Migrations/20241101021855_OptionalAuthorUrl.Designer.cs b/PocketClient.Core/Data/Migrations/20241101021855_OptionalAuthorUrl.Designer.cs
diff --git a/PocketClient.Core/Data/Migrations/20241101021855_OptionalAuthorUrl.cs b/PocketClient.Core/Data/Migrations/20241101021855_OptionalAuthorUrl.cs
@@ -0,0 +1,36 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PocketClient.Core.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class OptionalAuthorUrl : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "Url",
+                table: "Authors",
+                type: "TEXT",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "TEXT");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "Url",
+                table: "Authors",
+                type: "TEXT",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "TEXT",
+                oldNullable: true);
+        }
+    }
+}
diff --git a/PocketClient.Core/Data/Migrations/PocketDbContextModelSnapshot.cs b/PocketClient.Core/Data/Migrations/PocketDbContextModelSnapshot.cs
@@ -15,7 +15,7 @@ partial class PocketDbContextModelSnapshot : ModelSnapshot
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "7.0.0");
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.10");
 
             modelBuilder.Entity("PocketClient.Core.Models.Author", b =>
                 {
@@ -28,7 +28,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT");
 
                     b.Property<string>("Url")
-                        .IsRequired()
                         .HasColumnType("TEXT");
 
                     b.HasKey("Id");

diff --git a/PocketClient.Desktop/Services/PocketDbService.cs b/PocketClient.Desktop/Services/PocketDbService.cs
@@ -125,20 +125,7 @@ public async Task SyncItemsAsync(bool fullSync = false, bool force = false)
                     Since = lastUpdatedAt,
                 };
 
-                List<PocketItem> items;
-
-                try 
-                {
-                    items = await _pocketClient.GetItemsAsync(filter, pageSize, page * pageSize);
-                }
-                catch (Exception ex)
-                {
-                    _syncing = false;
-                    _logger.LogError(ex, "Failed to get items from server");
-                    WeakReferenceMessenger.Default.Send(new SyncFailureMessage("Failed to get items from server", ex));
-                    return;
-                }
-
+                var items = await _pocketClient.GetItemsAsync(filter, pageSize, page * pageSize);
                 hasMoreItems = items.Count == pageSize;
                 count += items.Count;
                 page++;

diff --git a/PocketClient.Desktop/ViewModels/ItemsViewModel.cs b/PocketClient.Desktop/ViewModels/ItemsViewModel.cs
@@ -2,13 +2,13 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.UI.Dispatching;
 using PocketClient.Core.Contracts.Services;
 using PocketClient.Core.Models;
 using PocketClient.Core.Specifications;
 using PocketClient.Desktop.Contracts.ViewModels;
 using PocketClient.Desktop.Helpers;
 using PocketClient.Desktop.Models;
-using Microsoft.UI.Dispatching;
 
 namespace PocketClient.Desktop.ViewModels;