Merge pull request #3262 from tidusjar/develop

Fixed issues with the RequestId Migration #3244 #3253 #3249

src/Ombi.Store/Context/Sqlite/ExternalSqliteContext.cs

@@ -1,4 +1,5 @@
 using System;
+using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 
 namespace Ombi.Store.Context.Sqlite
@@ -13,7 +14,13 @@ public ExternalSqliteContext(DbContextOptions<ExternalSqliteContext> options) :
             _created = true;
             Upgrade();
             Database.SetCommandTimeout(60);
-            Database.Migrate();
+            try
+            {
+                Database.Migrate();
+            }
+            catch (SqliteException e) when (e.Message.Equals("duplicate column name: RequestId"))
+            {
+            }
         }
 
 

src/Ombi.Store/Migration.txt

@@ -1,3 +1,3 @@
-dotnet ef migrations add Inital --context OmbiContext --startup-project ../Ombi/Ombi.csproj
+dotnet ef migrations add Inital --context OmbiSqliteContext --startup-project ../Ombi/Ombi.csproj
 
 If running migrations for any db provider other than Sqlite, then ensure the database.json is pointing at the correct DB type

src/Ombi.Store/Migrations/ExternalSqlite/20191113213617_RequestIdPatch.cs

@@ -0,0 +1,22 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Ombi.Store.Migrations.ExternalSqlite
+{
+    public partial class RequestIdPatch : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+            migrationBuilder.AddColumn<int>(
+                name: "RequestId",
+                table: "PlexServerContent",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

src/Ombi/ClientApp/app/login/login.component.ts

@@ -145,7 +145,7 @@ export class LoginComponent implements OnDestroy, OnInit {
                 this.pinTimer = setInterval(() => {
                     this.notify.info("Authenticating", "Loading... Please Wait");
                     this.getPinResult(x.pinId);
-                }, 3000);
+                }, 4000);
             });
         });
     }