chore(release): 🚀 v4.49.3 [skip ci]

fix(plex-api): update Plex Watchlist URL

.github/workflows/automation-tests.yml

@@ -24,7 +24,7 @@ jobs:
       with:
         node-version: '18'
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: |
           '**/node_modules'

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
           node-version: '18'
 
       - name: NodeModules Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: '**/node_modules'
           key: node_modules-${{ hashFiles('**/yarn.lock') }}
@@ -27,7 +27,7 @@ jobs:
         run: yarn --cwd ./src/Ombi/ClientApp run build
 
       - name: Publish UI Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: angular_dist
           path: |
@@ -42,7 +42,7 @@ jobs:
           dotnet-version: '8.0.x'
 
       - name: Nuget Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -112,7 +112,7 @@ jobs:
           dotnet-version: '5.0.x'
 
       - name: Nuget Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -130,7 +130,7 @@ jobs:
         working-directory: src/Ombi
 
       - name: Download Angular
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: angular_dist
           path: ~/src/Ombi/dist
@@ -156,7 +156,7 @@ jobs:
           directory: 'src/Ombi/${{ matrix.os }}'
 
       - name: Publish Release
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}
           path: |
@@ -170,7 +170,7 @@ jobs:
 
       - name: Download Artifacts
         id: download
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
 

.github/workflows/chromatic.yml

@@ -17,7 +17,7 @@
 #           fetch-depth: 0
 
 #       - name: NodeModules Cache
-#         uses: actions/cache@v2
+#         uses: actions/cache@v4
 #         with:
 #           path: '**/node_modules'
 #           key: node_modules-${{ hashFiles('**/yarn.lock') }}

.github/workflows/pr.yml

@@ -20,7 +20,7 @@ jobs:
           node-version: '18'
 
       - name: NodeModules Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: '**/node_modules'
           key: node_modules-${{ hashFiles('**/yarn.lock') }}
@@ -41,7 +41,7 @@ jobs:
           dotnet-version: '8.0.x'
 
       - name: Nuget Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -101,7 +101,7 @@ jobs:
           dotnet-version: '8.0.x'
 
       - name: Nuget Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}

README.md

@@ -122,10 +122,10 @@ Here are some of the features Ombi has:
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/MattJeanes">
-            <img src="https://avatars.githubusercontent.com/u/2363642?v=4" width="50;" alt="MattJeanes"/>
+        <a href="https://github.com/AmyJeanes">
+            <img src="https://avatars.githubusercontent.com/u/2363642?v=4" width="50;" alt="AmyJeanes"/>
             <br />
-            <sub><b>Matt Jeanes</b></sub>
+            <sub><b>Amy Jeanes</b></sub>
         </a>
     </td>
     <td align="center">
@@ -301,8 +301,8 @@ Here are some of the features Ombi has:
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/deepwather">
-            <img src="https://avatars.githubusercontent.com/u/12274612?v=4" width="50;" alt="deepwather"/>
+        <a href="https://github.com/tuxmi">
+            <img src="https://avatars.githubusercontent.com/u/12274612?v=4" width="50;" alt="tuxmi"/>
             <br />
             <sub><b>Michael Reber</b></sub>
         </a>
@@ -659,10 +659,10 @@ Here are some of the features Ombi has:
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/Drewster727">
-            <img src="https://avatars.githubusercontent.com/u/4528753?v=4" width="50;" alt="Drewster727"/>
+        <a href="https://github.com/sussycatgirl">
+            <img src="https://avatars.githubusercontent.com/u/26145882?v=4" width="50;" alt="sussycatgirl"/>
             <br />
-            <sub><b>Drew</b></sub>
+            <sub><b>Lea</b></sub>
         </a>
     </td>
     <td align="center">
@@ -752,13 +752,20 @@ Here are some of the features Ombi has:
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/Alasano">
-            <img src="https://avatars.githubusercontent.com/u/14372930?v=4" width="50;" alt="Alasano"/>
+        <a href="https://github.com/alasano">
+            <img src="https://avatars.githubusercontent.com/u/14372930?v=4" width="50;" alt="alasano"/>
             <br />
             <sub><b>Aljosa Asanovic</b></sub>
         </a>
     </td></tr>
 <tr>
+    <td align="center">
+        <a href="https://github.com/AlexandrePicavet">
+            <img src="https://avatars.githubusercontent.com/u/25816980?v=4" width="50;" alt="AlexandrePicavet"/>
+            <br />
+            <sub><b>Alexandre Picavet</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/XanderStrike">
             <img src="https://avatars.githubusercontent.com/u/1565303?v=4" width="50;" alt="XanderStrike"/>
@@ -780,13 +787,6 @@ Here are some of the features Ombi has:
             <sub><b>Abe Kline</b></sub>
         </a>
     </td>
-    <td align="center">
-        <a href="https://github.com/sussycatgirl">
-            <img src="https://avatars.githubusercontent.com/u/26145882?v=4" width="50;" alt="sussycatgirl"/>
-            <br />
-            <sub><b>Lea</b></sub>
-        </a>
-    </td>
     <td align="center">
         <a href="https://github.com/kmlucy">
             <img src="https://avatars.githubusercontent.com/u/13952475?v=4" width="50;" alt="kmlucy"/>
@@ -901,6 +901,13 @@ Here are some of the features Ombi has:
             <br />
             <sub><b>Eli</b></sub>
         </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/Drewster727">
+            <img src="https://avatars.githubusercontent.com/u/4528753?v=4" width="50;" alt="Drewster727"/>
+            <br />
+            <sub><b>Drew</b></sub>
+        </a>
     </td></tr>
 </table>
 <!-- readme: collaborators,contributors -end -->

src/.idea/.idea.Ombi/.idea/dbnavigator.xml

@@ -0,0 +1,440 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DBNavigator.Project.DDLFileAttachmentManager">
+    <mappings />
+    <preferences />
+  </component>
+  <component name="DBNavigator.Project.DatabaseAssistantManager">
+    <assistants />
+  </component>
+  <component name="DBNavigator.Project.DatabaseBrowserManager">
+    <autoscroll-to-editor value="false" />
+    <autoscroll-from-editor value="true" />
+    <show-object-properties value="true" />
+    <loaded-nodes />
+  </component>
+  <component name="DBNavigator.Project.DatabaseFileManager">
+    <open-files />
+  </component>
+  <component name="DBNavigator.Project.ExecutionManager">
+    <retain-sticky-names value="false" />
+  </component>
+  <component name="DBNavigator.Project.ParserDiagnosticsManager">
+    <diagnostics-history />
+  </component>
+  <component name="DBNavigator.Project.Settings">
+    <connections />
+    <browser-settings>
+      <general>
+        <display-mode value="TABBED" />
+        <navigation-history-size value="100" />
+        <show-object-details value="false" />
+        <enable-sticky-paths value="true" />
+      </general>
+      <filters>
+        <object-type-filter>
+          <object-type name="SCHEMA" enabled="true" />
+          <object-type name="USER" enabled="true" />
+          <object-type name="ROLE" enabled="true" />
+          <object-type name="PRIVILEGE" enabled="true" />
+          <object-type name="CHARSET" enabled="true" />
+          <object-type name="TABLE" enabled="true" />
+          <object-type name="VIEW" enabled="true" />
+          <object-type name="MATERIALIZED_VIEW" enabled="true" />
+          <object-type name="NESTED_TABLE" enabled="true" />
+          <object-type name="COLUMN" enabled="true" />
+          <object-type name="INDEX" enabled="true" />
+          <object-type name="CONSTRAINT" enabled="true" />
+          <object-type name="DATASET_TRIGGER" enabled="true" />
+          <object-type name="DATABASE_TRIGGER" enabled="true" />
+          <object-type name="SYNONYM" enabled="true" />
+          <object-type name="SEQUENCE" enabled="true" />
+          <object-type name="PROCEDURE" enabled="true" />
+          <object-type name="FUNCTION" enabled="true" />
+          <object-type name="PACKAGE" enabled="true" />
+          <object-type name="TYPE" enabled="true" />
+          <object-type name="TYPE_ATTRIBUTE" enabled="true" />
+          <object-type name="ARGUMENT" enabled="true" />
+          <object-type name="JAVA_CLASS" enabled="true" />
+          <object-type name="JAVA_INNER_CLASS" enabled="true" />
+          <object-type name="JAVA_FIELD" enabled="true" />
+          <object-type name="JAVA_METHOD" enabled="true" />
+          <object-type name="DIMENSION" enabled="true" />
+          <object-type name="CLUSTER" enabled="true" />
+          <object-type name="DBLINK" enabled="true" />
+          <object-type name="CREDENTIAL" enabled="true" />
+          <object-type name="AI_PROFILE" enabled="true" />
+        </object-type-filter>
+      </filters>
+      <sorting>
+        <object-type name="COLUMN" sorting-type="NAME" />
+        <object-type name="FUNCTION" sorting-type="NAME" />
+        <object-type name="PROCEDURE" sorting-type="NAME" />
+        <object-type name="ARGUMENT" sorting-type="POSITION" />
+        <object-type name="TYPE ATTRIBUTE" sorting-type="POSITION" />
+      </sorting>
+      <default-editors>
+        <object-type name="VIEW" editor-type="SELECTION" />
+        <object-type name="PACKAGE" editor-type="SELECTION" />
+        <object-type name="TYPE" editor-type="SELECTION" />
+      </default-editors>
+    </browser-settings>
+    <navigation-settings>
+      <lookup-filters>
+        <lookup-objects>
+          <object-type name="SCHEMA" enabled="true" />
+          <object-type name="USER" enabled="false" />
+          <object-type name="ROLE" enabled="false" />
+          <object-type name="PRIVILEGE" enabled="false" />
+          <object-type name="CHARSET" enabled="false" />
+          <object-type name="TABLE" enabled="true" />
+          <object-type name="VIEW" enabled="true" />
+          <object-type name="MATERIALIZED VIEW" enabled="true" />
+          <object-type name="INDEX" enabled="true" />
+          <object-type name="CONSTRAINT" enabled="true" />
+          <object-type name="DATASET TRIGGER" enabled="true" />
+          <object-type name="DATABASE TRIGGER" enabled="true" />
+          <object-type name="SYNONYM" enabled="false" />
+          <object-type name="SEQUENCE" enabled="true" />
+          <object-type name="PROCEDURE" enabled="true" />
+          <object-type name="FUNCTION" enabled="true" />
+          <object-type name="PACKAGE" enabled="true" />
+          <object-type name="TYPE" enabled="true" />
+          <object-type name="JAVA CLASS" enabled="true" />
+          <object-type name="INNER CLASS" enabled="true" />
+          <object-type name="JAVA FIELD" enabled="true" />
+          <object-type name="JAVA METHOD" enabled="true" />
+          <object-type name="JAVA PARAMETER" enabled="true" />
+          <object-type name="DIMENSION" enabled="false" />
+          <object-type name="CLUSTER" enabled="false" />
+          <object-type name="DBLINK" enabled="false" />
+          <object-type name="CREDENTIAL" enabled="false" />
+        </lookup-objects>
+        <force-database-load value="false" />
+        <prompt-connection-selection value="true" />
+        <prompt-schema-selection value="true" />
+      </lookup-filters>
+    </navigation-settings>
+    <dataset-grid-settings>
+      <general>
+        <enable-zooming value="true" />
+        <enable-column-tooltip value="true" />
+      </general>
+      <sorting>
+        <nulls-first value="true" />
+        <max-sorting-columns value="4" />
+      </sorting>
+      <audit-columns>
+        <column-names value="" />
+        <visible value="true" />
+        <editable value="false" />
+      </audit-columns>
+    </dataset-grid-settings>
+    <dataset-editor-settings>
+      <text-editor-popup>
+        <active value="false" />
+        <active-if-empty value="false" />
+        <data-length-threshold value="100" />
+        <popup-delay value="1000" />
+      </text-editor-popup>
+      <values-actions-popup>
+        <show-popup-button value="true" />
+        <element-count-threshold value="1000" />
+        <data-length-threshold value="250" />
+      </values-actions-popup>
+      <general>
+        <fetch-block-size value="100" />
+        <fetch-timeout value="30" />
+        <trim-whitespaces value="true" />
+        <convert-empty-strings-to-null value="true" />
+        <select-content-on-cell-edit value="true" />
+        <large-value-preview-active value="true" />
+      </general>
+      <filters>
+        <prompt-filter-dialog value="true" />
+        <default-filter-type value="BASIC" />
+      </filters>
+      <qualified-text-editor text-length-threshold="300">
+        <content-types>
+          <content-type name="Text" enabled="true" />
+          <content-type name="Properties" enabled="true" />
+          <content-type name="XML" enabled="true" />
+          <content-type name="DTD" enabled="true" />
+          <content-type name="HTML" enabled="true" />
+          <content-type name="XHTML" enabled="true" />
+          <content-type name="CSS" enabled="true" />
+          <content-type name="SQL" enabled="true" />
+          <content-type name="PL/SQL" enabled="true" />
+          <content-type name="JavaScript" enabled="true" />
+          <content-type name="JSON" enabled="true" />
+          <content-type name="JSON5" enabled="true" />
+          <content-type name="YAML" enabled="true" />
+          <content-type name="C#" enabled="true" />
+        </content-types>
+      </qualified-text-editor>
+      <record-navigation>
+        <navigation-target value="VIEWER" />
+      </record-navigation>
+    </dataset-editor-settings>
+    <code-editor-settings>
+      <general>
+        <show-object-navigation-gutter value="false" />
+        <show-spec-declaration-navigation-gutter value="true" />
+        <enable-spellchecking value="true" />
+        <enable-reference-spellchecking value="false" />
+      </general>
+      <confirmations>
+        <save-changes value="false" />
+        <revert-changes value="true" />
+        <exit-on-changes value="ASK" />
+      </confirmations>
+    </code-editor-settings>
+    <code-completion-settings>
+      <filters>
+        <basic-filter>
+          <filter-element type="RESERVED_WORD" id="keyword" selected="true" />
+          <filter-element type="RESERVED_WORD" id="function" selected="true" />
+          <filter-element type="RESERVED_WORD" id="parameter" selected="true" />
+          <filter-element type="RESERVED_WORD" id="datatype" selected="true" />
+          <filter-element type="RESERVED_WORD" id="exception" selected="true" />
+          <filter-element type="OBJECT" id="schema" selected="true" />
+          <filter-element type="OBJECT" id="role" selected="true" />
+          <filter-element type="OBJECT" id="user" selected="true" />
+          <filter-element type="OBJECT" id="privilege" selected="true" />
+          <user-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="false" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </user-schema>
+          <public-schema>
+            <filter-element type="OBJECT" id="table" selected="false" />
+            <filter-element type="OBJECT" id="view" selected="false" />
+            <filter-element type="OBJECT" id="materialized view" selected="false" />
+            <filter-element type="OBJECT" id="index" selected="false" />
+            <filter-element type="OBJECT" id="constraint" selected="false" />
+            <filter-element type="OBJECT" id="trigger" selected="false" />
+            <filter-element type="OBJECT" id="synonym" selected="false" />
+            <filter-element type="OBJECT" id="sequence" selected="false" />
+            <filter-element type="OBJECT" id="procedure" selected="false" />
+            <filter-element type="OBJECT" id="function" selected="false" />
+            <filter-element type="OBJECT" id="package" selected="false" />
+            <filter-element type="OBJECT" id="type" selected="false" />
+            <filter-element type="OBJECT" id="dimension" selected="false" />
+            <filter-element type="OBJECT" id="cluster" selected="false" />
+            <filter-element type="OBJECT" id="dblink" selected="false" />
+          </public-schema>
+          <any-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </any-schema>
+        </basic-filter>
+        <extended-filter>
+          <filter-element type="RESERVED_WORD" id="keyword" selected="true" />
+          <filter-element type="RESERVED_WORD" id="function" selected="true" />
+          <filter-element type="RESERVED_WORD" id="parameter" selected="true" />
+          <filter-element type="RESERVED_WORD" id="datatype" selected="true" />
+          <filter-element type="RESERVED_WORD" id="exception" selected="true" />
+          <filter-element type="OBJECT" id="schema" selected="true" />
+          <filter-element type="OBJECT" id="user" selected="true" />
+          <filter-element type="OBJECT" id="role" selected="true" />
+          <filter-element type="OBJECT" id="privilege" selected="true" />
+          <user-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </user-schema>
+          <public-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </public-schema>
+          <any-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </any-schema>
+        </extended-filter>
+      </filters>
+      <sorting enabled="true">
+        <sorting-element type="RESERVED_WORD" id="keyword" />
+        <sorting-element type="RESERVED_WORD" id="datatype" />
+        <sorting-element type="OBJECT" id="column" />
+        <sorting-element type="OBJECT" id="table" />
+        <sorting-element type="OBJECT" id="view" />
+        <sorting-element type="OBJECT" id="materialized view" />
+        <sorting-element type="OBJECT" id="index" />
+        <sorting-element type="OBJECT" id="constraint" />
+        <sorting-element type="OBJECT" id="trigger" />
+        <sorting-element type="OBJECT" id="synonym" />
+        <sorting-element type="OBJECT" id="sequence" />
+        <sorting-element type="OBJECT" id="procedure" />
+        <sorting-element type="OBJECT" id="function" />
+        <sorting-element type="OBJECT" id="package" />
+        <sorting-element type="OBJECT" id="type" />
+        <sorting-element type="OBJECT" id="dimension" />
+        <sorting-element type="OBJECT" id="cluster" />
+        <sorting-element type="OBJECT" id="dblink" />
+        <sorting-element type="OBJECT" id="schema" />
+        <sorting-element type="OBJECT" id="role" />
+        <sorting-element type="OBJECT" id="user" />
+        <sorting-element type="RESERVED_WORD" id="function" />
+        <sorting-element type="RESERVED_WORD" id="parameter" />
+      </sorting>
+      <format>
+        <enforce-code-style-case value="true" />
+      </format>
+    </code-completion-settings>
+    <execution-engine-settings>
+      <statement-execution>
+        <fetch-block-size value="100" />
+        <execution-timeout value="20" />
+        <debug-execution-timeout value="600" />
+        <focus-result value="false" />
+        <prompt-execution value="false" />
+      </statement-execution>
+      <script-execution>
+        <command-line-interfaces />
+        <execution-timeout value="300" />
+      </script-execution>
+      <method-execution>
+        <execution-timeout value="30" />
+        <debug-execution-timeout value="600" />
+        <parameter-history-size value="10" />
+      </method-execution>
+    </execution-engine-settings>
+    <operation-settings>
+      <transactions>
+        <uncommitted-changes>
+          <on-project-close value="ASK" />
+          <on-disconnect value="ASK" />
+          <on-autocommit-toggle value="ASK" />
+        </uncommitted-changes>
+        <multiple-uncommitted-changes>
+          <on-commit value="ASK" />
+          <on-rollback value="ASK" />
+        </multiple-uncommitted-changes>
+      </transactions>
+      <session-browser>
+        <disconnect-session value="ASK" />
+        <kill-session value="ASK" />
+        <reload-on-filter-change value="false" />
+      </session-browser>
+      <compiler>
+        <compile-type value="KEEP" />
+        <compile-dependencies value="ASK" />
+        <always-show-controls value="false" />
+      </compiler>
+    </operation-settings>
+    <ddl-file-settings>
+      <extensions>
+        <mapping file-type-id="VIEW" extensions="vw" />
+        <mapping file-type-id="TRIGGER" extensions="trg" />
+        <mapping file-type-id="PROCEDURE" extensions="prc" />
+        <mapping file-type-id="FUNCTION" extensions="fnc" />
+        <mapping file-type-id="PACKAGE" extensions="pkg" />
+        <mapping file-type-id="PACKAGE_SPEC" extensions="pks" />
+        <mapping file-type-id="PACKAGE_BODY" extensions="pkb" />
+        <mapping file-type-id="TYPE" extensions="tpe" />
+        <mapping file-type-id="TYPE_SPEC" extensions="tps" />
+        <mapping file-type-id="TYPE_BODY" extensions="tpb" />
+        <mapping file-type-id="JAVA_SOURCE" extensions="sql" />
+      </extensions>
+      <general>
+        <lookup-ddl-files value="true" />
+        <create-ddl-files value="false" />
+        <synchronize-ddl-files value="true" />
+        <use-qualified-names value="false" />
+        <make-scripts-rerunnable value="true" />
+      </general>
+    </ddl-file-settings>
+    <assistant-settings>
+      <credential-settings>
+        <credentials />
+      </credential-settings>
+    </assistant-settings>
+    <general-settings>
+      <regional-settings>
+        <date-format value="MEDIUM" />
+        <number-format value="UNGROUPED" />
+        <locale value="SYSTEM_DEFAULT" />
+        <use-custom-formats value="false" />
+      </regional-settings>
+      <environment>
+        <environment-types>
+          <environment-type id="development" name="Development" description="Development environment" color="-2430209/-12296320" readonly-code="false" readonly-data="false" />
+          <environment-type id="integration" name="Integration" description="Integration environment" color="-2621494/-12163514" readonly-code="true" readonly-data="false" />
+          <environment-type id="production" name="Production" description="Productive environment" color="-11574/-10271420" readonly-code="true" readonly-data="true" />
+          <environment-type id="other" name="Other" description="" color="-1576/-10724543" readonly-code="false" readonly-data="false" />
+        </environment-types>
+        <visibility-settings>
+          <connection-tabs value="true" />
+          <dialog-headers value="true" />
+          <object-editor-tabs value="true" />
+          <script-editor-tabs value="false" />
+          <execution-result-tabs value="true" />
+        </visibility-settings>
+      </environment>
+    </general-settings>
+  </component>
+</project>

src/.idea/.idea.Ombi/.idea/indexLayout.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ContentModelUserStore">
+  <component name="UserContentModel">
     <attachedFolders />
     <explicitIncludes />
     <explicitExcludes />

src/.idea/.idea.Ombi/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.Ombi/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.Ombi/riderModule.iml" />
-    </modules>
-  </component>
-</project>

src/.idea/.idea.Ombi/.idea/projectSettingsUpdater.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RiderProjectSettingsUpdater">
+    <option name="singleClickDiffPreview" value="1" />
+    <option name="vcsConfiguration" value="3" />
+  </component>
+</project>

src/.idea/.idea.Ombi/.idea/workspace.xml

@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="57001998-efde-494a-80b3-d7acfc91f770" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/Ombi.Core/Engine/Interfaces/IMusicSearchEngineV2.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Ombi.Core/Engine/V2/MusicSearchEngineV2.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Ombi.Core/Models/Search/V2/Music/ArtistInformation.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/.idea.Ombi/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Ombi/.idea/contentModel.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/.idea.Ombi/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Ombi/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/config/applicationhost.config" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/config/applicationhost.config" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Ombi.Api.MusicBrainz/Models/Artist/ArtistInformation.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi.Api.MusicBrainz/Models/Artist/ArtistInformation.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Ombi.DependencyInjection/IocExtensions.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi.DependencyInjection/IocExtensions.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Ombi/ClientApp/src/app/media-details/components/artist/artist-details.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi/ClientApp/src/app/media-details/components/artist/artist-details.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Ombi/ClientApp/src/app/services/searchV2.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi/ClientApp/src/app/services/searchV2.service.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Ombi/Controllers/V2/SearchController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi/Controllers/V2/SearchController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Ombi/ClientApp/src/app/settings/plex/plex.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi/ClientApp/src/app/settings/plex/plex.component.html" afterDir="false" />
     </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="DpaMonitoringSettings">
+    <option name="firstShow" value="false" />
+  </component>
   <component name="FileEditorManager">
     <leaf>
       <file pinned="false" current-in-tab="false">
@@ -237,27 +232,75 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
   </component>
+  <component name="GitHubPullRequestSearchHistory">{
+  &quot;lastFilter&quot;: {
+    &quot;state&quot;: &quot;OPEN&quot;,
+    &quot;assignee&quot;: &quot;tidusjar&quot;
+  }
+}</component>
+  <component name="GitToolBoxStore">
+    <option name="recentBranches">
+      <RecentBranches>
+        <option name="branchesForRepo">
+          <list>
+            <RecentBranchesForRepo>
+              <option name="branches">
+                <list>
+                  <RecentBranch>
+                    <option name="branchName" value="wizard-database" />
+                    <option name="lastUsedInstant" value="1735917525" />
+                  </RecentBranch>
+                  <RecentBranch>
+                    <option name="branchName" value="develop" />
+                    <option name="lastUsedInstant" value="1735917524" />
+                  </RecentBranch>
+                </list>
+              </option>
+              <option name="repositoryRootUrl" value="file://$PROJECT_DIR$/.." />
+            </RecentBranchesForRepo>
+          </list>
+        </option>
+      </RecentBranches>
+    </option>
+  </component>
+  <component name="GithubProjectSettings">
+    <option name="branchProtectionPatterns">
+      <list>
+        <option value="master" />
+        <option value="develop" />
+      </list>
+    </option>
+  </component>
+  <component name="GithubPullRequestsUISettings">{
+  &quot;selectedUrlAndAccountId&quot;: {
+    &quot;url&quot;: &quot;https://github.com/ombi-app/ombi&quot;,
+    &quot;accountId&quot;: &quot;22dd09fe-fb9e-48a4-bfcc-3c152edf3f25&quot;
+  }
+}</component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/Ombi.Helpers.Tests/EmbyHelperTests.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Api.MusicBrainz/MusicBrainzApi.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Schedule.Tests/OmbiQuartzTests.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Api.MusicBrainz/Models/Artist/ArtistInformation.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi/Controllers/V2/SearchController.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.DependencyInjection/IocExtensions.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/V2/IMultiSearchEngine.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/990126b794024fe2bd16aebdd37eba1d7b600/93/25662f04/ServerVersion.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/3bd4df5aff92cabbc4d630be64227073db1b8539b3a1e47786b4b189d7cdb7/DbContext.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/449b441523c469ed34ff5a5e14f0bafcd8f097aa463655303dc19048fa44ac3/EntityFrameworkServiceCollectionExtensions.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/7d81b2d4f22bee75e5438c707251ae43cb0974c207db91ffc159118c84b4eb9/ServiceProvider.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/a424e6912048b4cd25715f158e789aae24db5c2911d9e622d39bc6ac3246c6/MySqlConnectionStringBuilder.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/bd1d5c50194fea68ff3559c160230b0ab50f5acf4ce3061bffd6d62958e2182/ExceptionDispatchInfo.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/e9881a453a581134c1a18331ac1f8f1201a5382a685bf2a40777fa22619/DbContextOptions`.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Ombi.Api.MusicBrainz/IMusicBrainzApi.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Api.MusicBrainz/MusicBrainzApi.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/Interfaces/IMusicSearchEngineV2.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Core/Models/Search/V2/Music/ArtistInformation.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/V2/MusicSearchEngineV2.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/RecentlyAddedEngine.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi/Controllers/V1/TokenController.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/MusicSearchEngine.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi/Program.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/RecentlyAddedEngine.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/UserStatsEngine.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/V2/IMultiSearchEngine.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/V2/MusicSearchEngineV2.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Core/Models/Search/V2/Music/ArtistInformation.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.DependencyInjection/IocExtensions.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Helpers.Tests/EmbyHelperTests.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Schedule.Tests/OmbiQuartzTests.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi/Controllers/V1/TokenController.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi/Controllers/V2/SearchController.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi/Program.cs" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
@@ -275,12 +318,17 @@
   <component name="PackageJsonUpdateNotifier">
     <dismissed value="$PROJECT_DIR$/Ombi/ClientApp/package.json" />
   </component>
+  <component name="ProjectColorInfo">{
+  &quot;customColor&quot;: &quot;&quot;,
+  &quot;associatedIndex&quot;: 0
+}</component>
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="1087" />
     <option name="y" value="-1113" />
     <option name="width" value="1400" />
     <option name="height" value="1000" />
   </component>
+  <component name="ProjectId" id="2wGwbN5gDqLwyiO1WJdlwJzZ5M9" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
   </component>
@@ -343,27 +391,26 @@
       <pane id="FileSystemExplorer" />
     </panes>
   </component>
-  <component name="PropertiesComponent">
-    <property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="Rider.DefaultBreakpoints.AreToggled" value="true" />
-    <property name="Rider.ProjectViewActivator.IsNotFirstRun" value="true" />
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="nodejs_package_manager_path" value="npm" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager" selected=".NET Launch Settings Profile.Ombi: IIS Express">
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    ".NET Launch Settings Profile.Ombi.Schedule.Tests.executor": "Run",
+    ".NET Launch Settings Profile.Ombi.executor": "Debug",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "fb34c741-04ca-4b4f-8ea1-651a011b42c8.executor": "Debug",
+    "git-widget-placeholder": "watchlist-expired-notification",
+    "node.js.detected.package.eslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "yarn",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
+  <component name="RunManager" selected=".NET Launch Settings Profile.Ombi">
     <configuration name="Ombi" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
       <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/Ombi/Ombi.csproj" />
       <option name="LAUNCH_PROFILE_TFM" value=".NETCoreApp,Version=v2.2" />
@@ -376,7 +423,7 @@
       <option name="SEND_DEBUG_REQUEST" value="1" />
       <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
       <method v="2">
-        <option name="Build" enabled="true" />
+        <option name="Build" />
       </method>
     </configuration>
     <configuration name="Ombi: IIS Express" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
@@ -391,7 +438,7 @@
       <option name="SEND_DEBUG_REQUEST" value="1" />
       <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
       <method v="2">
-        <option name="Build" enabled="true" />
+        <option name="Build" />
       </method>
     </configuration>
     <configuration name="Ombi.Schedule.Tests" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
@@ -406,7 +453,7 @@
       <option name="SEND_DEBUG_REQUEST" value="1" />
       <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
       <method v="2">
-        <option name="Build" enabled="true" />
+        <option name="Build" />
       </method>
     </configuration>
     <configuration name="Ombi.Schedule.Tests: IIS Express" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
@@ -421,7 +468,7 @@
       <option name="SEND_DEBUG_REQUEST" value="1" />
       <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
       <method v="2">
-        <option name="Build" enabled="true" />
+        <option name="Build" />
       </method>
     </configuration>
     <configuration name="Ombi.Updater" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
@@ -436,10 +483,11 @@
       <option name="SEND_DEBUG_REQUEST" value="1" />
       <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
       <method v="2">
-        <option name="Build" enabled="true" />
+        <option name="Build" />
       </method>
     </configuration>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="57001998-efde-494a-80b3-d7acfc91f770" name="Default Changelist" comment="" />
@@ -448,6 +496,9 @@
       <option name="presentableId" value="Default" />
       <updated>1563957157468</updated>
       <workItem from="1563957162999" duration="5401000" />
+      <workItem from="1745681294313" duration="1814000" />
+      <workItem from="1747080279165" duration="838000" />
+      <workItem from="1747082180432" duration="1994000" />
     </task>
     <servers />
   </component>
@@ -493,7 +544,11 @@
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="3" />
+  </component>
+  <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
+  <component name="VcsManagerConfiguration">
+    <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -505,7 +560,7 @@
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
           <url>file://$PROJECT_DIR$/Ombi/Controllers/V1/TokenController.cs</url>
           <line>48</line>
-          <properties documentPath="$PROJECT_DIR$/Ombi/Controllers/V1/TokenController.cs" initialLine="48">
+          <properties documentPath="$PROJECT_DIR$/Ombi/Controllers/V1/TokenController.cs">
             <startOffsets>
               <option value="1518" />
             </startOffsets>
@@ -518,12 +573,12 @@
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
           <url>file://$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs</url>
           <line>59</line>
-          <properties documentPath="$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs" initialLine="59">
+          <properties documentPath="$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs" containingFunctionPresentation="Method 'MultiSearch'">
             <startOffsets>
-              <option value="2276" />
+              <option value="2369" />
             </startOffsets>
             <endOffsets>
-              <option value="2316" />
+              <option value="2576" />
             </endOffsets>
           </properties>
           <option name="timeStamp" value="4" />
@@ -531,12 +586,12 @@
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
           <url>file://$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs</url>
           <line>49</line>
-          <properties documentPath="$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs" initialLine="49">
+          <properties documentPath="$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs" containingFunctionPresentation="Method 'MultiSearch'">
             <startOffsets>
-              <option value="2001" />
+              <option value="1903" />
             </startOffsets>
             <endOffsets>
-              <option value="2002" />
+              <option value="1945" />
             </endOffsets>
           </properties>
           <option name="timeStamp" value="5" />
@@ -544,16 +599,55 @@
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
           <url>file://$PROJECT_DIR$/Ombi.Api.MusicBrainz/MusicBrainzApi.cs</url>
           <line>30</line>
-          <properties documentPath="$PROJECT_DIR$/Ombi.Api.MusicBrainz/MusicBrainzApi.cs" initialLine="30">
+          <properties documentPath="$PROJECT_DIR$/Ombi.Api.MusicBrainz/MusicBrainzApi.cs" containingFunctionPresentation="Method 'SearchArtist'">
             <startOffsets>
-              <option value="917" />
+              <option value="833" />
             </startOffsets>
             <endOffsets>
-              <option value="1016" />
+              <option value="834" />
             </endOffsets>
           </properties>
           <option name="timeStamp" value="7" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="DotNet Breakpoints">
+          <url>file://$PROJECT_DIR$/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs</url>
+          <line>110</line>
+          <properties documentPath="$PROJECT_DIR$/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs" containingFunctionPresentation="Method 'Execute'">
+            <startOffsets>
+              <option value="5123" />
+            </startOffsets>
+            <endOffsets>
+              <option value="5206" />
+            </endOffsets>
+          </properties>
+          <option name="timeStamp" value="10" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DotNet Breakpoints">
+          <url>file://$PROJECT_DIR$/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs</url>
+          <line>77</line>
+          <properties documentPath="$PROJECT_DIR$/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs" containingFunctionPresentation="Method 'Execute'">
+            <startOffsets>
+              <option value="3324" />
+            </startOffsets>
+            <endOffsets>
+              <option value="3365" />
+            </endOffsets>
+          </properties>
+          <option name="timeStamp" value="11" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DotNet Breakpoints">
+          <url>file://$PROJECT_DIR$/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs</url>
+          <line>100</line>
+          <properties documentPath="$PROJECT_DIR$/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs" containingFunctionPresentation="Method 'Execute'">
+            <startOffsets>
+              <option value="4602" />
+            </startOffsets>
+            <endOffsets>
+              <option value="4636" />
+            </endOffsets>
+          </properties>
+          <option name="timeStamp" value="12" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>

src/.idea/.idea.Ombi/riderModule.iml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RIDER_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$USER_HOME$/.nuget/packages/microsoft.net.test.sdk/16.0.1/build/netcoreapp1.0" />
-    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.13.0/build/netcoreapp1.0/NUnit3.TestAdapter.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.13.0/build/netcoreapp1.0/NUnit3.TestAdapter.pdb" />
-    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.13.0/build/netcoreapp1.0/nunit.engine.netstandard.dll" />
-    <content url="file://$MODULE_DIR$/../../../CHANGELOG.md" />
-    <content url="file://$MODULE_DIR$/../../../appveyor.yml" />
-    <content url="file://$MODULE_DIR$/../../../build.cake" />
-    <content url="file://$MODULE_DIR$/../.." />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

src/.vscode/tasks.json

@@ -1,22 +1,31 @@
 {
-    "version": "0.1.0",
+    "version": "2.0.0",
     "command": "dotnet",
-    "isShellCommand": true,
     "args": [],
     "tasks": [
         {
-            "taskName": "build",
+            "label": "build",
+            "type": "shell",
+            "command": "dotnet",
             "args": [
+                "build",
                 "${workspaceRoot}/Ombi/Ombi.csproj"
             ],
-            "isBuildCommand": true,
-            "problemMatcher": "$msCompile"
+            "problemMatcher": "$msCompile",
+            "group": {
+                "_id": "build",
+                "isDefault": false
+            }
         },
         {
-            "taskName": "lint",
+            "label": "lint",
+            "type": "shell",
             "command": "npm",
-            "isShellCommand": true,
-            "args": ["run", "lint"]
+            "args": [
+                "run",
+                "lint"
+            ],
+            "problemMatcher": []
         }
     ]
 }

src/Ombi.Api.Plex/IPlexApi.cs

@@ -29,5 +29,6 @@ namespace Ombi.Api.Plex
         Task<PlexAddWrapper> AddUser(string emailAddress, string serverId, string authToken, int[] libs);
         Task<PlexWatchlistContainer> GetWatchlist(string plexToken, CancellationToken cancellationToken);
         Task<PlexWatchlistMetadataContainer> GetWatchlistMetadata(string ratingKey, string plexToken, CancellationToken cancellationToken);
+        Task<bool> Ping(string authToken, CancellationToken cancellationToken = default);
     }
 }

src/Ombi.Api.Plex/Models/Friends/PlexFriends.cs

@@ -22,6 +22,18 @@ namespace Ombi.Api.Plex.Models.Friends
         /// </summary>
         [XmlAttribute(AttributeName = "home")]
         public bool HomeUser { get; set; }
+        
+        [XmlElement(ElementName = "Server")]
+        public PlexUserServer[] Server { get; set; }
+    }
+
+    public class PlexUserServer
+    {
+        [XmlAttribute(AttributeName = "id")]
+        public string Id { get; set; }
+        
+        [XmlAttribute(AttributeName = "serverId")]
+        public string ServerId { get; set; }
     }
 
     [XmlRoot(ElementName = "MediaContainer")]

src/Ombi.Api.Plex/PlexApi.cs

@@ -68,7 +68,7 @@ namespace Ombi.Api.Plex
         private const string FriendsUri = "https://plex.tv/api/users"; 
         private const string GetAccountUri = "https://plex.tv/users/account.json";
         private const string ServerUri = "https://plex.tv/pms/servers.xml";
-        private const string WatchlistUri = "https://metadata.provider.plex.tv/";
+        private const string WatchlistUri = "https://discover.provider.plex.tv/";
 
         /// <summary>
         /// Sign into the Plex API
@@ -320,6 +320,30 @@ namespace Ombi.Api.Plex
             return result;
         }
 
+        /// <summary>
+        /// Pings the Plex API to validate if a token is still valid
+        /// </summary>
+        /// <param name="authToken">The authentication token to validate</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <returns>True if the token is valid, false otherwise</returns>
+        public async Task<bool> Ping(string authToken, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                var request = new Request("api/v2/ping", "https://plex.tv/", HttpMethod.Get);
+                await AddHeaders(request, authToken);
+                
+                // We don't need to parse the response, just check if the request succeeds
+                await Api.Request(request, cancellationToken);
+                return true;
+            }
+            catch
+            {
+                // If the request fails (401, 403, etc.), the token is invalid
+                return false;
+            }
+        }
+
 
         /// <summary>
         /// Adds the required headers and also the authorization header

src/Ombi.Core/Authentication/PlexTokenKeepAliveService.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Ombi.Api.Plex;
+
+namespace Ombi.Core.Authentication
+{
+    public interface IPlexTokenKeepAliveService
+    {
+        Task<bool> KeepTokenAliveAsync(string token, CancellationToken cancellationToken);
+    }
+
+    public class PlexTokenKeepAliveService : IPlexTokenKeepAliveService
+    {
+        private readonly IPlexApi _plexApi;
+        private readonly ILogger<PlexTokenKeepAliveService> _logger;
+
+        public PlexTokenKeepAliveService(IPlexApi plexApi, ILogger<PlexTokenKeepAliveService> logger)
+        {
+            _plexApi = plexApi;
+            _logger = logger;
+        }
+
+        public async Task<bool> KeepTokenAliveAsync(string token, CancellationToken cancellationToken)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(token))
+                {
+                    _logger.LogWarning("Token is null or empty");
+                    return false;
+                }
+
+                // Use the Ping method to validate the token
+                var isValid = await _plexApi.Ping(token, cancellationToken);
+                
+                if (!isValid)
+                {
+                    _logger.LogWarning("Token validation failed - token may be expired or invalid");
+                }
+
+                return isValid;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error occurred while keeping token alive");
+                return false;
+            }
+        }
+    }
+} 

src/Ombi.Core/Engine/MovieRequestEngine.cs

@@ -598,13 +598,13 @@ namespace Ombi.Core.Engine
 
         public async Task<RequestEngineResult> ApproveMovieById(int requestId, bool is4K)
         {
-            var request = await MovieRepository.Find(requestId);
+            var request = await MovieRepository.GetWithUser().FirstOrDefaultAsync(x => x.Id == requestId);
             return await ApproveMovie(request, is4K);
         }
 
         public async Task<RequestEngineResult> DenyMovieById(int modelId, string denyReason, bool is4K)
         {
-            var request = await MovieRepository.Find(modelId);
+            var request = await MovieRepository.GetWithUser().FirstOrDefaultAsync(x => x.Id == modelId);
             if (request == null)
             {
                 return new RequestEngineResult
@@ -790,7 +790,7 @@ namespace Ombi.Core.Engine
 
         public async Task<RequestEngineResult> ReProcessRequest(int requestId, bool is4K, CancellationToken cancellationToken)
         {
-            var request = await MovieRepository.Find(requestId);
+            var request = await MovieRepository.GetWithUser().FirstOrDefaultAsync(x => x.Id == requestId);
             if (request == null)
             {
                 return new RequestEngineResult
@@ -805,7 +805,7 @@ namespace Ombi.Core.Engine
 
         public async Task<RequestEngineResult> MarkUnavailable(int modelId, bool is4K)
         {
-            var request = await MovieRepository.Find(modelId);
+            var request = await MovieRepository.GetWithUser().FirstOrDefaultAsync(x => x.Id == modelId);
             if (request == null)
             {
                 return new RequestEngineResult
@@ -834,7 +834,7 @@ namespace Ombi.Core.Engine
 
         public async Task<RequestEngineResult> MarkAvailable(int modelId, bool is4K)
         {
-            var request = await MovieRepository.Find(modelId);
+            var request = await MovieRepository.GetWithUser().FirstOrDefaultAsync(x => x.Id == modelId);
             if (request == null)
             {
                 return new RequestEngineResult

src/Ombi.Core/Helpers/DatabaseConfigurationSetup.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Text;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Storage;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal;
+using Ombi.Core.Models;
+using Polly;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+namespace Ombi.Core.Helpers;
+
+public static class DatabaseConfigurationSetup
+{
+    public static void ConfigurePostgres(DbContextOptionsBuilder options, PerDatabaseConfiguration config)
+    {
+        options.UseNpgsql(config.ConnectionString, b =>
+        {
+            b.EnableRetryOnFailure();
+        }).ReplaceService<ISqlGenerationHelper, NpgsqlCaseInsensitiveSqlGenerationHelper>();
+    }
+    
+    public static void ConfigureMySql(DbContextOptionsBuilder options, PerDatabaseConfiguration config)
+    {
+        if (string.IsNullOrEmpty(config.ConnectionString))
+        {
+            throw new ArgumentNullException("ConnectionString for the MySql/Mariadb database is empty");
+        }
+
+        options.UseMySql(config.ConnectionString, GetServerVersion(config.ConnectionString), b =>
+        {
+            //b.CharSetBehavior(Pomelo.EntityFrameworkCore.MySql.Infrastructure.CharSetBehavior.NeverAppend); // ##ISSUE, link to migrations?
+            b.EnableRetryOnFailure();
+        });
+    }
+    
+    private static ServerVersion GetServerVersion(string connectionString)
+    {
+        // Workaround Windows bug, that can lead to the following exception:
+        //
+        // MySqlConnector.MySqlException (0x80004005): SSL Authentication Error
+        //     ---> System.Security.Authentication.AuthenticationException: Authentication failed, see inner exception.
+        //     ---> System.ComponentModel.Win32Exception (0x8009030F): The message or signature supplied for verification has been altered
+        //
+        // See https://github.com/dotnet/runtime/issues/17005#issuecomment-305848835
+        //
+        // Also workaround for the fact, that ServerVersion.AutoDetect() does not use any retrying strategy.
+        ServerVersion serverVersion = null;
+#pragma warning disable EF1001
+        var retryPolicy = Policy.Handle<Exception>(exception => MySqlTransientExceptionDetector.ShouldRetryOn(exception))
+#pragma warning restore EF1001
+            .WaitAndRetry(3, (count, context) => TimeSpan.FromMilliseconds(count * 250));
+
+        serverVersion = retryPolicy.Execute(() => serverVersion = ServerVersion.AutoDetect(connectionString));
+
+        return serverVersion;
+    }
+    public class NpgsqlCaseInsensitiveSqlGenerationHelper : NpgsqlSqlGenerationHelper
+    {
+        const string EFMigrationsHisory = "__EFMigrationsHistory";
+        public NpgsqlCaseInsensitiveSqlGenerationHelper(RelationalSqlGenerationHelperDependencies dependencies)
+            : base(dependencies) { }
+        public override string DelimitIdentifier(string identifier) =>
+            base.DelimitIdentifier(identifier == EFMigrationsHisory ? identifier : identifier.ToLower());
+        public override void DelimitIdentifier(StringBuilder builder, string identifier)
+            => base.DelimitIdentifier(builder, identifier == EFMigrationsHisory ? identifier : identifier.ToLower());
+    }
+}

src/Ombi.Core/Helpers/FileSystem.cs

@@ -0,0 +1,10 @@
+namespace Ombi.Core.Helpers;
+
+public class FileSystem : IFileSystem
+{
+    public bool FileExists(string path)
+    {
+        return System.IO.File.Exists(path);
+    }
+    // Implement other file system operations as needed
+}

src/Ombi.Core/Helpers/IFileSystem.cs

@@ -0,0 +1,7 @@
+namespace Ombi.Core.Helpers;
+
+public interface IFileSystem
+{
+    bool FileExists(string path);
+    // Add other file system operations as needed
+}

src/Ombi.Core/Models/DatabaseConfiguration.cs

@@ -0,0 +1,40 @@
+using System.IO;
+
+namespace Ombi.Core.Models;
+
+public class DatabaseConfiguration
+{
+    public const string SqliteDatabase = "Sqlite";
+
+    public DatabaseConfiguration()
+    {
+
+    }
+
+    public DatabaseConfiguration(string defaultSqlitePath)
+    {
+        OmbiDatabase = new PerDatabaseConfiguration(SqliteDatabase, $"Data Source={Path.Combine(defaultSqlitePath, "Ombi.db")}");
+        SettingsDatabase = new PerDatabaseConfiguration(SqliteDatabase, $"Data Source={Path.Combine(defaultSqlitePath, "OmbiSettings.db")}");
+        ExternalDatabase = new PerDatabaseConfiguration(SqliteDatabase, $"Data Source={Path.Combine(defaultSqlitePath, "OmbiExternal.db")}");
+    }
+    public PerDatabaseConfiguration OmbiDatabase { get; set; }
+    public PerDatabaseConfiguration SettingsDatabase { get; set; }
+    public PerDatabaseConfiguration ExternalDatabase { get; set; }
+}
+
+public class PerDatabaseConfiguration
+{
+    public PerDatabaseConfiguration(string type, string connectionString)
+    {
+        Type = type;
+        ConnectionString = connectionString;
+    }
+
+    // Used in Deserialization
+    public PerDatabaseConfiguration()
+    {
+
+    }
+    public string Type { get; set; }
+    public string ConnectionString { get; set; }
+}

src/Ombi.Core/Senders/MovieSender.cs

@@ -182,7 +182,10 @@ namespace Ombi.Core.Senders
             if (settings.SendUserTags)
             {
                 var userTag = await GetOrCreateTag(model, settings);
-                tags.Add(userTag.id);
+                if (userTag != null)
+                {
+                    tags.Add(userTag.id);
+                }
             }
 
             // Overrides on the request take priority
@@ -198,7 +201,9 @@ namespace Ombi.Core.Senders
             List<MovieResponse> movies;
             // Check if the movie already exists? Since it could be unmonitored
 
-            movies = await _radarrV3Api.GetMovies(settings.ApiKey, settings.FullUri);
+            // Get the appropriate Radarr instance settings for existence check
+            var existenceCheckSettings = is4k ? await _radarr4KSettings.GetSettingsAsync() : settings;
+            movies = await _radarrV3Api.GetMovies(existenceCheckSettings.ApiKey, existenceCheckSettings.FullUri);
 
             var existingMovie = movies.FirstOrDefault(x => x.tmdbId == model.TheMovieDbId);
             if (existingMovie == null)
@@ -246,6 +251,12 @@ namespace Ombi.Core.Senders
 
         private async Task<Tag> GetOrCreateTag(MovieRequests model, RadarrSettings s)
         {
+            if (model.RequestedUser == null)
+            {
+                _log.LogWarning("Cannot create tag - RequestedUser is null for movie request {MovieTitle}", model.Title);
+                return null;
+            }
+            
             var tagName = model.RequestedUser.UserName;
             // Does tag exist?
 

src/Ombi.Core/Senders/TvSender.cs

@@ -133,7 +133,14 @@ namespace Ombi.Core.Senders
             string seriesType;
             int? tagToUse = null;
 
+            Logger.LogInformation("Starting SendToSonarr for series {Title} (TvDbId: {TvDbId})", model.ParentRequest.Title, model.ParentRequest.TvDbId);
+            Logger.LogInformation("Series type: {SeriesType}", model.SeriesType);
+
             var profiles = await UserQualityProfiles.GetAll().FirstOrDefaultAsync(x => x.UserId == model.RequestedUserId);
+            if (profiles != null)
+            {
+                Logger.LogInformation("Found user quality profile for user {UserId}", model.RequestedUserId);
+            }
 
             if (model.SeriesType == SeriesType.Anime)
             {
@@ -141,8 +148,10 @@ namespace Ombi.Core.Senders
                 // For some reason, if we haven't got one use the first root folder in Sonarr
                 if (!int.TryParse(s.RootPathAnime, out int animePath))
                 {
+                    Logger.LogWarning("Failed to parse RootPathAnime: {RootPathAnime}, falling back to main root path", s.RootPathAnime);
                     animePath = int.Parse(s.RootPath); // Set it to the main root folder if we have no anime folder.
                 }
+                Logger.LogInformation("Using anime path ID: {AnimePath}", animePath);
                 rootFolderPath = await GetSonarrRootPath(animePath, s);
                 languageProfileId = s.LanguageProfileAnime > 0 ? s.LanguageProfileAnime : s.LanguageProfile;
 
@@ -154,6 +163,7 @@ namespace Ombi.Core.Senders
                 {
                     if (profiles.SonarrRootPathAnime > 0)
                     {
+                        Logger.LogInformation("Using user's anime root path override: {RootPath}", profiles.SonarrRootPathAnime);
                         rootFolderPath = await GetSonarrRootPath(profiles.SonarrRootPathAnime, s);
                     }
                     if (profiles.SonarrQualityProfileAnime > 0)
@@ -169,11 +179,13 @@ namespace Ombi.Core.Senders
                 int.TryParse(s.QualityProfile, out qualityToUse);
                 // Get the root path from the rootfolder selected.
                 // For some reason, if we haven't got one use the first root folder in Sonarr
+                Logger.LogInformation("Using standard path ID: {RootPath}", s.RootPath);
                 rootFolderPath = await GetSonarrRootPath(int.Parse(s.RootPath), s);
                 if (profiles != null)
                 {
                     if (profiles.SonarrRootPath > 0)
                     {
+                        Logger.LogInformation("Using user's standard root path override: {RootPath}", profiles.SonarrRootPath);
                         rootFolderPath = await GetSonarrRootPath(profiles.SonarrRootPath, s);
                     }
                     if (profiles.SonarrQualityProfile > 0)
@@ -193,6 +205,7 @@ namespace Ombi.Core.Senders
 
             if (model.ParentRequest.RootFolder.HasValue && model.ParentRequest.RootFolder.Value > 0)
             {
+                Logger.LogInformation("Using request root folder override: {RootFolder}", model.ParentRequest.RootFolder.Value);
                 rootFolderPath = await GetSonarrRootPath(model.ParentRequest.RootFolder.Value, s);
             }
 
@@ -201,6 +214,8 @@ namespace Ombi.Core.Senders
                 languageProfileId = model.ParentRequest.LanguageProfile.Value;
             }
 
+            Logger.LogInformation("Final root folder path: {RootFolderPath}", rootFolderPath);
+
             try
             {
                 if (tagToUse.HasValue)
@@ -520,17 +535,36 @@ namespace Ombi.Core.Senders
 
         private async Task<string> GetSonarrRootPath(int pathId, SonarrSettings sonarrSettings)
         {
+            Logger.LogInformation("Getting Sonarr root path for ID: {PathId}", pathId);
             var rootFoldersResult = await SonarrApi.GetRootFolders(sonarrSettings.ApiKey, sonarrSettings.FullUri);
+            
+            if (rootFoldersResult == null || !rootFoldersResult.Any())
+            {
+                Logger.LogError("No root folders returned from Sonarr API");
+                return string.Empty;
+            }
+
+            Logger.LogInformation("Found {Count} root folders in Sonarr", rootFoldersResult.Count());
+            foreach (var folder in rootFoldersResult)
+            {
+                Logger.LogDebug("Root folder - ID: {Id}, Path: {Path}", folder.id, folder.path);
+            }
 
             if (pathId == 0)
             {
-                return rootFoldersResult.FirstOrDefault().path;
+                var defaultPath = rootFoldersResult.FirstOrDefault()?.path;
+                Logger.LogInformation("Using first root folder as default: {Path}", defaultPath);
+                return defaultPath;
             }
 
-            foreach (var r in rootFoldersResult?.Where(r => r.id == pathId))
+            var matchingFolder = rootFoldersResult.FirstOrDefault(r => r.id == pathId);
+            if (matchingFolder != null)
             {
-                return r.path;
+                Logger.LogInformation("Found matching root folder for ID {PathId}: {Path}", pathId, matchingFolder.path);
+                return matchingFolder.path;
             }
+
+            Logger.LogError("No matching root folder found for ID: {PathId}", pathId);
             return string.Empty;
         }
     }

src/Ombi.Core/Services/DatabaseConfigurationService.cs

@@ -0,0 +1,69 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Ombi.Core.Helpers;
+using Ombi.Core.Models;
+using Ombi.Helpers;
+
+namespace Ombi.Core.Services;
+
+public class DatabaseConfigurationService : IDatabaseConfigurationService
+{
+
+    private readonly ILogger _logger;
+    private readonly IFileSystem _fileSystem;
+
+    public DatabaseConfigurationService(
+        ILogger<DatabaseConfigurationService> logger,
+        IFileSystem fileSystem)
+    {
+        _logger = logger;
+        _fileSystem = fileSystem;
+    }
+
+    public async Task<bool> ConfigureDatabase(string databaseType, string connectionString, CancellationToken token)
+    {
+        var i = StartupSingleton.Instance;
+        if (string.IsNullOrEmpty(i.StoragePath))
+        {
+            i.StoragePath = string.Empty;
+        }
+
+        var databaseFileLocation = Path.Combine(i.StoragePath, "database.json");
+        if (_fileSystem.FileExists(databaseFileLocation))
+        {
+            var error = $"The database file at '{databaseFileLocation}' already exists";
+            _logger.LogError(error);
+            return false;
+        }
+
+        var configuration = new DatabaseConfiguration
+        {
+            ExternalDatabase = new PerDatabaseConfiguration(databaseType, connectionString),
+            OmbiDatabase = new PerDatabaseConfiguration(databaseType, connectionString),
+            SettingsDatabase = new PerDatabaseConfiguration(databaseType, connectionString)
+        };
+
+        var json = JsonConvert.SerializeObject(configuration, Formatting.Indented);
+
+        _logger.LogInformation("Writing database configuration to file");
+
+        try
+        {
+            await File.WriteAllTextAsync(databaseFileLocation, json, token);
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Failed to write database configuration to file");
+            return false;
+        }
+
+        _logger.LogInformation("Database configuration written to file");
+
+      
+        return true;
+    }
+}

src/Ombi.Core/Services/IDatabaseConfigurationService.cs

@@ -0,0 +1,11 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Ombi.Core.Services;
+
+public interface IDatabaseConfigurationService
+{
+    const string MySqlDatabase = "MySQL";
+    const string PostgresDatabase = "Postgres";
+    Task<bool> ConfigureDatabase(string databaseType, string connectionString, CancellationToken token);
+}

src/Ombi.DependencyInjection/IocExtensions.cs

@@ -107,6 +107,7 @@ namespace Ombi.DependencyInjection
             services.AddTransient<IMusicSender, MusicSender>();
             services.AddTransient<IMassEmailSender, MassEmailSender>();
             services.AddTransient<IPlexOAuthManager, PlexOAuthManager>();
+            services.AddTransient<IPlexTokenKeepAliveService, PlexTokenKeepAliveService>();
             services.AddTransient<IVoteEngine, VoteEngine>();
             services.AddTransient<IDemoMovieSearchEngine, DemoMovieSearchEngine>();
             services.AddTransient<IDemoTvSearchEngine, DemoTvSearchEngine>();
@@ -236,6 +237,8 @@ namespace Ombi.DependencyInjection
             services.AddScoped<IFeatureService, FeatureService>();
             services.AddTransient<IRecentlyRequestedService, RecentlyRequestedService>();
             services.AddTransient<IPlexService, PlexService>();
+            services.AddSingleton<IFileSystem, FileSystem>();
+            services.AddSingleton<IDatabaseConfigurationService, DatabaseConfigurationService>();
         }
         
         public static void RegisterJobs(this IServiceCollection services)

src/Ombi.Helpers/NotificationType.cs

@@ -14,6 +14,7 @@
         IssueResolved = 9,
         IssueComment = 10,
         Newsletter = 11,
-        PartiallyAvailable = 12
+        PartiallyAvailable = 12,
+        PlexWatchlistTokenExpired = 13
     }
 }

src/Ombi.Notifications/Ombi.Notifications.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Ensure.That" Version="10.1.0" />
-    <PackageReference Include="MailKit" Version="4.1.0" />
+    <PackageReference Include="MailKit" Version="4.6.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Schedule.Tests/Ombi.Schedule.Tests.csproj

@@ -2,6 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+
     <Configurations>Debug;Release;NonUiBuild</Configurations>
   </PropertyGroup>
 
@@ -13,7 +16,7 @@
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageReference Include="NUnit.ConsoleRunner" Version="3.15.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <packagereference Include="Microsoft.NET.Test.Sdk" Version="17.6.2"></packagereference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Schedule.Tests/PlexUserImporterTests.cs

@@ -182,8 +182,6 @@ namespace Ombi.Schedule.Tests
             _mocker.Verify<OmbiUserManager>(x => x.UpdateAsync(It.IsAny<OmbiUser>()), Times.Never);
         }
 
-
-
         [Test]
         public async Task Import_Doesnt_Import_Banned_Users()
         {
@@ -247,7 +245,15 @@ namespace Ombi.Schedule.Tests
                         Id = "id",
                         Title = "title",
                         Username = "username",
-                        HomeUser = true
+                        HomeUser = true,
+                        Server = new PlexUserServer[]
+                        {
+                            new PlexUserServer
+                            {
+                                Id = "1",
+                                ServerId = "123"
+                            }
+                        }
                     }
                 }
             });
@@ -257,7 +263,6 @@ namespace Ombi.Schedule.Tests
             _mocker.Setup<OmbiUserManager, Task<IdentityResult>>(x => x.AddToRoleAsync(It.Is<OmbiUser>(x => x.UserName == "plex"), OmbiRoles.RequestMovie))
                 .ReturnsAsync(IdentityResult.Success);
 
-
             await _subject.Execute(null);
 
             _mocker.Verify<OmbiUserManager>(x => x.CreateAsync(It.IsAny<OmbiUser>()), Times.Once);
@@ -306,7 +311,15 @@ namespace Ombi.Schedule.Tests
                     {
                         Email = "email",
                         Id = "id",
-                        Username = "plex"
+                        Username = "plex",
+                        Server = new PlexUserServer[]
+                        {
+                            new PlexUserServer
+                            {
+                                Id = "1",
+                                ServerId = "123"
+                            }
+                        }
                     }
                 }
             });
@@ -331,9 +344,9 @@ namespace Ombi.Schedule.Tests
                     ImportPlexAdmin = false,
                     ImportPlexUsers = true,
                     DefaultRoles = new List<string>
-                {
-                    OmbiRoles.RequestMovie
-                }
+                    {
+                        OmbiRoles.RequestMovie
+                    }
                 });
             _mocker.Setup<IPlexApi, Task<PlexUsers>>(x => x.GetUsers(It.IsAny<string>())).ReturnsAsync(new PlexUsers
             {
@@ -343,7 +356,15 @@ namespace Ombi.Schedule.Tests
                     {
                         Email = "email",
                         Id = "PLEX_ID",
-                        Username = "user"
+                        Username = "user",
+                        Server = new PlexUserServer[]
+                        {
+                            new PlexUserServer
+                            {
+                                Id = "1",
+                                ServerId = "123"
+                            }
+                        }
                     }
                 }
             });
@@ -440,5 +461,98 @@ namespace Ombi.Schedule.Tests
 
             _mocker.Verify<IUserDeletionEngine>(x => x.DeleteUser(It.Is<OmbiUser>(x => x.ProviderUserId == "ADMIN_ID" && x.Email == "ADMIN@ADMIN.CO" && x.UserName == "Admin")), Times.Never);
         }
+
+        [Test]
+        public async Task Import_Skips_Users_Without_Server_Access()
+        {
+            _mocker.Setup<ISettingsService<UserManagementSettings>, Task<UserManagementSettings>>(x => x.GetSettingsAsync())
+                .ReturnsAsync(new UserManagementSettings { ImportPlexAdmin = false, ImportPlexUsers = true });
+            _mocker.Setup<IPlexApi, Task<PlexUsers>>(x => x.GetUsers(It.IsAny<string>())).ReturnsAsync(new PlexUsers
+            {
+                User = new UserFriends[]
+                {
+                    new UserFriends
+                    {
+                        Email = "email",
+                        Id = "NoServer",
+                        Title = "title",
+                        Username = "username",
+                        Server = null
+                    }
+                }
+            });
+
+            await _subject.Execute(null);
+
+            _mocker.Verify<OmbiUserManager>(x => x.CreateAsync(It.IsAny<OmbiUser>()), Times.Never);
+        }
+
+        [Test]
+        public async Task Import_Skips_Users_With_Empty_Server_Array()
+        {
+            _mocker.Setup<ISettingsService<UserManagementSettings>, Task<UserManagementSettings>>(x => x.GetSettingsAsync())
+                .ReturnsAsync(new UserManagementSettings { ImportPlexAdmin = false, ImportPlexUsers = true });
+            _mocker.Setup<IPlexApi, Task<PlexUsers>>(x => x.GetUsers(It.IsAny<string>())).ReturnsAsync(new PlexUsers
+            {
+                User = new UserFriends[]
+                {
+                    new UserFriends
+                    {
+                        Email = "email",
+                        Id = "EmptyServer",
+                        Title = "title",
+                        Username = "username",
+                        Server = new PlexUserServer[0]
+                    }
+                }
+            });
+
+            await _subject.Execute(null);
+
+            _mocker.Verify<OmbiUserManager>(x => x.CreateAsync(It.IsAny<OmbiUser>()), Times.Never);
+        }
+
+        [Test]
+        public async Task Import_Creates_User_With_Server_Access()
+        {
+            _mocker.Setup<ISettingsService<UserManagementSettings>, Task<UserManagementSettings>>(x => x.GetSettingsAsync())
+                .ReturnsAsync(new UserManagementSettings { ImportPlexAdmin = false, ImportPlexUsers = true });
+            _mocker.Setup<IPlexApi, Task<PlexUsers>>(x => x.GetUsers(It.IsAny<string>())).ReturnsAsync(new PlexUsers
+            {
+                User = new UserFriends[]
+                {
+                    new UserFriends
+                    {
+                        Email = "email",
+                        Id = "HasServer",
+                        Title = "title",
+                        Username = "username",
+                        Server = new PlexUserServer[]
+                        {
+                            new PlexUserServer
+                            {
+                                Id = "1",
+                                ServerId = "123"
+                            }
+                        }
+                    }
+                }
+            });
+
+            _mocker.Setup<OmbiUserManager, Task<IdentityResult>>(x => x.CreateAsync(It.Is<OmbiUser>(x => 
+                x.UserName == "username" && 
+                x.Email == "email" && 
+                x.ProviderUserId == "HasServer" && 
+                x.UserType == UserType.PlexUser)))
+                .ReturnsAsync(IdentityResult.Success);
+
+            await _subject.Execute(null);
+
+            _mocker.Verify<OmbiUserManager>(x => x.CreateAsync(It.Is<OmbiUser>(x => 
+                x.UserName == "username" && 
+                x.Email == "email" && 
+                x.ProviderUserId == "HasServer" && 
+                x.UserType == UserType.PlexUser)), Times.Once);
+        }
     }
 }

src/Ombi.Schedule.Tests/PlexWatchlistImportTests.cs

@@ -20,6 +20,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Ombi.Notifications.Models;
+using Ombi.Core.Notifications;
+using Ombi.Helpers;
+using Ombi.Core;
+using Ombi.Core.Authentication;
 
 namespace Ombi.Schedule.Tests
 {
@@ -35,12 +40,15 @@ namespace Ombi.Schedule.Tests
         public void Setup()
         {
             _mocker = new AutoMocker();
-            var um = MockHelper.MockUserManager(new List<OmbiUser> { new OmbiUser { Id = "abc", UserType = UserType.PlexUser, MediaServerToken = "token1", UserName = "abc", NormalizedUserName = "ABC" } });
+            var um = MockHelper.MockUserManager(new List<OmbiUser> { new OmbiUser { Id = "abc", Email = "email@email.com", UserType = UserType.PlexUser, MediaServerToken = "token1", UserName = "abc", NormalizedUserName = "ABC" } });
             _mocker.Use(um);
             _context = _mocker.GetMock<IJobExecutionContext>();
             _context.Setup(x => x.CancellationToken).Returns(CancellationToken.None);
+            // Mock the keep-alive service to return true by default
+            _mocker.Use<IPlexTokenKeepAliveService>(Mock.Of<IPlexTokenKeepAliveService>(s => s.KeepTokenAliveAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()) == Task.FromResult(true)));
             _subject = _mocker.CreateInstance<PlexWatchlistImport>();
             _mocker.Setup<IRepository<PlexWatchlistUserError>, IQueryable<PlexWatchlistUserError>>(x => x.GetAll()).Returns(new List<PlexWatchlistUserError>().AsQueryable().BuildMock());
+            _mocker.Setup<INotificationHelper>(x => x.Notify(It.IsAny<NotificationOptions>()));
         }
 
         [Test]
@@ -682,7 +690,6 @@ namespace Ombi.Schedule.Tests
         [Test]
         public async Task MovieRequestFromWatchList_AlreadyImported()
         {
-
             _mocker.Setup<ISettingsService<PlexSettings>, Task<PlexSettings>>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true });
             _mocker.Setup<IPlexApi, Task<PlexWatchlistContainer>>(x => x.GetWatchlist(It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(new PlexWatchlistContainer
             {
@@ -719,7 +726,7 @@ namespace Ombi.Schedule.Tests
 
                     }
                 });
-            _mocker.Setup<IExternalRepository<PlexWatchlistHistory>, IQueryable<PlexWatchlistHistory>>(x => x.GetAll()).Returns(new List<PlexWatchlistHistory> { new PlexWatchlistHistory { Id = 1, TmdbId = "123" } }.AsQueryable());
+            _mocker.Setup<IExternalRepository<PlexWatchlistHistory>, IQueryable<PlexWatchlistHistory>>(x => x.GetAll()).Returns(new List<PlexWatchlistHistory> { new PlexWatchlistHistory { Id = 1, TmdbId = "123", UserId = "abc" } }.AsQueryable());
             await _subject.Execute(_context.Object);
             _mocker.Verify<IMovieRequestEngine>(x => x.RequestMovie(It.IsAny<MovieRequestViewModel>()), Times.Never);
             _mocker.Verify<IPlexApi>(x => x.GetWatchlistMetadata("abc", It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Once);
@@ -778,5 +785,99 @@ namespace Ombi.Schedule.Tests
             _mocker.Verify<IExternalRepository<PlexWatchlistHistory>>(x => x.GetAll(), Times.Once);
             _mocker.Verify<IExternalRepository<PlexWatchlistHistory>>(x => x.Add(It.IsAny<PlexWatchlistHistory>()), Times.Once);
         }
+
+        [Test]
+        public async Task AuthenticationError_NotificationsEnabled_WithEmail_SendsNotification()
+        {
+            _mocker.Setup<ISettingsService<PlexSettings>, Task<PlexSettings>>(x => x.GetSettingsAsync())
+                .ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true, NotifyOnWatchlistTokenExpiration = true });
+            _mocker.Setup<IPlexApi, Task<PlexWatchlistContainer>>(x => x.GetWatchlist(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new PlexWatchlistContainer { AuthError = true });
+
+            // Act
+            await _subject.Execute(_context.Object);
+
+            // Assert
+            _mocker.Verify<INotificationHelper>(x => x.Notify(It.Is<NotificationOptions>(n => 
+                n.NotificationType == NotificationType.PlexWatchlistTokenExpired &&
+                n.Recipient == "email@email.com" &&
+                n.Substitutes["UserName"] == "abc"
+            )), Times.Once);
+        }
+
+        [Test]
+        public async Task AuthenticationError_NotificationsDisabled_WithEmail_DoesNotSendNotification()
+        {
+            _mocker.Setup<ISettingsService<PlexSettings>, Task<PlexSettings>>(x => x.GetSettingsAsync())
+                .ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true, NotifyOnWatchlistTokenExpiration = false });
+            _mocker.Setup<IPlexApi, Task<PlexWatchlistContainer>>(x => x.GetWatchlist(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new PlexWatchlistContainer { AuthError = true });
+
+            // Act
+            await _subject.Execute(_context.Object);
+
+            // Assert
+            _mocker.Verify<INotificationHelper>(x => x.Notify(It.IsAny<NotificationOptions>()), Times.Never);
+        }
+
+        [Test]
+        public async Task AuthenticationError_NotificationsEnabled_NoEmail_DoesNotSendNotification()
+        {
+            // Arrange
+            var user = new OmbiUser { Id = "abc", UserType = UserType.PlexUser, MediaServerToken = "token1", UserName = "abc", NormalizedUserName = "ABC" };
+            var um = MockHelper.MockUserManager(new List<OmbiUser> { user });
+            _mocker.Use(um);
+
+            _mocker.Setup<ISettingsService<PlexSettings>, Task<PlexSettings>>(x => x.GetSettingsAsync())
+                .ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true, NotifyOnWatchlistTokenExpiration = true });
+            _mocker.Setup<IPlexApi, Task<PlexWatchlistContainer>>(x => x.GetWatchlist(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new PlexWatchlistContainer { AuthError = true });
+
+            _subject = _mocker.CreateInstance<PlexWatchlistImport>();
+            
+            // Act
+            await _subject.Execute(_context.Object);
+
+            // Assert
+            _mocker.Verify<INotificationHelper>(x => x.Notify(It.IsAny<NotificationOptions>()), Times.Never);
+        }
+
+        [Test]
+        public async Task SkipsUserIfTokenKeepAliveFails()
+        {
+            // Arrange: Set up the keep-alive service to return false (token invalid/expired)
+            var keepAliveMock = new Mock<IPlexTokenKeepAliveService>();
+            keepAliveMock.Setup(x => x.KeepTokenAliveAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(false);
+            _mocker.Use(keepAliveMock.Object);
+            _subject = _mocker.CreateInstance<PlexWatchlistImport>();
+            _mocker.Setup<ISettingsService<PlexSettings>, Task<PlexSettings>>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true });
+            // Act
+            await _subject.Execute(_context.Object);
+            // Assert: Should not attempt to import watchlist if keep-alive fails
+            keepAliveMock.Verify(x => x.KeepTokenAliveAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Once);
+            _mocker.Verify<IPlexApi>(x => x.GetWatchlist(It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Never);
+            _mocker.Verify<INotificationHelper>(x => x.Notify(It.IsAny<NotificationOptions>()), Times.Never); // or Times.Once if notification is expected
+        }
+        [Test]
+        public async Task CallsKeepAliveForEachPlexUser()
+        {
+            // Arrange: Multiple Plex users
+            var users = new List<OmbiUser>
+            {
+                new OmbiUser { Id = "abc1", UserType = UserType.PlexUser, MediaServerToken = "abc1", UserName = "abc1", NormalizedUserName = "ABC1" },
+                new OmbiUser { Id = "abc2", UserType = UserType.PlexUser, MediaServerToken = "abc2", UserName = "abc2", NormalizedUserName = "ABC2" },
+            };
+            var um = MockHelper.MockUserManager(users);
+            _mocker.Use(um);
+            var keepAliveMock = new Mock<IPlexTokenKeepAliveService>();
+            keepAliveMock.Setup(x => x.KeepTokenAliveAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(true);
+            _mocker.Use(keepAliveMock.Object);
+            _subject = _mocker.CreateInstance<PlexWatchlistImport>();
+            _mocker.Setup<ISettingsService<PlexSettings>, Task<PlexSettings>>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true });
+            // Act
+            await _subject.Execute(_context.Object);
+            // Assert: KeepAlive should be called for each user
+            keepAliveMock.Verify(x => x.KeepTokenAliveAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Exactly(users.Count));
+        }
     }
 }

src/Ombi.Schedule.Tests/Properties/launchSettings.json

@@ -1,27 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:62604/",
-      "sslPort": 0
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Ombi.Schedule.Tests": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "http://localhost:62605/"
-    }
-  }
-}

src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs

@@ -7,6 +7,7 @@ using Microsoft.Extensions.Logging;
 using Ombi.Api.Emby;
 using Ombi.Api.Jellyfin;
 using Ombi.Api.Plex;
+using Ombi.Api.Plex.Models;
 using Ombi.Api.TheMovieDb;
 using Ombi.Api.TheMovieDb.Models;
 using Ombi.Api.TvMaze;
@@ -286,7 +287,18 @@ namespace Ombi.Schedule.Jobs.Ombi
                         continue;
                     }
                     var servers = settings.Servers[0];
-                    var metaData = await _plexApi.GetMetadata(servers.PlexAuthToken, settings.Servers[0].FullUri, movie.Key);
+                    PlexMetadata metaData = null;
+
+                    try
+                    {
+                        metaData = await _plexApi.GetMetadata(servers.PlexAuthToken, settings.Servers[0].FullUri, movie.Key);
+                    }
+                    catch (Exception e)
+                    {
+                        _log.LogError($"Could not find the metadata for title: '{movie.Title}', skipping");
+                        _log.LogDebug(e, $"Could not find the metadata for title: '{movie.Title}', skipping");
+                        continue;
+                    }
                     var guids = new List<string>();
 
                     var meta = metaData.MediaContainer.Metadata.FirstOrDefault();

src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs

@@ -304,6 +304,13 @@ namespace Ombi.Schedule.Jobs.Plex
                     var existing = await Repo.GetFirstContentByCustom(x => x.Title == movie.title
                                                                            && x.ReleaseYear == movie.year.ToString()
                                                                            && x.Type == MediaType.Movie);
+
+
+                    if (existing == null)
+                    {
+                        // Let's just check the key
+                        existing = await Repo.GetByKey(movie.ratingKey);
+                    }
                     if (existing != null)
                     {
                         // We need to see if this is a different quality,
@@ -340,13 +347,7 @@ namespace Ombi.Schedule.Jobs.Plex
 
                         Logger.LogDebug($"We already have movie {movie.title}");
                         continue;
-                    }
-
-                    //var hasSameKey = await Repo.GetByKey(movie.ratingKey);
-                    //if (hasSameKey != null)
-                    //{
-                    //    await Repo.Delete(hasSameKey);
-                    //}
+                    } 
 
                     Logger.LogDebug("Adding movie {0}", movie.title);
                     var guids = new List<string>();

src/Ombi.Schedule/Jobs/Plex/PlexUserImporter.cs

@@ -120,6 +120,13 @@ namespace Ombi.Schedule.Jobs.Plex
             
             foreach (var plexUser in users.User)
             {
+                // Skip users without server access
+                if (plexUser.Server == null || !plexUser.Server.Any())
+                {
+                    _log.LogInformation($"Skipping user {plexUser.Username ?? plexUser.Id} as they have no server access");
+                    continue;
+                }
+
                 // Check if we should import this user
                 if (userManagementSettings.BannedPlexUserIds.Contains(plexUser.Id))
                 {

src/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs

@@ -22,6 +22,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Ombi.Notifications.Models;
+using Ombi.Core.Notifications;
+using Microsoft.AspNetCore.Identity;
+using Ombi.Store.Repository.Requests;
+using Ombi.Core;
 
 namespace Ombi.Schedule.Jobs.Plex
 {
@@ -37,11 +42,13 @@ namespace Ombi.Schedule.Jobs.Plex
         private readonly IExternalRepository<PlexWatchlistHistory> _watchlistRepo;
         private readonly IRepository<PlexWatchlistUserError> _userError;
         private readonly IMovieDbApi _movieDbApi;
+        private readonly INotificationHelper _notificationHelper;
+        private readonly IPlexTokenKeepAliveService _tokenKeepAliveService;
 
         public PlexWatchlistImport(IPlexApi plexApi, ISettingsService<PlexSettings> settings, OmbiUserManager ombiUserManager,
             IMovieRequestEngine movieRequestEngine, ITvRequestEngine tvRequestEngine, INotificationHubService notificationHubService,
             ILogger<PlexWatchlistImport> logger, IExternalRepository<PlexWatchlistHistory> watchlistRepo, IRepository<PlexWatchlistUserError> userError,
-            IMovieDbApi movieDbApi)
+            IMovieDbApi movieDbApi, INotificationHelper notificationHelper, IPlexTokenKeepAliveService tokenKeepAliveService)
         {
             _plexApi = plexApi;
             _settings = settings;
@@ -53,6 +60,8 @@ namespace Ombi.Schedule.Jobs.Plex
             _watchlistRepo = watchlistRepo;
             _userError = userError;
             _movieDbApi = movieDbApi;
+            _notificationHelper = notificationHelper;
+            _tokenKeepAliveService = tokenKeepAliveService;
         }
 
         public async Task Execute(IJobExecutionContext context)
@@ -90,6 +99,36 @@ namespace Ombi.Schedule.Jobs.Plex
                     }
 
                     _logger.LogDebug($"Starting Watchlist Import for {user.UserName} with token {user.MediaServerToken}");
+                    
+                    // Keep the token alive before attempting watchlist import
+                    var keepAliveSuccess = await _tokenKeepAliveService.KeepTokenAliveAsync(user.MediaServerToken, context?.CancellationToken ?? CancellationToken.None);
+                    if (!keepAliveSuccess)
+                    {
+                        _logger.LogWarning($"Token for user '{user.UserName}' is invalid or expired (keep-alive failed). Recording error and skipping.");
+                        await _userError.Add(new PlexWatchlistUserError
+                        {
+                            UserId = user.Id,
+                            MediaServerToken = user.MediaServerToken,
+                        });
+
+                        // Send notification to user about token expiration
+                        if (settings.NotifyOnWatchlistTokenExpiration && !string.IsNullOrEmpty(user.Email))
+                        {
+                            var notificationModel = new NotificationOptions
+                            {
+                                NotificationType = NotificationType.PlexWatchlistTokenExpired,
+                                Recipient = user.Email,
+                                DateTime = DateTime.Now,
+                                Substitutes = new Dictionary<string, string>
+                                {
+                                    { "UserName", user.UserName }
+                                }
+                            };
+                            await _notificationHelper.Notify(notificationModel);
+                        }
+                        continue;
+                    }
+                    
                     var watchlist = await _plexApi.GetWatchlist(user.MediaServerToken, context?.CancellationToken ?? CancellationToken.None);
                     if (watchlist?.AuthError ?? false)
                     {
@@ -99,6 +138,22 @@ namespace Ombi.Schedule.Jobs.Plex
                             UserId = user.Id,
                             MediaServerToken = user.MediaServerToken,
                         });
+
+                        // Send notification to user about token expiration
+                        if (settings.NotifyOnWatchlistTokenExpiration && !string.IsNullOrEmpty(user.Email))
+                        {
+                            var notificationModel = new NotificationOptions
+                            {
+                                NotificationType = NotificationType.PlexWatchlistTokenExpired,
+                                Recipient = user.Email,
+                                DateTime = DateTime.Now,
+                                Substitutes = new Dictionary<string, string>
+                                {
+                                    { "UserName", user.UserName }
+                                }
+                            };
+                            await _notificationHelper.Notify(notificationModel);
+                        }
                         continue;
                     }
                     if (watchlist == null || !(watchlist.MediaContainer?.Metadata?.Any() ?? false))
@@ -128,7 +183,7 @@ namespace Ombi.Schedule.Jobs.Plex
                         }
 
                         // Check to see if we have already imported this item
-                        var alreadyImported = _watchlistRepo.GetAll().Any(x => x.TmdbId == providerIds.TheMovieDb);
+                        var alreadyImported = _watchlistRepo.GetAll().Any(x => x.TmdbId == providerIds.TheMovieDb && x.UserId == user.Id);
                         if (alreadyImported)
                         {
                             _logger.LogDebug($"{item.title} already imported via Plex WatchList, skipping");
@@ -202,14 +257,14 @@ namespace Ombi.Schedule.Jobs.Plex
                 if (response.ErrorCode == ErrorCode.AlreadyRequested)
                 {
                     _logger.LogDebug($"Movie already requested for user '{user.UserName}'");
-                    await AddToHistory(theMovieDbId);
+                    await AddToHistory(theMovieDbId, user.Id);
                     return;
                 }
                 _logger.LogInformation($"Error adding title from PlexWatchlist for user '{user.UserName}'. Message: '{response.ErrorMessage}'");
             }
             else
             {
-                await AddToHistory(theMovieDbId);
+                await AddToHistory(theMovieDbId, user.Id);
 
                 _logger.LogInformation($"Added title from PlexWatchlist for user '{user.UserName}'. {response.Message}");
             }
@@ -230,24 +285,26 @@ namespace Ombi.Schedule.Jobs.Plex
                 if (response.ErrorCode == ErrorCode.AlreadyRequested)
                 {
                     _logger.LogDebug($"Show already requested for user '{user.UserName}'");
-                    await AddToHistory(theMovieDbId);
+                    await AddToHistory(theMovieDbId, user.Id);
                     return;
                 }
                 _logger.LogInformation($"Error adding title from PlexWatchlist for user '{user.UserName}'. Message: '{response.ErrorMessage}'");
             }
             else
             {
-                await AddToHistory(theMovieDbId);
+                await AddToHistory(theMovieDbId, user.Id);
                 _logger.LogInformation($"Added title from PlexWatchlist for user '{user.UserName}'. {response.Message}");
             }
         }
-        private async Task AddToHistory(int theMovieDbId)
+        private async Task AddToHistory(int theMovieDbId, string userId)
         {
 
             // Add to the watchlist history
             var history = new PlexWatchlistHistory
             {
-                TmdbId = theMovieDbId.ToString()
+                TmdbId = theMovieDbId.ToString(),
+                AddedAt = DateTime.UtcNow,
+                UserId = userId
             };
             await _watchlistRepo.Add(history);
         }

src/Ombi.Settings/Settings/Models/External/PlexSettings.cs

@@ -9,6 +9,7 @@ namespace Ombi.Core.Settings.Models.External
         public bool Enable { get; set; }
         public bool EnableWatchlistImport { get; set; }
         public bool MonitorAll { get; set; }
+        public bool NotifyOnWatchlistTokenExpiration { get; set; }
         /// <summary>
         /// This is the ClientId for OAuth
         /// </summary>

src/Ombi.Store/Context/OmbiContext.cs

@@ -217,6 +217,16 @@ namespace Ombi.Store.Context
                                 Enabled = true,
                             };
                             break;
+                        case NotificationType.PlexWatchlistTokenExpired:
+                            notificationToAdd = new NotificationTemplates
+                            {
+                                NotificationType = notificationType,
+                                Message = "Hello {UserName}! Your Plex watchlist token has expired. Please re-authenticate with Ombi to continue using the watchlist feature.",
+                                Subject = "Plex Watchlist Token Expired",
+                                Agent = agent,
+                                Enabled = true,
+                            };
+                            break;
                         default:
                             throw new ArgumentOutOfRangeException();
                     }

src/Ombi.Store/Entities/PlexWatchlistHistory.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Ombi.Store.Entities
 {
@@ -6,5 +7,7 @@ namespace Ombi.Store.Entities
     public class PlexWatchlistHistory : Entity
     {
         public string TmdbId { get; set; }
+        public string UserId { get; set; }
+        public DateTime AddedAt { get; set; }
     }
 }

src/Ombi.Store/Entities/Requests/MovieRequests.cs

@@ -44,6 +44,21 @@ namespace Ombi.Store.Entities.Requests
         public DateTime MarkedAsDenied4K { get; set; }
         public string DeniedReason4K { get; set; }
 
+        [NotMapped]
+        public RequestCombination RequestCombination
+        {
+            get
+            {
+                if (Has4KRequest && RequestedDate != default)
+                {
+                    return RequestCombination.Both;
+                }
+                if (Has4KRequest) { return RequestCombination.FourK; }
+
+                return RequestCombination.Normal;
+            }
+        }
+
 
         /// <summary>
         /// Only Use for setting the Language Code, Use the LanguageCode property for reading

src/Ombi.Store/Entities/Requests/RequestCombination.cs

@@ -0,0 +1,9 @@
+namespace Ombi.Store.Entities.Requests
+{
+    public enum RequestCombination
+    {
+        Normal,
+        FourK,
+        Both
+    }
+}

src/Ombi.Store/Migration.md

@@ -27,3 +27,48 @@ If running migrations for any db provider other than Sqlite, then ensure the dat
     cd src/Ombi.Store
     dotnet ef migrations add <name> --context <context> --startup-project ../Ombi/Ombi.csproj
     ```
+
+
+    docker run -d \
+	--name some-postgres \
+	-e POSTGRES_PASSWORD=ombi \
+    -e POSTGRES_USER=ombi \
+ 	-e POSTGRES_DB=ombi \
+	postgres
+
+### MySql example
+```
+{
+  "OmbiDatabase": {
+    "Type": "MySQL",
+    "ConnectionString": "Server=192.168.68.118;Port=3306;Database=ombiNew;User=ombi"
+  },
+  "SettingsDatabase": {
+    "Type": "MySQL",
+    "ConnectionString": "Server=192.168.68.118;Port=3306;Database=ombiNew;User=ombi"
+  },
+  "ExternalDatabase": {
+    "Type": "MySQL",
+    "ConnectionString": "Server=192.168.68.118;Port=3306;Database=ombiNew;User=ombi"
+  }
+}
+```
+
+
+### Postgres Example
+```
+{
+  "OmbiDatabase": {
+    "Type": "Postgres",
+    "ConnectionString": "Host=localhost;Port=5432;Database=ombi;Username=ombi;Password=ombi"
+  },
+  "SettingsDatabase": {
+    "Type": "Postgres",
+    "ConnectionString": "Host=localhost;Port=5432;Database=ombi;Username=ombi;Password=ombi"
+  },
+  "ExternalDatabase": {
+    "Type": "Postgres",
+    "ConnectionString": "Host=localhost;Port=5432;Database=ombi;Username=ombi;Password=ombi"
+  }
+}
+```

src/Ombi.Store/Migrations/ExternalMySql/20240909082427_WatchListUserId.Designer.cs

@@ -0,0 +1,635 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Ombi.Store.Context.MySql;
+
+#nullable disable
+
+namespace Ombi.Store.Migrations.ExternalMySql
+{
+    [DbContext(typeof(ExternalMySqlContext))]
+    [Migration("20240909082427_WatchListUserId")]
+    partial class WatchListUserId
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
+
+            modelBuilder.Entity("Ombi.Store.Entities.CouchPotatoCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CouchPotatoCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("EmbyId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<bool>("Has4K")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Quality")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("TheMovieDbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("TvDbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmbyContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("EmbyId")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ParentId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("int");
+
+                    b.Property<string>("TheMovieDbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("TvDbId")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("EmbyEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.JellyfinContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("Has4K")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("JellyfinId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Quality")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("TheMovieDbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("TvDbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("JellyfinContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.JellyfinEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("JellyfinId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ParentId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("int");
+
+                    b.Property<string>("TheMovieDbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("TvDbId")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("JellyfinEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.LidarrAlbumCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("ArtistId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ForeignAlbumId")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("Monitored")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<decimal>("PercentOfTracks")
+                        .HasColumnType("decimal(65,30)");
+
+                    b.Property<DateTime>("ReleaseDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("TrackCount")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LidarrAlbumCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.LidarrArtistCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ArtistId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ArtistName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ForeignArtistId")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("Monitored")
+                        .HasColumnType("tinyint(1)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LidarrArtistCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("int");
+
+                    b.Property<string>("GrandparentKey")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Key")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ParentKey")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GrandparentKey");
+
+                    b.ToTable("PlexEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexSeasonsContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ParentKey")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PlexContentId")
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("PlexServerContentId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("SeasonKey")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PlexServerContentId");
+
+                    b.ToTable("PlexSeasonsContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexServerContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("Has4K")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Quality")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ReleaseYear")
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("RequestId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("TheMovieDbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("TvDbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PlexServerContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexWatchlistHistory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("TmdbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PlexWatchlistHistory");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RadarrCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("Has4K")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("HasFile")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("HasRegular")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RadarrCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SickRageCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("TvDbId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SickRageCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SickRageEpisodeCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TvDbId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SickRageEpisodeCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SonarrCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TvDbId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SonarrCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SonarrEpisodeCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("HasFile")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("MovieDbId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TvDbId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SonarrEpisodeCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.UserPlayedEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserPlayedEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.UserPlayedMovie", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserPlayedMovie");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyEpisode", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.EmbyContent", "Series")
+                        .WithMany("Episodes")
+                        .HasForeignKey("ParentId")
+                        .HasPrincipalKey("EmbyId");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.JellyfinEpisode", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.JellyfinContent", "Series")
+                        .WithMany("Episodes")
+                        .HasForeignKey("ParentId")
+                        .HasPrincipalKey("JellyfinId");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexEpisode", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.PlexServerContent", "Series")
+                        .WithMany("Episodes")
+                        .HasForeignKey("GrandparentKey")
+                        .HasPrincipalKey("Key");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexSeasonsContent", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.PlexServerContent", null)
+                        .WithMany("Seasons")
+                        .HasForeignKey("PlexServerContentId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyContent", b =>
+                {
+                    b.Navigation("Episodes");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.JellyfinContent", b =>
+                {
+                    b.Navigation("Episodes");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexServerContent", b =>
+                {
+                    b.Navigation("Episodes");
+
+                    b.Navigation("Seasons");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/Ombi.Store/Migrations/ExternalMySql/20240909082427_WatchListUserId.cs

@@ -0,0 +1,366 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Ombi.Store.Migrations.ExternalMySql
+{
+    /// <inheritdoc />
+    public partial class WatchListUserId : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "UserPlayedMovie",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "UserPlayedEpisode",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "SonarrEpisodeCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "SonarrCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "SickRageEpisodeCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "SickRageCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "RadarrCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "PlexWatchlistHistory",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "AddedAt",
+                table: "PlexWatchlistHistory",
+                type: "datetime(6)",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<string>(
+                name: "UserId",
+                table: "PlexWatchlistHistory",
+                type: "longtext",
+                nullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "PlexServerContent",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "PlexSeasonsContent",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "PlexEpisode",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "LidarrArtistCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "LidarrAlbumCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "JellyfinEpisode",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "JellyfinContent",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "EmbyEpisode",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "EmbyContent",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "CouchPotatoCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AddedAt",
+                table: "PlexWatchlistHistory");
+
+            migrationBuilder.DropColumn(
+                name: "UserId",
+                table: "PlexWatchlistHistory");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "UserPlayedMovie",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "UserPlayedEpisode",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "SonarrEpisodeCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "SonarrCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "SickRageEpisodeCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "SickRageCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "RadarrCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "PlexWatchlistHistory",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "PlexServerContent",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "PlexSeasonsContent",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "PlexEpisode",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "LidarrArtistCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "LidarrAlbumCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "JellyfinEpisode",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "JellyfinContent",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "EmbyEpisode",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "EmbyContent",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "Id",
+                table: "CouchPotatoCache",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+        }
+    }
+}

src/Ombi.Store/Migrations/ExternalMySql/ExternalMySqlContextModelSnapshot.cs

@@ -2,6 +2,7 @@
 using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Ombi.Store.Context.MySql;
 
@@ -16,15 +17,19 @@ namespace Ombi.Store.Migrations.ExternalMySql
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.9")
+                .HasAnnotation("ProductVersion", "8.0.5")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
+            MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
+
             modelBuilder.Entity("Ombi.Store.Entities.CouchPotatoCache", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<int>("TheMovieDbId")
                         .HasColumnType("int");
 
@@ -39,6 +44,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<DateTime>("AddedAt")
                         .HasColumnType("datetime(6)");
 
@@ -84,6 +91,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<DateTime>("AddedAt")
                         .HasColumnType("datetime(6)");
 
@@ -127,6 +136,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<DateTime>("AddedAt")
                         .HasColumnType("datetime(6)");
 
@@ -172,6 +183,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<DateTime>("AddedAt")
                         .HasColumnType("datetime(6)");
 
@@ -215,6 +228,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<DateTime>("AddedAt")
                         .HasColumnType("datetime(6)");
 
@@ -250,6 +265,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<int>("ArtistId")
                         .HasColumnType("int");
 
@@ -273,6 +290,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<int>("EpisodeNumber")
                         .HasColumnType("int");
 
@@ -304,6 +323,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<string>("ParentKey")
                         .HasColumnType("longtext");
 
@@ -332,6 +353,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<DateTime>("AddedAt")
                         .HasColumnType("datetime(6)");
 
@@ -380,9 +403,17 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("datetime(6)");
+
                     b.Property<string>("TmdbId")
                         .HasColumnType("longtext");
 
+                    b.Property<string>("UserId")
+                        .HasColumnType("longtext");
+
                     b.HasKey("Id");
 
                     b.ToTable("PlexWatchlistHistory");
@@ -394,6 +425,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<bool>("Has4K")
                         .HasColumnType("tinyint(1)");
 
@@ -417,6 +450,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<int>("TvDbId")
                         .HasColumnType("int");
 
@@ -431,6 +466,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<int>("EpisodeNumber")
                         .HasColumnType("int");
 
@@ -451,6 +488,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<int>("TheMovieDbId")
                         .HasColumnType("int");
 
@@ -468,6 +507,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<int>("EpisodeNumber")
                         .HasColumnType("int");
 
@@ -494,6 +535,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<int>("EpisodeNumber")
                         .HasColumnType("int");
 
@@ -517,6 +560,8 @@ namespace Ombi.Store.Migrations.ExternalMySql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
                     b.Property<int>("TheMovieDbId")
                         .HasColumnType("int");
 

src/Ombi.Store/Migrations/ExternalPostgres/20240909071802_WatchListUserId.Designer.cs

@@ -0,0 +1,635 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Ombi.Store.Context.Postgres;
+
+#nullable disable
+
+namespace Ombi.Store.Migrations.ExternalPostgres
+{
+    [DbContext(typeof(ExternalPostgresContext))]
+    [Migration("20240909071802_WatchListUserId")]
+    partial class WatchListUserId
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Ombi.Store.Entities.CouchPotatoCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CouchPotatoCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("EmbyId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Has4K")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Quality")
+                        .HasColumnType("text");
+
+                    b.Property<string>("TheMovieDbId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.Property<string>("TvDbId")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmbyContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("EmbyId")
+                        .HasColumnType("text");
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ParentId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("TheMovieDbId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.Property<string>("TvDbId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("EmbyEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.JellyfinContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("Has4K")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("JellyfinId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Quality")
+                        .HasColumnType("text");
+
+                    b.Property<string>("TheMovieDbId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.Property<string>("TvDbId")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("JellyfinContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.JellyfinEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("JellyfinId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ParentId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("TheMovieDbId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.Property<string>("TvDbId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("JellyfinEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.LidarrAlbumCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("ArtistId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ForeignAlbumId")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Monitored")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal>("PercentOfTracks")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime>("ReleaseDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.Property<int>("TrackCount")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LidarrAlbumCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.LidarrArtistCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ArtistId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ArtistName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForeignArtistId")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Monitored")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LidarrArtistCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("GrandparentKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Key")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ParentKey")
+                        .HasColumnType("text");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GrandparentKey");
+
+                    b.ToTable("PlexEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexSeasonsContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ParentKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PlexContentId")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("PlexServerContentId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SeasonKey")
+                        .HasColumnType("text");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PlexServerContentId");
+
+                    b.ToTable("PlexSeasonsContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexServerContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("Has4K")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Quality")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReleaseYear")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("RequestId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("TheMovieDbId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.Property<string>("TvDbId")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PlexServerContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexWatchlistHistory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("TmdbId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PlexWatchlistHistory");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RadarrCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("Has4K")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("HasFile")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("HasRegular")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RadarrCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SickRageCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("TvDbId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SickRageCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SickRageEpisodeCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("TvDbId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SickRageEpisodeCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SonarrCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("TvDbId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SonarrCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SonarrEpisodeCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("HasFile")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("MovieDbId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("TvDbId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SonarrEpisodeCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.UserPlayedEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserPlayedEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.UserPlayedMovie", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserPlayedMovie");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyEpisode", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.EmbyContent", "Series")
+                        .WithMany("Episodes")
+                        .HasForeignKey("ParentId")
+                        .HasPrincipalKey("EmbyId");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.JellyfinEpisode", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.JellyfinContent", "Series")
+                        .WithMany("Episodes")
+                        .HasForeignKey("ParentId")
+                        .HasPrincipalKey("JellyfinId");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexEpisode", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.PlexServerContent", "Series")
+                        .WithMany("Episodes")
+                        .HasForeignKey("GrandparentKey")
+                        .HasPrincipalKey("Key");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexSeasonsContent", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.PlexServerContent", null)
+                        .WithMany("Seasons")
+                        .HasForeignKey("PlexServerContentId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyContent", b =>
+                {
+                    b.Navigation("Episodes");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.JellyfinContent", b =>
+                {
+                    b.Navigation("Episodes");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexServerContent", b =>
+                {
+                    b.Navigation("Episodes");
+
+                    b.Navigation("Seasons");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/Ombi.Store/Migrations/ExternalPostgres/20240909071802_WatchListUserId.cs

@@ -0,0 +1,152 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Ombi.Store.Migrations.ExternalPostgres
+{
+    /// <inheritdoc />
+    public partial class WatchListUserId : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "AddedAt",
+                table: "PlexWatchlistHistory",
+                type: "timestamp without time zone",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<string>(
+                name: "UserId",
+                table: "PlexWatchlistHistory",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "AddedAt",
+                table: "PlexServerContent",
+                type: "timestamp without time zone",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp with time zone");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "ReleaseDate",
+                table: "LidarrAlbumCache",
+                type: "timestamp without time zone",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp with time zone");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "AddedAt",
+                table: "LidarrAlbumCache",
+                type: "timestamp without time zone",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp with time zone");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "AddedAt",
+                table: "JellyfinEpisode",
+                type: "timestamp without time zone",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp with time zone");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "AddedAt",
+                table: "JellyfinContent",
+                type: "timestamp without time zone",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp with time zone");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "AddedAt",
+                table: "EmbyEpisode",
+                type: "timestamp without time zone",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp with time zone");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "AddedAt",
+                table: "EmbyContent",
+                type: "timestamp without time zone",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp with time zone");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AddedAt",
+                table: "PlexWatchlistHistory");
+
+            migrationBuilder.DropColumn(
+                name: "UserId",
+                table: "PlexWatchlistHistory");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "AddedAt",
+                table: "PlexServerContent",
+                type: "timestamp with time zone",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp without time zone");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "ReleaseDate",
+                table: "LidarrAlbumCache",
+                type: "timestamp with time zone",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp without time zone");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "AddedAt",
+                table: "LidarrAlbumCache",
+                type: "timestamp with time zone",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp without time zone");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "AddedAt",
+                table: "JellyfinEpisode",
+                type: "timestamp with time zone",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp without time zone");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "AddedAt",
+                table: "JellyfinContent",
+                type: "timestamp with time zone",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp without time zone");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "AddedAt",
+                table: "EmbyEpisode",
+                type: "timestamp with time zone",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp without time zone");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "AddedAt",
+                table: "EmbyContent",
+                type: "timestamp with time zone",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp without time zone");
+        }
+    }
+}

src/Ombi.Store/Migrations/ExternalPostgres/ExternalPostgresContextModelSnapshot.cs

@@ -17,7 +17,7 @@ namespace Ombi.Store.Migrations.ExternalPostgres
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.22")
+                .HasAnnotation("ProductVersion", "8.0.5")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -47,7 +47,7 @@ namespace Ombi.Store.Migrations.ExternalPostgres
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime>("AddedAt")
-                        .HasColumnType("timestamp with time zone");
+                        .HasColumnType("timestamp without time zone");
 
                     b.Property<string>("EmbyId")
                         .IsRequired()
@@ -94,7 +94,7 @@ namespace Ombi.Store.Migrations.ExternalPostgres
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime>("AddedAt")
-                        .HasColumnType("timestamp with time zone");
+                        .HasColumnType("timestamp without time zone");
 
                     b.Property<string>("EmbyId")
                         .HasColumnType("text");
@@ -139,7 +139,7 @@ namespace Ombi.Store.Migrations.ExternalPostgres
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime>("AddedAt")
-                        .HasColumnType("timestamp with time zone");
+                        .HasColumnType("timestamp without time zone");
 
                     b.Property<bool>("Has4K")
                         .HasColumnType("boolean");
@@ -186,7 +186,7 @@ namespace Ombi.Store.Migrations.ExternalPostgres
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime>("AddedAt")
-                        .HasColumnType("timestamp with time zone");
+                        .HasColumnType("timestamp without time zone");
 
                     b.Property<int>("EpisodeNumber")
                         .HasColumnType("integer");
@@ -231,7 +231,7 @@ namespace Ombi.Store.Migrations.ExternalPostgres
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime>("AddedAt")
-                        .HasColumnType("timestamp with time zone");
+                        .HasColumnType("timestamp without time zone");
 
                     b.Property<int>("ArtistId")
                         .HasColumnType("integer");
@@ -246,7 +246,7 @@ namespace Ombi.Store.Migrations.ExternalPostgres
                         .HasColumnType("numeric");
 
                     b.Property<DateTime>("ReleaseDate")
-                        .HasColumnType("timestamp with time zone");
+                        .HasColumnType("timestamp without time zone");
 
                     b.Property<string>("Title")
                         .HasColumnType("text");
@@ -356,7 +356,7 @@ namespace Ombi.Store.Migrations.ExternalPostgres
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime>("AddedAt")
-                        .HasColumnType("timestamp with time zone");
+                        .HasColumnType("timestamp without time zone");
 
                     b.Property<bool>("Has4K")
                         .HasColumnType("boolean");
@@ -405,9 +405,15 @@ namespace Ombi.Store.Migrations.ExternalPostgres
 
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("timestamp without time zone");
+
                     b.Property<string>("TmdbId")
                         .HasColumnType("text");
 
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
                     b.HasKey("Id");
 
                     b.ToTable("PlexWatchlistHistory");

src/Ombi.Store/Migrations/ExternalSqlite/20240909070705_WatchListUserId.Designer.cs

@@ -0,0 +1,594 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Ombi.Store.Context.Sqlite;
+
+#nullable disable
+
+namespace Ombi.Store.Migrations.ExternalSqlite
+{
+    [DbContext(typeof(ExternalSqliteContext))]
+    [Migration("20240909070705_WatchListUserId")]
+    partial class WatchListUserId
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.5");
+
+            modelBuilder.Entity("Ombi.Store.Entities.CouchPotatoCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CouchPotatoCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmbyId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Has4K")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Quality")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TheMovieDbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TvDbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmbyContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmbyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ParentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TheMovieDbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TvDbId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("EmbyEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.JellyfinContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Has4K")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("JellyfinId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Quality")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TheMovieDbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TvDbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("JellyfinContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.JellyfinEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("JellyfinId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ParentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TheMovieDbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TvDbId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("JellyfinEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.LidarrAlbumCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ArtistId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ForeignAlbumId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Monitored")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("PercentOfTracks")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ReleaseDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("TrackCount")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LidarrAlbumCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.LidarrArtistCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ArtistId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ArtistName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ForeignArtistId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Monitored")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LidarrArtistCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("GrandparentKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Key")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ParentKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GrandparentKey");
+
+                    b.ToTable("PlexEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexSeasonsContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ParentKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PlexContentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("PlexServerContentId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SeasonKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PlexServerContentId");
+
+                    b.ToTable("PlexSeasonsContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexServerContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Has4K")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Quality")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ReleaseYear")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("RequestId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TheMovieDbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TvDbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PlexServerContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexWatchlistHistory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TmdbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PlexWatchlistHistory");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RadarrCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Has4K")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("HasFile")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("HasRegular")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RadarrCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SickRageCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TvDbId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SickRageCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SickRageEpisodeCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TvDbId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SickRageEpisodeCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SonarrCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TvDbId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SonarrCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SonarrEpisodeCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("HasFile")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("MovieDbId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TvDbId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SonarrEpisodeCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.UserPlayedEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserPlayedEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.UserPlayedMovie", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserPlayedMovie");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyEpisode", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.EmbyContent", "Series")
+                        .WithMany("Episodes")
+                        .HasForeignKey("ParentId")
+                        .HasPrincipalKey("EmbyId");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.JellyfinEpisode", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.JellyfinContent", "Series")
+                        .WithMany("Episodes")
+                        .HasForeignKey("ParentId")
+                        .HasPrincipalKey("JellyfinId");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexEpisode", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.PlexServerContent", "Series")
+                        .WithMany("Episodes")
+                        .HasForeignKey("GrandparentKey")
+                        .HasPrincipalKey("Key");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexSeasonsContent", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.PlexServerContent", null)
+                        .WithMany("Seasons")
+                        .HasForeignKey("PlexServerContentId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyContent", b =>
+                {
+                    b.Navigation("Episodes");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.JellyfinContent", b =>
+                {
+                    b.Navigation("Episodes");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexServerContent", b =>
+                {
+                    b.Navigation("Episodes");
+
+                    b.Navigation("Seasons");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/Ombi.Store/Migrations/ExternalSqlite/20240909070705_WatchListUserId.cs

@@ -0,0 +1,40 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Ombi.Store.Migrations.ExternalSqlite
+{
+    /// <inheritdoc />
+    public partial class WatchListUserId : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "AddedAt",
+                table: "PlexWatchlistHistory",
+                type: "TEXT",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<string>(
+                name: "UserId",
+                table: "PlexWatchlistHistory",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AddedAt",
+                table: "PlexWatchlistHistory");
+
+            migrationBuilder.DropColumn(
+                name: "UserId",
+                table: "PlexWatchlistHistory");
+        }
+    }
+}

src/Ombi.Store/Migrations/ExternalSqlite/ExternalSqliteContextModelSnapshot.cs

@@ -15,7 +15,7 @@ namespace Ombi.Store.Migrations.ExternalSqlite
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "6.0.9");
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.5");
 
             modelBuilder.Entity("Ombi.Store.Entities.CouchPotatoCache", b =>
                 {
@@ -378,9 +378,15 @@ namespace Ombi.Store.Migrations.ExternalSqlite
                         .ValueGeneratedOnAdd()
                         .HasColumnType("INTEGER");
 
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("TEXT");
+
                     b.Property<string>("TmdbId")
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
                     b.HasKey("Id");
 
                     b.ToTable("PlexWatchlistHistory");

src/Ombi.Store/Ombi.Store.csproj

@@ -19,7 +19,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.5" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.22" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
     <PackageReference Include="Polly" Version="7.2.3" />

src/Ombi.Store/Repository/PlexContentRepository.cs

@@ -94,7 +94,7 @@ namespace Ombi.Store.Repository
 
         public async Task<PlexServerContent> GetByKey(string key)
         {
-            return await Db.PlexServerContent.Include(x => x.Seasons).FirstOrDefaultAsync(x => x.Key == key);
+            return await Db.PlexServerContent.Include(x => x.Seasons).Include(x => x.Episodes).FirstOrDefaultAsync(x => x.Key == key);
         }
 
         public IEnumerable<PlexServerContent> GetWhereContentByCustom(Expression<Func<PlexServerContent, bool>> predicate)

src/Ombi.Updater/Ombi.Updater.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
     <PackageReference Include="Serilog" Version="2.12.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />

src/Ombi/ClientApp/angular.json

@@ -105,7 +105,6 @@
           "options": {
             "tsConfig": [
               "src/tsconfig.json"
-              "src/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"

src/Ombi/ClientApp/package.json

@@ -28,8 +28,8 @@
 		"@auth0/angular-jwt": "^5.0.2",
 		"@fortawesome/fontawesome-free": "^6.6.0",
 		"@microsoft/signalr": "^6.0.23",
-		"@ngx-translate/core": "^14.0.0",
-		"@ngx-translate/http-loader": "^7.0.0",
+		"@ngx-translate/core": "^15.0.0",
+		"@ngx-translate/http-loader": "^8.0.0",
 		"@ngxs/devtools-plugin": "3.8.2",
 		"@ngxs/store": "3.8.2",
 		"@types/jquery": "^3.5.30",

src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.html

@@ -5,9 +5,17 @@
     <mat-button-toggle id="{{id}}Tv" [ngClass]="{'button-active': discoverOptions === DiscoverOption.Tv}" value="{{DiscoverOption.Tv}}" class="discover-filter-button">{{'Discovery.Tv' | translate}}</mat-button-toggle>
   </mat-button-toggle-group>
 </div>
-
+@defer (when discoverResults.length > 0; prefetch on idle) {
 <p-carousel #carousel [numVisible]="10" [numScroll]="10" [page]="0" [value]="discoverResults" [responsiveOptions]="responsiveOptions" (onPage)="newPage()">
     <ng-template let-result pTemplate="item">
         <discover-card [discoverType]="discoverType" [isAdmin]="isAdmin" [result]="result" [is4kEnabled]="is4kEnabled"></discover-card>
     </ng-template>
-</p-carousel>
+</p-carousel>
+}
+@placeholder(minimum 300) {
+    <div class="row loading-container">
+        <div class="col-2" *ngFor="let item of [1,2,3,4,5,6,7,8,9,10]">
+            <p-skeleton width="100%" height="270px"></p-skeleton>
+        </div>
+    </div>
+}

src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.scss

@@ -105,6 +105,30 @@
    padding: 5px;
 }
 
+.loading-container {
+    display: flex;
+    gap: 10px;
+    padding: 0 20px;
+    margin-top: 20px;
+}
+
+.loading-container .col-2 {
+    flex: 0 0 auto;
+    width: calc(10% - 9px);
+}
+
+@media (max-width: 768px) {
+    .loading-container .col-2 {
+        width: calc(50% - 5px);
+    }
+}
+
+@media (max-width: 480px) {
+    .loading-container .col-2 {
+        width: calc(100% - 0px);
+    }
+}
+
 @media (min-width:755px){
   ::ng-deep .p-carousel-item{
     flex: 1 0 200px !important;

src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.ts

@@ -43,7 +43,7 @@ export class CarouselListComponent implements OnInit {
     get mediaTypeStorageKey() {
         return "DiscoverOptions" + this.discoverType.toString();
     };
-    private amountToLoad = 17;
+    private amountToLoad = 10;
     private currentlyLoaded = 0;
     private baseUrl: string = "";
 
@@ -148,6 +148,7 @@ export class CarouselListComponent implements OnInit {
     }
 
     public async ngOnInit() {
+        
         this.is4kEnabled = this.featureFacade.is4kEnabled();
         this.currentlyLoaded = 0;
         const localDiscoverOptions = +this.storageService.get(this.mediaTypeStorageKey);
@@ -155,11 +156,15 @@ export class CarouselListComponent implements OnInit {
             this.discoverOptions = DiscoverOption[DiscoverOption[localDiscoverOptions]];
         }
 
-        let currentIteration = 0;
-        while (this.discoverResults.length <= 14 && currentIteration <= 3) {
-            currentIteration++;
+        // Load initial data - just enough to fill the first carousel page
+        // This reduces initial API calls and improves loading performance
+        await this.loadData(false);
+        
+        // If we don't have enough results to fill the carousel, load one more batch
+        if (this.discoverResults.length < 10) {
             await this.loadData(false);
         }
+        
     }
 
     public async toggleChanged(event: MatButtonToggleChange) {
@@ -293,7 +298,6 @@ export class CarouselListComponent implements OnInit {
         }
 
         this.discoverResults.push(...tempResults);
-        this.carousel.ngAfterContentInit();
 
         this.finishLoading();
     }

src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.html

@@ -1,51 +1,108 @@
 <div class="small-middle-container">
-	<div class="section">
-		@defer (on viewport; prefetch on idle) {
-		<h2 id="genreHeading" data-toggle="collapse" href="#genreCollapse" role="button">{{ 'Discovery.Genres' | translate }}</h2>
-		<genre-button-select class="collapse show" id="genreCollapse"></genre-button-select>
-		}
-		@placeholder {
-			<p-skeleton width="100%" height="2rem"></p-skeleton>
-		}
-	</div>
-	<div class="section">
-		<h2>{{ 'Discovery.RecentlyRequestedTab' | translate }}</h2>
-		<div>
-			<ombi-recently-list [id]="'recentlyRequested'"></ombi-recently-list>
+	@defer (on viewport; prefetch on idle) {
+		<div class="section">
+			<h2 id="genreHeading" data-toggle="collapse" href="#genreCollapse" role="button">{{ 'Discovery.Genres' | translate }}</h2>
+			<genre-button-select class="collapse show" id="genreCollapse"></genre-button-select>
 		</div>
-	</div>
-
-
-	<div class="section" [hidden]="!showSeasonal">
-		<h2>{{ 'Discovery.SeasonalTab' | translate }}</h2>
-		<div>
-			<carousel-list
-				[id]="'seasonal'"
-				[isAdmin]="isAdmin"
-				[discoverType]="DiscoverType.Seasonal"
-				(movieCount)="setSeasonalMovieCount($event)"
-			></carousel-list>
+	} @placeholder(minimum 300) {
+		<div class="section">
+			<h2>{{ 'Discovery.Genres' | translate }}</h2>
+			<p-skeleton width="100%" height="60px"></p-skeleton>
 		</div>
-	</div>
+	}
 
-	<div class="section">
-		<h2>{{ 'Discovery.PopularTab' | translate }}</h2>
-		<div>
-			<carousel-list [id]="'popular'" [isAdmin]="isAdmin" [discoverType]="DiscoverType.Popular"></carousel-list>
+	@defer (on viewport; prefetch on idle) {
+		<div class="section">
+			<h2>{{ 'Discovery.RecentlyRequestedTab' | translate }}</h2>
+			<div>
+				<ombi-recently-list [id]="'recentlyRequested'"></ombi-recently-list>
+			</div>
 		</div>
-	</div>
+	} @placeholder(minimum 300) {
+		<div class="section">
+			<h2>{{ 'Discovery.RecentlyRequestedTab' | translate }}</h2>
+			<div class="row loading-container">
+				<div class="col-2" *ngFor="let item of [1,2,3,4,5]">
+					<p-skeleton width="100%" height="270px"></p-skeleton>
+				</div>
+			</div>
+		</div>
+	}
 
-	<div class="section">
-		<h2>{{ 'Discovery.TrendingTab' | translate }}</h2>
-		<div>
-			<carousel-list [id]="'trending'" [isAdmin]="isAdmin" [discoverType]="DiscoverType.Trending"></carousel-list>
+	@defer (on viewport; prefetch on idle) {
+		<div class="section" [hidden]="!showSeasonal">
+			<h2>{{ 'Discovery.SeasonalTab' | translate }}</h2>
+			<div>
+				<carousel-list
+					[id]="'seasonal'"
+					[isAdmin]="isAdmin"
+					[discoverType]="DiscoverType.Seasonal"
+					(movieCount)="setSeasonalMovieCount($event)"
+				></carousel-list>
+			</div>
 		</div>
-	</div>
+	} @placeholder(minimum 300) {
+		<div class="section">
+			<h2>{{ 'Discovery.SeasonalTab' | translate }}</h2>
+			<div class="row loading-container">
+				<div class="col-2" *ngFor="let item of [1,2,3,4,5,6,7,8,9,10]">
+					<p-skeleton width="100%" height="270px"></p-skeleton>
+				</div>
+			</div>
+		</div>
+	}
 
-	<div class="section">
-		<h2>{{ 'Discovery.UpcomingTab' | translate }}</h2>
-		<div>
-			<carousel-list [id]="'upcoming'" [isAdmin]="isAdmin" [discoverType]="DiscoverType.Upcoming"></carousel-list>
+	@defer (on viewport; prefetch on idle) {
+		<div class="section">
+			<h2>{{ 'Discovery.PopularTab' | translate }}</h2>
+			<div>
+				<carousel-list [id]="'popular'" [isAdmin]="isAdmin" [discoverType]="DiscoverType.Popular"></carousel-list>
+			</div>
 		</div>
-	</div>
+	} @placeholder(minimum 300) {
+		<div class="section">
+			<h2>{{ 'Discovery.PopularTab' | translate }}</h2>
+			<div class="row loading-container">
+				<div class="col-2" *ngFor="let item of [1,2,3,4,5,6,7,8,9,10]">
+					<p-skeleton width="100%" height="270px"></p-skeleton>
+				</div>
+			</div>
+		</div>
+	}
+
+	@defer (on viewport; prefetch on idle) {
+		<div class="section">
+			<h2>{{ 'Discovery.TrendingTab' | translate }}</h2>
+			<div>
+				<carousel-list [id]="'trending'" [isAdmin]="isAdmin" [discoverType]="DiscoverType.Trending"></carousel-list>
+			</div>
+		</div>
+	} @placeholder(minimum 300) {
+		<div class="section">
+			<h2>{{ 'Discovery.TrendingTab' | translate }}</h2>
+			<div class="row loading-container">
+				<div class="col-2" *ngFor="let item of [1,2,3,4,5,6,7,8,9,10]">
+					<p-skeleton width="100%" height="270px"></p-skeleton>
+				</div>
+			</div>
+		</div>
+	}
+
+	@defer (on viewport; prefetch on idle) {
+		<div class="section">
+			<h2>{{ 'Discovery.UpcomingTab' | translate }}</h2>
+			<div>
+				<carousel-list [id]="'upcoming'" [isAdmin]="isAdmin" [discoverType]="DiscoverType.Upcoming"></carousel-list>
+			</div>
+		</div>
+	} @placeholder(minimum 300) {
+		<div class="section">
+			<h2>{{ 'Discovery.UpcomingTab' | translate }}</h2>
+			<div class="row loading-container">
+				<div class="col-2" *ngFor="let item of [1,2,3,4,5,6,7,8,9,10]">
+					<p-skeleton width="100%" height="270px"></p-skeleton>
+				</div>
+			</div>
+		</div>
+	}
 </div>

src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.scss

@@ -9,4 +9,28 @@ h2{
     margin-top:40px;
     margin-left:40px;
     font-size: 24px;
+}
+
+.loading-container {
+    display: flex;
+    gap: 10px;
+    padding: 0 20px;
+    margin-top: 20px;
+}
+
+.loading-container .col-2 {
+    flex: 0 0 auto;
+    width: calc(10% - 9px);
+}
+
+@media (max-width: 768px) {
+    .loading-container .col-2 {
+        width: calc(50% - 5px);
+    }
+}
+
+@media (max-width: 480px) {
+    .loading-container .col-2 {
+        width: calc(100% - 0px);
+    }
 }

src/Ombi/ClientApp/src/app/discover/components/genre/genre-button-select.component.html

@@ -1,13 +1,26 @@
-<div class="genre-container" *ngIf="movieGenreList$ | async as movies">
-    <mat-button-toggle-group name="discoverMode" (change)="toggleChanged($event, genre.type)" *ngFor="let genre of movies"
-        class="discover-filter-buttons-group">
-        <mat-button-toggle value="{{genre.id}}" class="discover-filter-button">{{genre.name}}</mat-button-toggle>
-    </mat-button-toggle-group>
-</div>
-<div class="genre-container" *ngIf="tvGenreList$ | async as tv">
-    <mat-button-toggle-group name="discoverMode" (change)="toggleChanged($event, genre.type)" *ngFor="let genre of tv"
-        class="discover-filter-buttons-group">
-        <mat-button-toggle value="{{genre.id}}" class="discover-filter-button">{{genre.name}}</mat-button-toggle>
-    </mat-button-toggle-group>
-    <mat-spinner *ngIf="isLoading" [diameter]="30"></mat-spinner>
-</div>
+
+@defer (when movieGenreList()) {
+    <div class="genre-container">
+        <mat-button-toggle-group name="discoverMode" (change)="toggleChanged($event, genre.type)" *ngFor="let genre of movieGenreList()"
+            class="discover-filter-buttons-group">
+            <mat-button-toggle value="{{genre.id}}" class="discover-filter-button">{{genre.name}}</mat-button-toggle>
+        </mat-button-toggle-group>
+    </div>
+}
+@placeholder(minimum 500) {
+    <p-skeleton width="100%" height="3.5rem"></p-skeleton>
+}
+
+@defer (when tvGenreList()) {
+    <div class="genre-container">
+        <mat-button-toggle-group name="discoverMode" (change)="toggleChanged($event, genre.type)" *ngFor="let genre of tvGenreList()"
+            class="discover-filter-buttons-group">
+            <mat-button-toggle value="{{genre.id}}" class="discover-filter-button">{{genre.name}}</mat-button-toggle>
+        </mat-button-toggle-group>
+    </div>
+}
+@placeholder(minimum 500) {
+    <p-skeleton width="100%" height="3.5rem"></p-skeleton>
+}
+
+<mat-spinner *ngIf="isLoading" [diameter]="30"></mat-spinner>

src/Ombi/ClientApp/src/app/discover/components/genre/genre-button-select.component.ts

@@ -1,10 +1,11 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, computed, signal } from "@angular/core";
 import { SearchV2Service } from "../../../services";
 import { MatButtonToggleChange } from "@angular/material/button-toggle";
 import { RequestType } from "../../../interfaces";
 import { AdvancedSearchDialogDataService } from "app/shared/advanced-search-dialog/advanced-search-dialog-data.service";
 import { Router } from "@angular/router";
 import { map, Observable } from "rxjs";
+import { toSignal } from '@angular/core/rxjs-interop';
 
 interface IGenreSelect {
     name: string;
@@ -17,8 +18,10 @@ interface IGenreSelect {
     styleUrls: ["./genre-button-select.component.scss"],
 })
 export class GenreButtonSelectComponent implements OnInit {
-    public movieGenreList$: Observable<IGenreSelect[]> = null;
-    public tvGenreList$: Observable<IGenreSelect[]> = null;
+
+    public movieGenreList = signal<IGenreSelect[]>(null);
+    public tvGenreList = signal<IGenreSelect[]>(null);
+
 
     isLoading: boolean = false;
 
@@ -27,8 +30,14 @@ export class GenreButtonSelectComponent implements OnInit {
         private router: Router) { }
 
     public ngOnInit(): void {
-        this.movieGenreList$ = this.searchService.getGenres("movie").pipe(map(x => x.slice(0, 10).map(y => ({ name: y.name, id: y.id, type: "movie" }))));
-        this.tvGenreList$ = this.searchService.getGenres("tv").pipe(map(x => x.slice(0, 10).map(y => ({ name: y.name, id: y.id, type: "tv" }))));
+        this.searchService.getGenres("movie").pipe(map(x => x.slice(0, 10).map(y => ({ name: y.name, id: y.id, type: "movie" } as IGenreSelect))))
+            .subscribe(x => {
+                this.movieGenreList.set(x);
+            });
+        this.searchService.getGenres("tv").pipe(map(x => x.slice(0, 10).map(y => ({ name: y.name, id: y.id, type: "tv" } as IGenreSelect))))
+            .subscribe(x => {
+                this.tvGenreList.set(x);
+            });
     }
 
     public async toggleChanged(event: MatButtonToggleChange, type: "movie"|"tv") {

src/Ombi/ClientApp/src/app/discover/components/recently-requested-list/recently-requested-list.component.html

@@ -1,9 +1,8 @@
-<div *ngIf="requests$ | async as requests">
-    <div *ngIf="requests.length > 0">
-        <p-carousel #carousel [value]="requests" [numVisible]="3" [numScroll]="1"
+@defer (when requests(); prefetch on idle) {
+    <div *ngIf="requests().length > 0">
+        <p-carousel #carousel [value]="requests()" [numVisible]="3" [numScroll]="1"
             [responsiveOptions]="responsiveOptions" [page]="0">
             <ng-template let-result pTemplate="item">
-                @defer (on viewport; prefetch on idle) {
                 <ombi-detailed-card
                     [request]="result"
                     [isAdmin]="isAdmin"
@@ -11,11 +10,13 @@
                     (onApprove)="approve(result)"
                     (onDeny)="deny(result)">
                 </ombi-detailed-card>
-            }
-            @placeholder {
-                <p-skeleton width="100%" height="315px"></p-skeleton>
-            }
             </ng-template>
         </p-carousel>
     </div>
-</div>
+}@placeholder(minimum 300) {
+    <div class="row loading-container">
+        <div class="col-2" *ngFor="let item of [1,2,3,4,5]">
+            <p-skeleton width="100%" height="270px"></p-skeleton>
+        </div>
+    </div>
+}

src/Ombi/ClientApp/src/app/discover/components/recently-requested-list/recently-requested-list.component.scss

@@ -105,6 +105,30 @@
    padding: 5px;
 }
 
+.loading-container {
+    display: flex;
+    gap: 10px;
+    padding: 0 20px;
+    margin-top: 20px;
+}
+
+.loading-container .col-2 {
+    flex: 0 0 auto;
+    width: calc(20% - 8px);
+}
+
+@media (max-width: 768px) {
+    .loading-container .col-2 {
+        width: calc(50% - 5px);
+    }
+}
+
+@media (max-width: 480px) {
+    .loading-container .col-2 {
+        width: calc(100% - 0px);
+    }
+}
+
 @media (min-width:755px){
   ::ng-deep .p-carousel-item{
     flex: 1 0 200px !important;

src/Ombi/ClientApp/src/app/discover/components/recently-requested-list/recently-requested-list.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input, ViewChild, OnDestroy } from "@angular/core";
+import { Component, OnInit, Input, ViewChild, OnDestroy, signal } from "@angular/core";
 import { IRecentlyRequested, IRequestEngineResult, RequestType } from "../../../interfaces";
 import { Carousel } from 'primeng/carousel';
 import { ResponsiveOptions } from "../carousel.options";
@@ -31,6 +31,7 @@ export class RecentlyRequestedListComponent implements OnInit, OnDestroy {
     @ViewChild('carousel', {static: false}) carousel: Carousel;
 
     public requests$: Observable<IRecentlyRequested[]>;
+    public requests = signal<IRecentlyRequested[]>(null);
 
     public responsiveOptions: any;
     public RequestType = RequestType;
@@ -119,11 +120,13 @@ export class RecentlyRequestedListComponent implements OnInit, OnDestroy {
     }
 
     private loadData() {
-        this.requests$ = this.requestServiceV2.getRecentlyRequested().pipe(
+        this.requestServiceV2.getRecentlyRequested().pipe(
             tap(() => this.loading()),
             takeUntil(this.$loadSub),
             finalize(() => this.finishLoading())
-        );
+        ).subscribe(x => {
+            this.requests.set(x);
+        });
     }
 
     private loading() {

src/Ombi/ClientApp/src/app/interfaces/INotificationSettings.ts

@@ -52,6 +52,7 @@ export enum NotificationType {
     IssueComment = 10,
     Newsletter = 11,
     PartiallyAvailable = 12,
+    PlexWatchlistTokenExpired = 13
 }
 
 export interface IDiscordNotifcationSettings extends INotificationSettings {

src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts

@@ -25,12 +25,19 @@ export interface IMovieRequests extends IFullBaseRequest {
   requestedDate: Date;
   watchedByRequestedUser: boolean;
   playedByUsersCount: number;
+  requestCombination: RequestCombination;
 
   // For the UI
   rootPathOverrideTitle: string;
   qualityOverrideTitle: string;
 }
 
+export enum RequestCombination {
+  Normal,
+  FourK,
+  Both
+}
+
 export interface IMovieAdvancedOptions {
   requestId: number;
   qualityOverride: number;

src/Ombi/ClientApp/src/app/interfaces/ISettings.ts

@@ -114,6 +114,7 @@ export interface IPlexSettings extends ISettings {
   enable: boolean;
   enableWatchlistImport: boolean;
   monitorAll: boolean;
+  notifyOnWatchlistTokenExpiration: boolean;
   servers: IPlexServer[];
 }
 

src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.ts

@@ -1,6 +1,6 @@
 import { Component, Inject, OnInit } from "@angular/core";
 import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
-import { IAdvancedData, IRadarrProfile, IRadarrRootFolder } from "../../../../../interfaces";
+import { IAdvancedData, IRadarrProfile, IRadarrRootFolder, RequestCombination } from "../../../../../interfaces";
 import { RadarrService } from "../../../../../services";
 
 @Component({
@@ -11,6 +11,8 @@ export class MovieAdvancedOptionsComponent implements OnInit {
 
     public radarrProfiles: IRadarrProfile[];
     public radarrRootFolders: IRadarrRootFolder[];
+    public show4k: boolean = false;
+    public showNormal: boolean = false;
 
     constructor(public dialogRef: MatDialogRef<MovieAdvancedOptionsComponent>, @Inject(MAT_DIALOG_DATA) public data: IAdvancedData,
         private radarrService: RadarrService
@@ -19,16 +21,31 @@ export class MovieAdvancedOptionsComponent implements OnInit {
 
 
     public async ngOnInit() {
-        this.radarrService.getQualityProfilesFromSettings().subscribe(c => {
-            this.radarrProfiles = c;
-            this.data.profiles = c;
-            this.setQualityOverrides();
-        });
-        this.radarrService.getRootFoldersFromSettings().subscribe(c => {
-            this.radarrRootFolders = c;
-            this.data.rootFolders = c;
-            this.setRootFolderOverrides();
-        });
+        this.show4k = this.data.movieRequest.requestCombination === RequestCombination.FourK || this.data.movieRequest.requestCombination === RequestCombination.Both;
+        this.showNormal = this.data.movieRequest.requestCombination === RequestCombination.Normal || this.data.movieRequest.requestCombination === RequestCombination.Both;
+        if (this.show4k) {
+            this.radarrService.getQualityProfiles4kFromSettings().subscribe(c => {
+                this.radarrProfiles = c;
+                this.data.profiles = c;
+                this.setQualityOverrides();
+            });
+            this.radarrService.getRootFolders4kFromSettings().subscribe(c => {
+                this.radarrRootFolders = c;
+                this.data.rootFolders = c;
+                this.setRootFolderOverrides();
+            });
+        } else { // Currently show either 4k or normal, if it's a dual request there needs to be more work done to save the overrides for 4k separately
+            this.radarrService.getQualityProfilesFromSettings().subscribe(c => {
+                this.radarrProfiles = c;
+                this.data.profiles = c;
+                this.setQualityOverrides();
+            });
+            this.radarrService.getRootFoldersFromSettings().subscribe(c => {
+                this.radarrRootFolders = c;
+                this.data.rootFolders = c;
+                this.setRootFolderOverrides();
+            });
+        }
     }
 
     private setQualityOverrides(): void {

src/Ombi/ClientApp/src/app/pipes/OmbiDatePipe.ts

@@ -1,5 +1,6 @@
 import { Pipe, PipeTransform } from "@angular/core";
 import { FormatPipe } from 'ngx-date-fns';
+import { parseISO, format } from 'date-fns';
 
 @Pipe({
     name: "ombiDate",
@@ -10,8 +11,16 @@ export class OmbiDatePipe implements PipeTransform  {
         private FormatPipe: FormatPipe,
       ) {}
 
-    public transform(value: string, format: string ) {
-        const date = new Date(value);
-        return this.FormatPipe.transform(date, format);
+    public transform(value: string, formatStr: string ) {
+        if (!value) {
+            return '';
+        }
+        
+        // Parse the ISO string as UTC
+        const utcDate = parseISO(value);
+        
+        // Format the date using date-fns format function
+        // This will automatically handle the UTC to local conversion
+        return format(utcDate, formatStr);
     }
 }

src/Ombi/ClientApp/src/app/settings/plex/components/watchlist/plex-watchlist.component.html

@@ -1,38 +1,40 @@
-<div class="small-middle-container">
-    <fieldset style="fieldset">
-        <legend mat-dialog-title>Watchlist User Errors</legend>
-<div mat-dialog-content>
-        <p>
-            If there is an authentication error, this is because of an authentication issue with Plex (Token has expired). 
-            If this happens the user needs to re-login to Ombi.
-        </p>
-        <p>
-            <em class="fa-solid fa-check key"></em> Successfully syncing the watchlist
-            <br>
-            <em class="fa-solid fa-times key"></em> Authentication error syncing the watchlist
-            <br>
-            <em class="fas fa-user-alt-slash key"></em> Not enabled for user (They need to log into Ombi via Plex)
-        </p>
-        <table mat-table *ngIf="dataSource" [dataSource]="dataSource" matSort class="mat-elevation-z8">
-            <ng-container matColumnDef="userName">
-                <th mat-header-cell *matHeaderCellDef> Username </th>
-                <td mat-cell *matCellDef="let element"> {{element.userName}} </td>
-            </ng-container>
-            <ng-container matColumnDef="syncStatus">
-                <th mat-header-cell *matHeaderCellDef> Watchlist Sync Result </th>
-                <td mat-cell *matCellDef="let element">
-                    <em *ngIf="element.syncStatus === WatchlistSyncStatus.Successful" class="fa-solid fa-check"></em>
-                    <em *ngIf="element.syncStatus === WatchlistSyncStatus.Failed" class="fa-solid fa-times"></em>
-                    <em *ngIf="element.syncStatus === WatchlistSyncStatus.NotEnabled" class="fas fa-user-alt-slash"></em>
-                 </td>
-            </ng-container>
-
-            <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-            <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-        </table>
-    </div>
-    <mat-dialog-actions align="end">
-        <button mat-button mat-dialog-close>Close</button>
-      </mat-dialog-actions>
-    </fieldset>
+<div class="watchlist-dialog-container">
+  <mat-card class="watchlist-dialog-card">
+    <mat-card-header>
+      <mat-card-title>Watchlist User Errors</mat-card-title>
+    </mat-card-header>
+    <mat-card-content>
+      <div class="watchlist-info-section">
+        <mat-icon color="warn" class="info-icon">error_outline</mat-icon>
+        <span>
+          If there is an authentication error, this is because of an authentication issue with Plex (Token has expired). 
+          If this happens the user needs to re-login to Ombi.
+        </span>
+      </div>
+      <div class="watchlist-legend">
+        <span><mat-icon color="primary">check_circle</mat-icon> Successfully syncing the watchlist</span>
+        <span><mat-icon color="warn">cancel</mat-icon> Authentication error syncing the watchlist</span>
+        <span><mat-icon color="accent">person_off</mat-icon> Not enabled for user (They need to log into Ombi via Plex)</span>
+      </div>
+      <table mat-table *ngIf="dataSource" [dataSource]="dataSource" matSort class="mat-elevation-z8 modern-table">
+        <ng-container matColumnDef="userName">
+          <th mat-header-cell *matHeaderCellDef> Username </th>
+          <td mat-cell *matCellDef="let element"> {{element.userName}} </td>
+        </ng-container>
+        <ng-container matColumnDef="syncStatus">
+          <th mat-header-cell *matHeaderCellDef> Watchlist Sync Result </th>
+          <td mat-cell *matCellDef="let element">
+            <mat-icon *ngIf="element.syncStatus === WatchlistSyncStatus.Successful" color="primary">check_circle</mat-icon>
+            <mat-icon *ngIf="element.syncStatus === WatchlistSyncStatus.Failed" color="warn">cancel</mat-icon>
+            <mat-icon *ngIf="element.syncStatus === WatchlistSyncStatus.NotEnabled" color="accent">person_off</mat-icon>
+          </td>
+        </ng-container>
+        <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+        <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+      </table>
+    </mat-card-content>
+    <mat-card-actions align="end">
+      <button mat-stroked-button mat-dialog-close color="accent">Close</button>
+    </mat-card-actions>
+  </mat-card>
 </div>

src/Ombi/ClientApp/src/app/settings/plex/components/watchlist/plex-watchlist.component.scss

@@ -10,4 +10,96 @@
 
 .key {
     width: 40px;
+}
+
+.watchlist-dialog-container {
+  display: flex;
+  justify-content: center;
+  align-items: flex-start;
+  margin: 0 auto;
+}
+
+.watchlist-dialog-card {
+  background: #23272f;
+  color: #f1f3f6;
+  border-radius: 12px;
+  border: 1px solid #353a45;
+  box-shadow: 0 2px 12px 0 rgba(0,0,0,0.25);
+  min-width: 420px;
+  max-width: 600px;
+  width: 100%;
+  max-height: 70vh;
+  display: flex;
+  flex-direction: column;
+}
+
+mat-card-content {
+  flex: 1 1 auto;
+  overflow-y: auto;
+  min-height: 0;
+}
+
+mat-card-header {
+  border-bottom: 1px solid #353a45;
+  margin-bottom: 12px;
+  flex: 0 0 auto;
+}
+
+mat-card-title {
+  color: #fff !important;
+  font-weight: 700 !important;
+  letter-spacing: 0.5px;
+}
+
+.watchlist-info-section {
+  display: flex;
+  align-items: center;
+  background: #23272f;
+  color: #e0e3ea;
+  padding: 12px 0 8px 0;
+  font-size: 15px;
+  gap: 12px;
+}
+
+.info-icon {
+  font-size: 28px;
+  color: #ffb300;
+}
+
+.watchlist-legend {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  margin-bottom: 18px;
+  margin-top: 8px;
+  font-size: 14px;
+  color: #b0b6c3;
+}
+
+.watchlist-legend mat-icon {
+  vertical-align: middle;
+  margin-right: 6px;
+}
+
+.modern-table {
+  background: transparent;
+  color: #f1f3f6;
+  border-radius: 8px;
+  margin-top: 10px;
+}
+
+.modern-table th, .modern-table td {
+  color: #f1f3f6;
+  font-size: 15px;
+}
+
+mat-card-actions {
+  padding-top: 16px;
+  flex: 0 0 auto;
+  background: #23272f;
+}
+
+button[mat-stroked-button] {
+  font-weight: 600;
+  border-radius: 6px;
 }

src/Ombi/ClientApp/src/app/settings/plex/plex.component.html

@@ -1,137 +1,179 @@
 <settings-menu></settings-menu>
-<div class="small-middle-container" *ngIf="settings">
-    <fieldset style="width:100%;">
-        <legend>Plex Configuration</legend>
-        <div class="col-12">
-            <div class="md-form-field align-right">
-                <button (click)="openWatchlistUserLog()" type="button" class="mat-focus-indicator mat-flat-button mat-button-base mat-accent">Watchlist User Errors</button>
+
+<div class="plex-settings-container" *ngIf="settings">
+    <mat-card class="settings-card">
+        <mat-card-header>
+            <mat-card-title>Plex Configuration</mat-card-title>
+        </mat-card-header>
+
+        <mat-card-content>
+            <!-- Watchlist Settings Section -->
+            <div class="settings-section">
+                <div class="section-header">
+                    <h2>Watchlist Settings</h2>
+                </div>
+
+                <div class="settings-grid">
+                    <mat-card class="setting-card">
+                        <mat-card-content>
+                            <div class="setting-header">
+                                <h3>Enable Plex</h3>
+                                <mat-slide-toggle [id]="'enable'" [(ngModel)]="settings.enable"></mat-slide-toggle>
+                            </div>
+                        </mat-card-content>
+                    </mat-card>
+
+                    <mat-card class="setting-card">
+                        <mat-card-content>
+                            <div class="setting-header">
+                                <h3>Enable User Watchlist Requests</h3>
+                                <mat-slide-toggle [id]="'enableWatchlistImport'" [(ngModel)]="settings.enableWatchlistImport"></mat-slide-toggle>
+                            </div>
+                            <p class="setting-description">
+                                When a Plex User adds something to their watchlist in Plex, it will turn up in Ombi as a Request if enabled. 
+                                This <strong>only</strong> applies to users that are logging in with their Plex Account.
+                                <br>Request limits if set are all still applied
+                            </p>
+                        </mat-card-content>
+                    </mat-card>
+
+                    <mat-card class="setting-card" [class.disabled]="!settings.enableWatchlistImport">
+                        <mat-card-content>
+                            <div class="setting-header">
+                                <h3>Request Whole Show</h3>
+                                <mat-slide-toggle [id]="'monitorAll'" [(ngModel)]="settings.monitorAll" [disabled]="!settings.enableWatchlistImport"></mat-slide-toggle>
+                            </div>
+                            <p class="setting-description">
+                                If enabled then watchlist requests for TV Shows will request the <strong>whole</strong> show. 
+                                If not enabled it will only request the latest season.
+                            </p>
+                        </mat-card-content>
+                    </mat-card>
+
+                    <mat-card class="setting-card" [class.disabled]="!settings.enableWatchlistImport">
+                        <mat-card-content>
+                            <div class="setting-header">
+                                <h3>Notify on Token Expiration</h3>
+                                <mat-slide-toggle [id]="'notifyOnWatchlistTokenExpiration'" [(ngModel)]="settings.notifyOnWatchlistTokenExpiration" [disabled]="!settings.enableWatchlistImport"></mat-slide-toggle>
+                            </div>
+                            <p class="setting-description">
+                                When enabled, users will receive a notification if their Plex watchlist token expires and they need to log into Ombi again to continue using the watchlist feature.
+                                <br><strong>Note:</strong> This requires email notifications to be configured in the notification settings, and users must have an email address set on their account to receive these notifications.
+                            </p>
+                        </mat-card-content>
+                    </mat-card>
+                </div>
+                <mat-card class="info-banner">
+                    <mat-icon color="primary" style="margin-right: 12px;">info</mat-icon>
+                    <span style="flex:1;">
+                        Some users may need to re-log in to use the watchlist feature.
+                    </span>
+                    <button mat-button color="accent" (click)="openWatchlistUserLog()">
+                        View Users
+                    </button>
+                </mat-card>
             </div>
 
-        </div>
-        <settings-plex-form-field [label]="'Enable'" [type]="'checkbox'" [id]="'enable'" [(value)]="settings.enable"></settings-plex-form-field>
+            <!-- Main Content Area -->
+            <div class="main-content">
+                <!-- Left Column - Servers and Actions -->
+                <div class="content-column">
+                    <!-- Servers Section -->
+                    <div class="settings-section">
+                        <h2>Plex Servers</h2>
+                        <div class="servers-grid">
+                            <mat-card class="server-card" *ngFor="let server of settings.servers">
+                                <mat-card-content>
+                                    <button mat-button (click)="edit(server)" [id]="server.name + '-button'">
+                                        <mat-icon>dns</mat-icon>
+                                        <span>{{server.name}}</span>
+                                    </button>
+                                </mat-card-content>
+                            </mat-card>
 
-        <settings-plex-form-field [label]="'Enable User Watchlist Requests'" [type]="'checkbox'" [id]="'enableWatchlistImport'" [(value)]="settings.enableWatchlistImport">
-            <small bottom>When a Plex User adds something to their watchlist in Plex, it will turn up in Ombi as a Request if enabled. This <b>only</b> applies to users that are logging in with their Plex Account
-                <br>Request limits if set are all still applied
-            </small>
-        </settings-plex-form-field>
+                            <mat-card class="server-card new-server">
+                                <mat-card-content>
+                                    <button mat-button (click)="newServer()" id="newServer">
+                                        <mat-icon>add_circle</mat-icon>
+                                        <span>Add Server</span>
+                                    </button>
+                                </mat-card-content>
+                            </mat-card>
+                        </div>
+                    </div>
 
-        <settings-plex-form-field [disabled]="!settings.enableWatchlistImport" [label]="'Watchlist - Request Whole Show'" disabled [type]="'checkbox'" [id]="'monitorAll'" [(value)]="settings.monitorAll">
-            <small bottom>If enabled then watchlist requests for TV Shows will request the <strong><em>whole</em></strong> show. If not enabled it will only request the latest season.
-            </small>
-        </settings-plex-form-field>
+                    <!-- Sync Actions Section -->
+                    <div class="settings-section">
+                        <h2>Sync Actions</h2>
+                        <div class="sync-actions-grid">
+                            <button mat-stroked-button (click)="runSync(PlexSyncType.Full)" id="fullSync">
+                                <mat-icon>sync</mat-icon>
+                                Full Sync
+                            </button>
+                            <button mat-stroked-button (click)="runSync(PlexSyncType.RecentlyAdded)" id="recentlyAddedSync">
+                                <mat-icon>update</mat-icon>
+                                Partial Sync
+                            </button>
+                            <button mat-stroked-button (click)="runSync(PlexSyncType.ClearAndReSync)" id="clearData">
+                                <mat-icon>cleaning_services</mat-icon>
+                                Clear & Resync
+                            </button>
+                            <button mat-stroked-button (click)="runSync(PlexSyncType.WatchlistImport)" id="watchlistImport">
+                                <mat-icon>playlist_add</mat-icon>
+                                Run Watchlist Import
+                            </button>
+                        </div>
+                    </div>
+                </div>
 
+                <!-- Right Column - Plex Credentials -->
+                <div class="content-column">
+                    <div class="settings-section">
+                        <h2>Plex Credentials</h2>
+                        <mat-card class="credentials-card">
+                            <mat-card-content>
+                                <p class="credentials-description">
+                                    These fields are optional to automatically fill in your Plex server settings.
+                                    <br>This will pass your username and password to the Plex.tv API to grab the servers associated with this user.
+                                    <br>If you have 2FA enabled on your account, you need to append the 2FA code to the end of your password.
+                                </p>
 
+                                <mat-form-field appearance="outline" class="full-width">
+                                    <mat-label>Username</mat-label>
+                                    <input matInput [id]="'username'" [(ngModel)]="username">
+                                </mat-form-field>
 
-        <hr>
+                                <mat-form-field appearance="outline" class="full-width">
+                                    <mat-label>Password</mat-label>
+                                    <input matInput [id]="'password'" type="password" [(ngModel)]="password">
+                                </mat-form-field>
 
-<div class="row">
-<div class="col-md-7">
-        <h2 style="margin: 1em 0 0 0;">Servers</h2>
-        <mat-list style="display:flex; flex-flow: wrap;">
-            <mat-card class="server-card" *ngFor="let server of settings.servers">
-                <button mat-button (click)="edit(server)" id="{{server.name}}-button">
-                    <h3>{{server.name}}</h3>
-                </button>
-            </mat-card>
+                                <button mat-raised-button color="primary" id="loadServers" (click)="requestServers()" class="full-width">
+                                    <mat-icon>key</mat-icon>
+                                    Load Servers
+                                </button>
 
-            <mat-card class="server-card new-server-card">
-                <button mat-button (click)="newServer()" id="newServer">
-                    <i class="fas fa-plus fa-xl"></i>
-                    <h3>Manually Add Server</h3>
-                </button>
-            </mat-card>
-        </mat-list>
-
-
-<div class="row">
-
-    <br />
-        <div class="form-group col-2">
-            <button mat-raised-button (click)="runSync(PlexSyncType.Full)" type="button" id="fullSync"
-                class="mat-focus-indicator mat-stroked-button mat-button-base">Full
-                Sync</button><br />
-        </div>
-        <div class="form-group col-2">
-            <button mat-raised-button (click)="runSync(PlexSyncType.RecentlyAdded)" type="button" id="recentlyAddedSync"
-                class="mat-focus-indicator mat-stroked-button mat-button-base">Partial Sync</button>
-        </div>
-        <div class="form-group col-2">
-            <button mat-raised-button (click)="runSync(PlexSyncType.ClearAndReSync)" type="button" id="clearData"
-                class="mat-focus-indicator mat-stroked-button mat-button-base">
-                Clear Data And Resync
-            </button>
-        </div>
-        <div class="form-group col-12">
-            <button mat-raised-button (click)="runSync(PlexSyncType.WatchlistImport)" type="button" id="watchlistImport"
-                class="mat-focus-indicator mat-stroked-button mat-button-base">
-                Run Watchlist Import
-            </button>
-        </div>
-</div>
-
-        <div class="row">
-
-            <div class="col-md-2">
-                <div class="form-group">
-                    <div>
-                        <button mat-raised-button (click)="save()" type="submit" id="save"
-                            class="mat-focus-indicator mat-raised-button mat-button-base mat-accent">Submit</button>
+                                <mat-form-field appearance="outline" class="full-width mt-3">
+                                    <mat-label>Select Server</mat-label>
+                                    <mat-select [id]="'servers'" *ngIf="loadedServers">
+                                        <mat-option (click)="selectServer(s)" *ngFor="let s of loadedServers.servers.server" [value]="s.server">
+                                            {{s.name}}
+                                        </mat-option>
+                                    </mat-select>
+                                    <input matInput disabled placeholder="No Servers Loaded" *ngIf="!loadedServers">
+                                </mat-form-field>
+                            </mat-card-content>
+                        </mat-card>
                     </div>
                 </div>
             </div>
-        </div>
-        
-    </div>
+        </mat-card-content>
 
-    <div class="col-md-5">
-        <div class="md-form-field">
-            <label for="username" class="control-label">
-                <h3>Plex Credentials</h3>
-                <small>These fields are optional to automatically fill in your Plex server settings. <br>
-                This will pass your username and password to the Plex.tv API to grab the servers associated with this user.
-            <br>
-            If you have 2FA enabled on your account, you need to append the 2FA code to the end of your password.</small>
-            </label>
-        </div>
-    
-        <settings-plex-form-field [label]="'Username'" [id]="'username'" [(value)]="username"></settings-plex-form-field>
-        <settings-plex-form-field [label]="'Password'" [id]="'password'" [type]="'password'" [(value)]="password"></settings-plex-form-field>
-    
-        <div class="md-form-field">
-            <div class="right">
-                <button mat-raised-button id="loadServers" (click)="requestServers()"
-                    class="mat-stroked-button">Load Servers
-                    <i class="fas fa-key"></i>
-                </button>
-            </div>
-        </div>
-
-        <div class="row">
-            <div class="col-2 align-self-center">
-                Please select the server:
-            </div>
-            <div class="md-form-field col-10">
-                <div *ngIf="!loadedServers">
-                    <mat-form-field appearance="outline" floatLabel=auto>
-                        <input disabled  matInput placeholder="No Servers Loaded" id="servers">
-                    </mat-form-field>
-                </div>
-    
-                <div *ngIf="loadedServers">
-                    <mat-form-field appearance="outline">
-                        <mat-select placeholder="Servers Loaded! Please Select" id="servers">
-                            <mat-option (click)="selectServer(s)"
-                                *ngFor="let s of loadedServers.servers.server" [value]="s.server">
-                                {{s.name}}</mat-option>
-                        </mat-select>
-                    </mat-form-field>
-                </div>
-            </div>
-        </div>
-    </div>
+        <mat-card-actions align="end">
+            <button mat-raised-button color="accent" (click)="save()" id="save">
+                <mat-icon>save</mat-icon>
+                Save Changes
+            </button>
+        </mat-card-actions>
+    </mat-card>
 </div>
-
-    </fieldset>
-</div>
-<!--(){{settings|json}}-->

src/Ombi/ClientApp/src/app/settings/plex/plex.component.scss

@@ -43,4 +43,258 @@
     h3 {
       margin: 0;
     }
-  }
+  }
+
+.plex-settings-container {
+    padding: 20px;
+    max-width: 1400px;
+    margin: 0 auto;
+}
+
+.settings-card {
+    margin-bottom: 20px;
+    background: transparent;
+    box-shadow: 0 2px 12px 0 rgba(0,0,0,0.25);
+    border-radius: 12px;
+    border: 1px solid #353a45;
+}
+
+.section-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20px;
+}
+
+.settings-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
+    gap: 24px;
+    margin-bottom: 30px;
+}
+
+.setting-card {
+    height: 100%;
+    background: transparent;
+    border-radius: 10px;
+    border: 1px solid #353a45;
+    box-shadow: 0 1px 6px 0 rgba(0,0,0,0.18);
+    color: #f1f3f6;
+}
+
+.setting-card.disabled {
+    opacity: 0.6;
+}
+
+.setting-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+    font-weight: 600;
+    color: #fff;
+}
+
+.setting-description {
+    color: #e0e3ea;
+    font-size: 15px;
+    margin: 0;
+    font-weight: 400;
+    line-height: 1.6;
+}
+
+.main-content {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 36px;
+    margin-top: 36px;
+}
+
+.servers-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
+    gap: 18px;
+}
+
+.server-card {
+    text-align: center;
+    background: transparent;
+    border-radius: 10px;
+    border: 1px solid #353a45;
+    box-shadow: 0 1px 6px 0 rgba(0,0,0,0.18);
+    color: #f1f3f6;
+}
+
+.server-card button {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 24px;
+    color: #f1f3f6;
+    font-weight: 500;
+}
+
+.server-card mat-icon {
+    font-size: 32px;
+    height: 32px;
+    width: 32px;
+    margin-bottom: 10px;
+    color: #90caf9;
+}
+
+.sync-actions-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+    gap: 18px;
+}
+
+.sync-actions-grid button {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 24px;
+    color: #f1f3f6;
+    background: transparent;
+    border: 1px solid #353a45;
+    border-radius: 10px;
+    font-weight: 500;
+    box-shadow: 0 1px 6px 0 rgba(0,0,0,0.18);
+}
+
+.sync-actions-grid mat-icon {
+    font-size: 32px;
+    height: 32px;
+    width: 32px;
+    margin-bottom: 10px;
+    color: #90caf9;
+}
+
+.credentials-card {
+    padding: 24px;
+    background: transparent;
+    border-radius: 10px;
+    border: 1px solid #353a45;
+    box-shadow: 0 1px 6px 0 rgba(0,0,0,0.18);
+    color: #f1f3f6;
+}
+
+.credentials-description {
+    color: #e0e3ea;
+    margin-bottom: 20px;
+    font-size: 15px;
+    font-weight: 400;
+}
+
+mat-card-title, h2, h3 {
+    color: #fff !important;
+    font-weight: 700 !important;
+    letter-spacing: 0.5px;
+}
+
+mat-card-header {
+    border-bottom: 1px solid #353a45;
+    margin-bottom: 16px;
+}
+
+mat-form-field {
+    color: #f1f3f6 !important;
+}
+
+mat-label, .mat-form-field-label {
+    color: #b0b6c3 !important;
+    font-weight: 500;
+}
+
+input[matInput], .mat-input-element {
+    color: #f1f3f6 !important;
+    background: transparent !important;
+}
+
+mat-select {
+    color: #f1f3f6 !important;
+    background: transparent !important;
+}
+
+.full-width {
+    width: 100%;
+}
+
+.mt-3 {
+    margin-top: 1rem;
+}
+
+.mat-slide-toggle.mat-checked .mat-slide-toggle-bar {
+    background-color: #90caf9 !important;
+}
+
+.mat-slide-toggle-thumb {
+    background-color: #2196f3 !important;
+}
+
+button[mat-flat-button], button[mat-raised-button], button[mat-stroked-button], button[mat-button] {
+    font-weight: 600;
+    letter-spacing: 0.2px;
+    color: #f1f3f6;
+    background: #2196f3;
+    border-radius: 6px;
+    box-shadow: 0 1px 4px 0 rgba(0,0,0,0.12);
+    transition: background 0.2s;
+}
+button[mat-flat-button]:hover, button[mat-raised-button]:hover, button[mat-stroked-button]:hover, button[mat-button]:hover {
+    background: #42a5f5;
+}
+
+@media (max-width: 1200px) {
+    .main-content {
+        grid-template-columns: 1fr;
+    }
+}
+
+@media (max-width: 768px) {
+    .settings-grid {
+        grid-template-columns: 1fr;
+    }
+    
+    .servers-grid {
+        grid-template-columns: 1fr;
+    }
+    
+    .sync-actions-grid {
+        grid-template-columns: 1fr;
+    }
+}
+
+.watchlist-errors-btn-row {
+    display: flex;
+    justify-content: center;
+    margin-top: 18px;
+}
+
+.info-banner {
+    display: flex;
+    align-items: center;
+    background: #23272f;
+    color: #e0e3ea;
+    border: 1px solid #1976d2;
+    box-shadow: 0 1px 6px 0 rgba(0,0,0,0.12);
+    border-radius: 8px;
+    padding: 16px 20px;
+    margin-top: 18px;
+    margin-bottom: 0;
+    font-size: 16px;
+    font-weight: 500;
+    gap: 12px;
+}
+
+.info-banner mat-icon {
+    font-size: 28px;
+    color: #42a5f5;
+}
+
+.info-banner button[mat-button] {
+    margin-left: 16px;
+    font-weight: 600;
+}

src/Ombi/ClientApp/src/app/settings/radarr/components/radarr-form.component.html

@@ -28,10 +28,12 @@
                         <mat-form-field appearance="outline" >
                             <mat-label>Hostname or IP</mat-label>
                             <input matInput formControlName="ip">
+                            <mat-error>Please enter a valid hostname or ip address</mat-error>
                         </mat-form-field>
                         <mat-form-field appearance="outline" >
                             <mat-label>Port</mat-label>
                             <input matInput formControlName="port">
+                            <mat-error>Please enter a valid port number</mat-error>
                         </mat-form-field>
                         <mat-slide-toggle formControlName="ssl">
                             SSL
@@ -42,6 +44,7 @@
                         <mat-form-field appearance="outline" >
                             <mat-label>API key</mat-label>
                             <input matInput formControlName="apiKey">
+                            <mat-error>Please enter an API Key</mat-error>
                         </mat-form-field>
                     </div>
                     <div class="md-form-field">
@@ -65,6 +68,7 @@
                                     {{quality.name}}
                                 </mat-option>
                             </mat-select>
+                            <mat-error>Please select a value</mat-error>
                         </mat-form-field>
 
                     </div>
@@ -80,6 +84,7 @@
                                     {{folder.path}}
                                 </mat-option>
                             </mat-select>
+                            <mat-error>Please select a value</mat-error>
                         </mat-form-field>
 
                     </div>
@@ -95,6 +100,7 @@
                                     {{tag.label}}
                                 </mat-option>
                             </mat-select>
+                            <mat-error>Please select a value</mat-error>
                         </mat-form-field>
 
                     </div>
@@ -107,6 +113,7 @@
                                     {{min.name}}
                                 </mat-option>
                             </mat-select>
+                            <mat-error>Please select a value</mat-error>
                         </mat-form-field>
                     </div>
                 </div>

src/Ombi/ClientApp/src/app/settings/radarr/components/radarr-form.component.ts

@@ -63,14 +63,14 @@ export class RadarrFormComponent implements OnInit {
     }
 
     public toggleValidators() {
-        debugger;
         const enabled = this.form.controls.enabled.value as boolean;
         this.form.controls.apiKey.setValidators(enabled ? [Validators.required] : null);
-        this.form.controls.defaultQualityProfile.setValidators(enabled ? [Validators.required] : null);
+        this.form.controls.defaultQualityProfile.setValidators(enabled ? [Validators.required, Validators.min(1)] : null);
         this.form.controls.defaultRootPath.setValidators(enabled ? [Validators.required] : null);
         this.form.controls.ip.setValidators(enabled ? [Validators.required] : null);
-        this.form.controls.port.setValidators(enabled ? [Validators.required] : null);
+        this.form.controls.port.setValidators(enabled ? [Validators.required, Validators.min(1)] : null);
         this.form.controls.minimumAvailability.setValidators(enabled ? [Validators.required] : null);
+        enabled ? this.form.markAllAsTouched() : this.form.markAsUntouched();
     }
 
     public getProfiles(form: UntypedFormGroup) {
@@ -120,6 +120,7 @@ export class RadarrFormComponent implements OnInit {
                 this.notificationService.success("Successfully connected to Radarr!");
             } else if (result.expectedSubDir) {
                 this.notificationService.error("Your Radarr Base URL must be set to " + result.expectedSubDir);
+                form.controls.subDir.setValue(result.expectedSubDir);
             } else {
                 this.notificationService.error("We could not connect to Radarr!");
             }

src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html

@@ -1,5 +1,5 @@
 <settings-menu></settings-menu>
-<div *ngIf="form" class="small-middle-container">
+<div *ngIf="form$ | async as form" class="small-middle-container">
     <fieldset>
         <legend>Radarr Settings</legend>
         <div class="md-form-field" style="margin-top:1em;"></div>
@@ -33,4 +33,4 @@
             </div>
         </form>
     </fieldset>
-</div>
+</div>

src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, QueryList, ViewChildren } from "@angular/core";
+import { Component, OnDestroy, OnInit, QueryList, ViewChildren } from "@angular/core";
 import { UntypedFormBuilder, UntypedFormGroup } from "@angular/forms";
 import { RadarrFacade } from "app/state/radarr";
 
@@ -6,36 +6,41 @@ import { IMinimumAvailability, IRadarrCombined, IRadarrProfile, IRadarrRootFolde
 import { NotificationService } from "../../services";
 import { FeaturesFacade } from "../../state/features/features.facade";
 import { RadarrFormComponent } from "./components/radarr-form.component";
+import { Observable, ReplaySubject, Subject, combineLatest, map, switchMap, takeUntil, tap } from "rxjs";
 
 @Component({
     templateUrl: "./radarr.component.html",
     styleUrls: ["./radarr.component.scss"]
 })
-export class RadarrComponent implements OnInit {
+export class RadarrComponent implements OnInit, OnDestroy {
 
     public qualities: IRadarrProfile[];
     public rootFolders: IRadarrRootFolder[];
     public minimumAvailabilityOptions: IMinimumAvailability[];
     public profilesRunning: boolean;
     public rootFoldersRunning: boolean;
-    public form: UntypedFormGroup;
     public is4kEnabled: boolean = false;
 
-    @ViewChildren('4kForm') public form4k: QueryList<RadarrFormComponent>;
-    @ViewChildren('normalForm') public normalForm: QueryList<RadarrFormComponent>;
+    public readonly form$: Observable<UntypedFormGroup>;
 
-    constructor(private radarrFacade: RadarrFacade,
-                private notificationService: NotificationService,
-                private featureFacade: FeaturesFacade,
-                private fb: UntypedFormBuilder) { }
+    private readonly form4k$: ReplaySubject<QueryList<RadarrFormComponent>>;
+    private readonly normalForm$: ReplaySubject<QueryList<RadarrFormComponent>>;
+    private readonly destroyed$: Subject<void>;
 
+    constructor(
+        private readonly radarrFacade: RadarrFacade,
+        private readonly notificationService: NotificationService,
+        private readonly featureFacade: FeaturesFacade,
+        readonly fb: UntypedFormBuilder
+    ) {
+        this.form4k$ = new ReplaySubject();
+        this.normalForm$ = new ReplaySubject();
+        this.destroyed$ = new Subject();
 
-    public ngOnInit() {
-        this.is4kEnabled = this.featureFacade.is4kEnabled();
-        this.radarrFacade.state$()
-            .subscribe(x => {
-                this.form = this.fb.group({
-                    radarr: this.fb.group({
+        this.form$ = radarrFacade.state$()
+            .pipe(
+                map(x => fb.group({
+                    radarr: fb.group({
                         enabled: [x.settings.radarr.enabled],
                         apiKey: [x.settings.radarr.apiKey],
                         defaultQualityProfile: [+x.settings.radarr.defaultQualityProfile],
@@ -50,7 +55,7 @@ export class RadarrComponent implements OnInit {
                         minimumAvailability: [x.settings.radarr.minimumAvailability],
                         scanForAvailability: [x.settings.radarr.scanForAvailability]
                     }),
-                    radarr4K: this.fb.group({
+                    radarr4K: fb.group({
                         enabled: [x.settings.radarr4K.enabled],
                         apiKey: [x.settings.radarr4K.apiKey],
                         defaultQualityProfile: [+x.settings.radarr4K.defaultQualityProfile],
@@ -65,19 +70,44 @@ export class RadarrComponent implements OnInit {
                         minimumAvailability: [x.settings.radarr4K.minimumAvailability],
                         scanForAvailability: [x.settings.radarr4K.scanForAvailability]
                     }),
-                });
-                this.normalForm.changes.forEach((comp => {
-                    comp.first.toggleValidators();
                 }))
-                if (this.is4kEnabled) {
-                    this.form4k.changes.forEach((comp => {
-                        comp.first.toggleValidators();
-                    }))
-                }
-            });
-
+            )
     }
 
+    @ViewChildren('4kForm')
+    protected set form4k(component: QueryList<RadarrFormComponent>) {
+        this.form4k$.next(component);
+    }
+
+    @ViewChildren('normalForm')
+    protected set normalForm(component: QueryList<RadarrFormComponent>) {
+        this.normalForm$.next(component);
+    }
+
+    public ngOnInit() {
+        this.is4kEnabled = this.featureFacade.is4kEnabled();
+
+        combineLatest([this.form$, this.normalForm$])
+            .pipe(
+                switchMap(([, normalForm]) => normalForm.changes),
+                tap(comp => comp.first.toggleValidators()),
+                takeUntil(this.destroyed$)
+            ).subscribe();
+
+        if (this.is4kEnabled) {
+            combineLatest([this.form$, this.form4k$])
+                .pipe(
+                    switchMap(([, form4k]) => form4k.changes),
+                    tap(comp => comp.first.toggleValidators()),
+                    takeUntil(this.destroyed$)
+                ).subscribe();
+        }
+    }
+
+    public ngOnDestroy(): void {
+        this.destroyed$.next();
+        this.destroyed$.complete();
+    }
 
     public onSubmit(form: UntypedFormGroup) {
         if (form.invalid) {

src/Ombi/ClientApp/src/app/state/radarr/radarr.state.ts

@@ -18,7 +18,7 @@ export class RadarrSettingsState {
 
     @Action(LoadSettings)
     public load({ setState }: StateContext<RadarrState>): Observable<RadarrState> {
-        const isAdmin = this.authService.hasRole("Admin");
+        const isAdmin = this.authService.isAdmin();
         const calls = isAdmin ? [this.settingsService.getRadarr()] : [of({})];
 
         return combineLatest(calls).pipe(

src/Ombi/ClientApp/src/app/state/sonarr/sonarr.state.ts

@@ -18,7 +18,7 @@ export class SonarrSettingsState {
 
     @Action(LoadSettings)
     public load({ setState }: StateContext<SonarrState>): Observable<SonarrState> {
-        const isAdmin = this.authService.hasRole("Admin");
+        const isAdmin = this.authService.isAdmin();
         const calls = isAdmin ? [this.sonarrService.getVersion(), this.settingsService.getSonarr()] : [of(""), of({})];
 
         return combineLatest(calls).pipe(

src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.ts

@@ -37,6 +37,13 @@ export class UserManagementUserComponent implements OnInit {
     private appUrl: string = this.customizationFacade.appUrl();
     private accessToken: string;
 
+    // List of excluded notification agents that should not be shown in user preferences
+    private readonly excludedAgents = [
+        INotificationAgent.Email,
+        INotificationAgent.Mobile,
+        INotificationAgent.Webhook
+    ];
+
     constructor(private identityService: IdentityService,
                 private notificationService: MessageService,
                 private router: Router,
@@ -74,9 +81,15 @@ export class UserManagementUserComponent implements OnInit {
             }
         });
         if(this.edit) {
-            this.identityService.getNotificationPreferencesForUser(this.userId).subscribe(x => this.notificationPreferences = x);
+            this.identityService.getNotificationPreferencesForUser(this.userId).subscribe(x => {
+                // Filter out excluded notification agents
+                this.notificationPreferences = x.filter(pref => !this.excludedAgents.includes(pref.agent));
+            });
         } else {
-            this.identityService.getNotificationPreferences().subscribe(x => this.notificationPreferences = x);
+            this.identityService.getNotificationPreferences().subscribe(x => {
+                // Filter out excluded notification agents
+                this.notificationPreferences = x.filter(pref => !this.excludedAgents.includes(pref.agent));
+            });
         }
         this.sonarrService.getQualityProfilesWithoutSettings().subscribe(x => {
             this.sonarrQualities = x;

src/Ombi/ClientApp/src/app/wizard/database/database.component.html

@@ -0,0 +1,104 @@
+<div class="mediaserver-container">
+    <div class="left-container mediaserver">
+        <i class="fa fa-database text-logo"></i>
+    </div>
+    <div class="right-container mediaserver">
+        <div class="right-container-content mediaserver">
+            <h1>Choose a Database</h1>
+            <h4>
+                SQLite is the default option and the easiest to set up, as it requires no additional configuration. 
+                <br>However, it has significant limitations, including potential performance issues and database locking.
+                <br>While many users start with SQLite and later migrate to MySQL or MariaDB, we <b>recommend</b> beginning with MySQL or MariaDB from the start for a more robust and scalable experience.
+                <br/>
+                <br/>
+                For more information on using alternate databases, <a target="_blank" href="https://docs.ombi.app/info/alternate-databases/">see the documentation.</a>
+            </h4>
+            <form [formGroup]="form">
+                <mat-tab-group (selectedTabChange)="tabChange($event)">
+                    <mat-tab label="SQLite">
+                        <p class="space-or">
+                            Just press next to continue with SQLite
+                        </p>
+                    </mat-tab>
+                    <mat-tab label="MySQL/MariaDB">
+                        <p class="space-or">
+                            Please enter your MySQL/MariaDB connection details below
+                        </p>
+                            <div>
+                                <mat-form-field>
+                                    <input matInput type="text" formControlName="host" id="host" placeholder="Host">
+                                    <mat-error>This field is required</mat-error>
+                                </mat-form-field>
+                            </div>
+                            <div>
+                                <mat-form-field>
+                                    <input matInput type="number" formControlName="port" id="port" placeholder="Port">
+                                    <mat-error>This field is required</mat-error>
+                                </mat-form-field>
+                            </div>
+                            <div>
+                                <mat-form-field>
+                                    <input matInput type="text" formControlName="name" id="database" placeholder="Database Name">
+                                    <mat-error>This field is required</mat-error>
+                                </mat-form-field>
+                            </div>
+                            <div>
+                                <mat-form-field>
+                                    <input matInput type="text"  formControlName="user" id="user" placeholder="User">
+                                </mat-form-field>
+                            </div>
+                            <div>
+                                <mat-form-field>
+                                    <input matInput type="password"  formControlName="password" id="password" placeholder="Password">
+                                </mat-form-field>
+                            </div>
+                            <p>{{connectionString | async}}</p>
+                            <div style="text-align: center; margin-top: 20px">
+                                <button (click)="save()" id="databaseSave" mat-raised-button color="accent" type="button" class="viewon-btn database" [disabled]="form.invalid">Save</button>
+                                <div id="spinner"></div>
+                            </div>
+                    </mat-tab>
+
+                    <mat-tab label="Postgres">
+                        <p class="space-or">
+                            Please enter your Postgres connection details below
+                        </p>
+                            <div>
+                                <mat-form-field>
+                                    <input matInput type="text" formControlName="host" id="host" placeholder="Host">
+                                    <mat-error>This field is required</mat-error>
+                                </mat-form-field>
+                            </div>
+                            <div>
+                                <mat-form-field>
+                                    <input matInput type="number" formControlName="port" id="port" placeholder="Port">
+                                    <mat-error>This field is required</mat-error>
+                                </mat-form-field>
+                            </div>
+                            <div>
+                                <mat-form-field>
+                                    <input matInput type="text" formControlName="name" id="database" placeholder="Database Name">
+                                    <mat-error>This field is required</mat-error>
+                                </mat-form-field>
+                            </div>
+                            <div>
+                                <mat-form-field>
+                                    <input matInput type="text"  formControlName="user" id="user" placeholder="User">
+                                </mat-form-field>
+                            </div>
+                            <div>
+                                <mat-form-field>
+                                    <input matInput type="password"  formControlName="password" id="password" placeholder="Password">
+                                </mat-form-field>
+                            </div>
+                            <p>{{connectionString | async}}</p>
+                            <div style="text-align: center; margin-top: 20px">
+                                <button (click)="save()" id="databaseSave" mat-raised-button color="accent" type="button" class="viewon-btn database" [disabled]="form.invalid">Save</button>
+                                <div id="spinner"></div>
+                            </div>
+                    </mat-tab>
+                </mat-tab-group>
+            </form>
+        </div>
+    </div>
+</div>

src/Ombi/ClientApp/src/app/wizard/database/database.component.ts

@@ -0,0 +1,92 @@
+import { Component, EventEmitter, OnInit, Output } from "@angular/core";
+import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { BehaviorSubject } from "rxjs";
+import { WizardService } from "../services/wizard.service";
+import { NotificationService } from "app/services";
+import { MatTabChangeEvent } from "@angular/material/tabs";
+
+@Component({
+    templateUrl: "./database.component.html",
+    styleUrls: ["../welcome/welcome.component.scss"],
+    selector: "wizard-database-selector",
+})
+export class DatabaseComponent implements OnInit {
+    public constructor(private fb: FormBuilder, private service: WizardService, private notification: NotificationService) { }
+    @Output() public configuredDatabase = new EventEmitter<void>();
+
+    public form: FormGroup;
+
+    public connectionString = new BehaviorSubject<string>("Server=;Port=3306;Database=ombi");
+
+    public ngOnInit(): void {
+        this.form = this.fb.group({
+            type: [""],
+            host: ["", [Validators.required]],
+            port: [3306, [Validators.required]],
+            name: ["ombi", [Validators.required]],
+            user: [""],
+            password: [""],
+        });
+
+        this.form.valueChanges.subscribe(x => {
+            console.log(x);
+            let connection = `Server=${x.host};Port=${x.port};Database=${x.name}`;
+
+            if (x.user) {
+                connection += `;User=${x.user}`;
+                if (x.password) {
+                    connection += `;Password=*******`;
+                }
+            }
+
+            if (x.type !== "MySQL") {
+                connection = connection.replace("Server", "Host").replace("User", "Username");
+            }
+
+            this.connectionString.next(connection);
+        });
+    }
+
+    public tabChange(event: MatTabChangeEvent) {
+        if (event.index === 0) {
+            this.form.reset();
+        }
+        if (event.index === 1) {
+            this.form.reset({
+                type: "MySQL",
+                host: "",
+                name: "ombi",
+                port: 3306,
+            });
+            this.form.controls.type.setValue("MySQL");
+
+        }
+        if (event.index === 2) {
+            this.form.reset({
+            type:"Postgres",
+            host: "",
+            name: "ombi",
+            port: 5432,
+        });
+
+        }
+        this.form.markAllAsTouched();
+    }
+
+    public save() {
+        this.service.addDatabaseConfig(this.form.value).subscribe({
+            next: () => {
+                this.notification.success(`Database configuration updated! Please now restart Ombi!`);
+                this.configuredDatabase.emit();
+            },
+            error: error => {
+                if (error.error.message) {
+                    this.notification.error(error.error.message);
+                } else {
+                    this.notification.error("Something went wrong, please check the logs");
+                }
+            },
+        });
+    }
+
+}

src/Ombi/ClientApp/src/app/wizard/models/DatabaseSettings.ts

@@ -0,0 +1,13 @@
+export interface DatabaseSettings {
+    type: string;
+    host: string;
+    port: number;
+    name: string;
+    user: string;
+    password: string;
+}
+
+export interface DatabaseConfigurationResult {
+    success: boolean;
+    message: string;
+}

src/Ombi/ClientApp/src/app/wizard/services/wizard.service.ts

@@ -5,6 +5,7 @@ import { Observable } from "rxjs";
 import { ICustomizationSettings } from "../../interfaces";
 import { ServiceHelpers } from "../../services";
 import { IOmbiConfigModel } from "../models/OmbiConfigModel";
+import { DatabaseConfigurationResult, DatabaseSettings } from "../models/DatabaseSettings";
 
 
 @Injectable()
@@ -16,4 +17,8 @@ export class WizardService extends ServiceHelpers {
     public addOmbiConfig(config: IOmbiConfigModel): Observable<ICustomizationSettings> {
         return this.http.post<ICustomizationSettings>(`${this.url}config`, config, {headers: this.headers});
     }
+
+    public addDatabaseConfig(config: DatabaseSettings): Observable<DatabaseConfigurationResult> {
+        return this.http.post<DatabaseConfigurationResult>(`${this.url}database`, config, {headers: this.headers});
+    }
 }

src/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.html

@@ -1,6 +1,7 @@
 <div class="wizard-background">
   <div class="container wizard-inner">
-      <mat-stepper linear #stepper>
+    @if (!needsRestart) {  
+    <mat-stepper linear #stepper>
         <mat-step >
           <form >
             <ng-template matStepLabel>Welcome</ng-template>
@@ -29,6 +30,12 @@
             </div>
           </form>
         </mat-step>
+        <mat-step>
+            <ng-template matStepLabel>Database</ng-template>
+              <wizard-database-selector (configuredDatabase)="databaseConfigured()"></wizard-database-selector>
+              <button mat-button matStepperPrevious class="mat-raised-button mat-error left">Back</button>
+              <button mat-button matStepperNext class="mat-raised-button mat-accent right" data-test="nextDatabase">Next</button>
+        </mat-step>
 
         <mat-step  [optional]="true">
           <form >
@@ -82,5 +89,22 @@
           </div>
         </mat-step>
       </mat-stepper>
+    } @else {
+      <mat-stepper linear>
+        <mat-step >
+            <ng-template matStepLabel>Restart</ng-template>
+            <div class="welcome-container">
+              <div class="left-container mediaserver">
+                <i class="fa fa-database text-logo"></i>
+            </div>
+              <div class="right-container">
+                <div class="right-container-content">
+                  <h1>Please Restart Ombi for the database changes to take effect!</h1>
+                </div>
+              </div>
+            </div>
+        </mat-step>
+        </mat-stepper>
+    }
   </div>
 </div>

src/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.scss

@@ -151,6 +151,12 @@ p.space-or{
     color: #A45FC4;
 }
 
+
+.viewon-btn.database {
+    border: 1px solid #A45FC4;
+    color: #A45FC4;
+}
+
 .text-logo{
     font-size:12em;
 }

src/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.ts

@@ -17,6 +17,7 @@ export class WelcomeComponent implements OnInit {
 
     @ViewChild('stepper', {static: false}) public stepper: MatStepper;
     public localUser: ICreateWizardUser;
+    public needsRestart: boolean = false;
     public config: IOmbiConfigModel;
 
     constructor(private router: Router, private identityService: IdentityService,
@@ -48,7 +49,7 @@ export class WelcomeComponent implements OnInit {
             this.settingsService.verifyUrl(this.config.applicationUrl).subscribe(x => {
                     if (!x) {
                         this.notificationService.error(`The URL "${this.config.applicationUrl}" is not valid. Please format it correctly e.g. http://www.google.com/`);
-                        this.stepper.selectedIndex = 3;
+                        this.stepper.selectedIndex = 4;
                         return;
                     }
                     this.saveConfig();
@@ -58,6 +59,10 @@ export class WelcomeComponent implements OnInit {
             }
     }
 
+    public databaseConfigured() {
+        this.needsRestart = true;
+    }
+
     private saveConfig() {
         this.WizardService.addOmbiConfig(this.config).subscribe({
             next: (config) => {

src/Ombi/ClientApp/src/app/wizard/wizard.module.ts

@@ -12,6 +12,7 @@ import { MediaServerComponent } from "./mediaserver/mediaserver.component";
 import { PlexComponent } from "./plex/plex.component";
 import { WelcomeComponent } from "./welcome/welcome.component";
 import { OmbiConfigComponent } from "./ombiconfig/ombiconfig.component";
+import { DatabaseComponent } from "./database/database.component";
 
 import { EmbyService } from "../services";
 import { JellyfinService } from "../services";
@@ -48,6 +49,7 @@ const routes: Routes = [
         EmbyComponent,
         JellyfinComponent,
         OmbiConfigComponent,
+        DatabaseComponent,
     ],
     exports: [
         RouterModule,

src/Ombi/ClientApp/yarn.lock

@@ -2081,19 +2081,15 @@
   resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.3.8.tgz#96c0f99055910dd21438d7697d625fdeb7261015"
   integrity sha512-CjSVVa/9fzMpEDQP01SC4colKCbZwj7vUq0H2bivp8jVsmd21x9Fu0gDBH0Y9NdfAIm4eGZvmiZKMII3vIOaYQ==
 
-"@ngx-translate/core@^14.0.0":
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/@ngx-translate/core/-/core-14.0.0.tgz#af421d0e1a28376843f0fed375cd2fae7630a5ff"
-  integrity sha512-UevdwNCXMRCdJv//0kC8h2eSfmi02r29xeE8E9gJ1Al4D4jEJ7eiLPdjslTMc21oJNGguqqWeEVjf64SFtvw2w==
-  dependencies:
-    tslib "^2.3.0"
+"@ngx-translate/core@^15.0.0":
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/@ngx-translate/core/-/core-15.0.0.tgz#0fe55b9bd47e75b03d1123658f15fb7b5a534f3c"
+  integrity sha512-Am5uiuR0bOOxyoercDnAA3rJVizo4RRqJHo8N3RqJ+XfzVP/I845yEnMADykOHvM6HkVm4SZSnJBOiz0Anx5BA==
 
-"@ngx-translate/http-loader@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@ngx-translate/http-loader/-/http-loader-7.0.0.tgz#905f38d8d13342621516635bf480ff9a4f73e9fc"
-  integrity sha512-j+NpXXlcGVdyUNyY/qsJrqqeAdJdizCd+GKh3usXExSqy1aE9866jlAIL+xrfDU4w+LiMoma5pgE4emvFebZmA==
-  dependencies:
-    tslib "^2.3.0"
+"@ngx-translate/http-loader@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@ngx-translate/http-loader/-/http-loader-8.0.0.tgz#e02c25dbe33c6b1edee73e3654ab8a161572cdfb"
+  integrity sha512-SFMsdUcmHF5OdZkL1CHEoSAwbP5EbAOPTLLboOCRRoOg21P4GJx+51jxGdJeGve6LSKLf4Pay7BkTwmE6vxYlg==
 
 "@ngxs/devtools-plugin@3.8.2":
   version "3.8.2"

src/Ombi/Controllers/V1/IdentityController.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using AutoMapper;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
@@ -14,7 +13,6 @@ using Ombi.Api.TheMovieDb.Models;
 using Ombi.Attributes;
 using Ombi.Core.Authentication;
 using Ombi.Core.Engine;
-using Ombi.Core.Engine.Interfaces;
 using Ombi.Core.Helpers;
 using Ombi.Core.Models.UI;
 using Ombi.Core.Services;
@@ -29,9 +27,7 @@ using Ombi.Schedule.Jobs.Ombi;
 using Ombi.Settings.Settings.Models;
 using Ombi.Settings.Settings.Models.Notifications;
 using Ombi.Store.Entities;
-using Ombi.Store.Entities.Requests;
 using Ombi.Store.Repository;
-using Ombi.Store.Repository.Requests;
 using IdentityResult = Microsoft.AspNetCore.Identity.IdentityResult;
 using OmbiIdentityResult = Ombi.Models.Identity.IdentityResult;
 

src/Ombi/Controllers/V1/SettingsController.cs

@@ -40,7 +40,6 @@ namespace Ombi.Controllers.V1
     /// <summary>
     /// The Settings Controller
     /// </summary>
-    [Admin]
     [ApiV1]
     [Produces("application/json")]
     [ApiController]
@@ -78,6 +77,7 @@ namespace Ombi.Controllers.V1
         /// Gets the Ombi settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("ombi")]
         public async Task<OmbiSettings> OmbiSettings()
         {
@@ -110,6 +110,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="ombi">The ombi.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("ombi")]
         public async Task<bool> OmbiSettings([FromBody]OmbiSettings ombi)
         {
@@ -145,6 +146,7 @@ namespace Ombi.Controllers.V1
             return model;
         }
 
+        [Admin]
         [HttpPost("ombi/resetApi")]
         public async Task<string> ResetApiKey()
         {
@@ -159,6 +161,7 @@ namespace Ombi.Controllers.V1
         /// Gets the Plex Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("plex")]
         public async Task<PlexSettings> PlexSettings()
         {
@@ -185,6 +188,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="plex">The plex.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("plex")]
         public async Task<bool> PlexSettings([FromBody]PlexSettings plex)
         {
@@ -207,6 +211,7 @@ namespace Ombi.Controllers.V1
         /// Gets the Emby Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("emby")]
         public async Task<EmbySettings> EmbySettings()
         {
@@ -218,6 +223,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="emby">The emby.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("emby")]
         public async Task<bool> EmbySettings([FromBody]EmbySettings emby)
         {
@@ -243,6 +249,7 @@ namespace Ombi.Controllers.V1
         /// Gets the Jellyfin Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("jellyfin")]
         public async Task<JellyfinSettings> JellyfinSettings()
         {
@@ -254,6 +261,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="jellyfin">The jellyfin.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("jellyfin")]
         public async Task<bool> JellyfinSettings([FromBody]JellyfinSettings jellyfin)
         {
@@ -291,6 +299,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("landingpage")]
         public async Task<bool> LandingPageSettings([FromBody]LandingPageSettings settings)
         {
@@ -326,6 +335,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("customization")]
         public async Task<bool> CustomizationSettings([FromBody]CustomizationSettings settings)
         {
@@ -344,6 +354,7 @@ namespace Ombi.Controllers.V1
         /// Get's the preset themes available
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("themes")]
         public async Task<IEnumerable<PresetThemeViewModel>> GetThemes()
         {
@@ -377,6 +388,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <returns></returns>
         [HttpGet("sonarr")]
+        [PowerUser]
         public async Task<SonarrSettings> SonarrSettings()
         {
             return await Get<SonarrSettings>();
@@ -388,6 +400,7 @@ namespace Ombi.Controllers.V1
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
         [HttpPost("sonarr")]
+        [Admin]
         public async Task<bool> SonarrSettings([FromBody]SonarrSettings settings)
         {
             var result = await Save(settings);
@@ -403,6 +416,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <returns></returns>
         [HttpGet("radarr")]
+        [PowerUser]
         public async Task<RadarrCombinedModel> RadarrSettings()
         {
             return new RadarrCombinedModel
@@ -416,6 +430,7 @@ namespace Ombi.Controllers.V1
         /// Gets the Lidarr Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("lidarr")]
         public async Task<LidarrSettings> LidarrSettings()
         {
@@ -439,6 +454,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("lidarr")]
         public async Task<bool> LidarrSettings([FromBody]LidarrSettings settings)
         {
@@ -455,6 +471,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("authentication")]
         public async Task<bool> AuthenticationsSettings([FromBody]AuthenticationSettings settings)
         {
@@ -477,6 +494,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("radarr")]
         public async Task<bool> RadarrSettings([FromBody]RadarrCombinedModel settings)
         {
@@ -498,6 +516,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("Update")]
         public async Task<bool> UpdateSettings([FromBody]UpdateSettings settings)
         {
@@ -508,6 +527,7 @@ namespace Ombi.Controllers.V1
         /// Gets the UserManagement Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("UserManagement")]
         public async Task<UserManagementSettings> UserManagementSettings()
         {
@@ -519,6 +539,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("UserManagement")]
         public async Task<bool> UserManagementSettings([FromBody]UserManagementSettings settings)
         {
@@ -529,6 +550,7 @@ namespace Ombi.Controllers.V1
         /// Gets the Update Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("Update")]
         public async Task<UpdateSettings> UpdateSettings()
         {
@@ -541,6 +563,7 @@ namespace Ombi.Controllers.V1
         /// Gets the CouchPotatoSettings Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("CouchPotato")]
         public async Task<CouchPotatoSettings> CouchPotatoSettings()
         {
@@ -552,6 +575,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("CouchPotato")]
         public async Task<bool> CouchPotatoSettings([FromBody]CouchPotatoSettings settings)
         {
@@ -562,6 +586,7 @@ namespace Ombi.Controllers.V1
         /// Gets the DogNzbSettings Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("DogNzb")]
         public async Task<DogNzbSettings> DogNzbSettings()
         {
@@ -573,6 +598,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("DogNzb")]
         public async Task<bool> DogNzbSettings([FromBody]DogNzbSettings settings)
         {
@@ -584,6 +610,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("SickRage")]
         public async Task<bool> SickRageSettings([FromBody]SickRageSettings settings)
         {
@@ -594,6 +621,7 @@ namespace Ombi.Controllers.V1
         /// Gets the SickRage Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("SickRage")]
         public async Task<SickRageSettings> SickRageSettings()
         {
@@ -604,6 +632,7 @@ namespace Ombi.Controllers.V1
         /// Gets the JobSettings Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("jobs")]
         public async Task<JobSettings> JobSettings()
         {
@@ -636,6 +665,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("jobs")]
         public async Task<JobSettingsViewModel> JobSettings([FromBody]JobSettings settings)
         {
@@ -679,6 +709,7 @@ namespace Ombi.Controllers.V1
         }
 
         [HttpPost("testcron")]
+        [Admin]
         public CronTestModel TestCron([FromBody] CronViewModelBody body)
         {
             var model = new CronTestModel();
@@ -712,6 +743,7 @@ namespace Ombi.Controllers.V1
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
         [HttpPost("Issues")]
+        [Admin]
         public async Task<bool> IssueSettings([FromBody]IssueSettings settings)
         {
             return await Save(settings);
@@ -742,6 +774,7 @@ namespace Ombi.Controllers.V1
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
         [HttpPost("vote")]
+        [Admin]
         public async Task<bool> VoteSettings([FromBody]VoteSettings settings)
         {
             return await Save(settings);
@@ -752,6 +785,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <returns></returns>
         [HttpGet("vote")]
+        [Admin]
         public async Task<VoteSettings> VoteSettings()
         {
             return await Get<VoteSettings>();
@@ -770,6 +804,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="settings">The settings.</param>
         [HttpPost("themoviedb")]
+        [Admin]
         public async Task<bool> TheMovieDbSettings([FromBody]TheMovieDbSettings settings)
         {
             return await Save(settings);
@@ -778,6 +813,7 @@ namespace Ombi.Controllers.V1
         /// <summary>
         /// Get The Movie DB settings.
         /// </summary>
+        [Admin]
         [HttpGet("themoviedb")]
         public async Task<TheMovieDbSettings> TheMovieDbSettings()
         {
@@ -789,6 +825,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="model">The model.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("notifications/email")]
         public async Task<bool> EmailNotificationSettings([FromBody] EmailNotificationsViewModel model)
         {
@@ -806,6 +843,7 @@ namespace Ombi.Controllers.V1
         /// Gets the Email Notification Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("notifications/email")]
         public async Task<EmailNotificationsViewModel> EmailNotificationSettings()
         {
@@ -836,6 +874,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="model">The model.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("notifications/discord")]
         public async Task<bool> DiscordNotificationSettings([FromBody] DiscordNotificationsViewModel model)
         {
@@ -853,6 +892,7 @@ namespace Ombi.Controllers.V1
         /// Gets the discord Notification Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("notifications/discord")]
         public async Task<DiscordNotificationsViewModel> DiscordNotificationSettings()
         {
@@ -871,6 +911,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="model">The model.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("notifications/telegram")]
         public async Task<bool> TelegramNotificationSettings([FromBody] TelegramNotificationsViewModel model)
         {
@@ -888,6 +929,7 @@ namespace Ombi.Controllers.V1
         /// Gets the telegram Notification Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("notifications/telegram")]
         public async Task<TelegramNotificationsViewModel> TelegramNotificationSettings()
         {
@@ -905,6 +947,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="model">The model.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("notifications/pushbullet")]
         public async Task<bool> PushbulletNotificationSettings([FromBody] PushbulletNotificationViewModel model)
         {
@@ -922,6 +965,7 @@ namespace Ombi.Controllers.V1
         /// Gets the pushbullet Notification Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("notifications/pushbullet")]
         public async Task<PushbulletNotificationViewModel> PushbulletNotificationSettings()
         {
@@ -939,6 +983,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="model">The model.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("notifications/pushover")]
         public async Task<bool> PushoverNotificationSettings([FromBody] PushoverNotificationViewModel model)
         {
@@ -956,6 +1001,7 @@ namespace Ombi.Controllers.V1
         /// Gets the pushover Notification Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("notifications/pushover")]
         public async Task<PushoverNotificationViewModel> PushoverNotificationSettings()
         {
@@ -974,6 +1020,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="model">The model.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("notifications/slack")]
         public async Task<bool> SlacktNotificationSettings([FromBody] SlackNotificationsViewModel model)
         {
@@ -991,6 +1038,7 @@ namespace Ombi.Controllers.V1
         /// Gets the slack Notification Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("notifications/slack")]
         public async Task<SlackNotificationsViewModel> SlackNotificationSettings()
         {
@@ -1008,6 +1056,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="model">The model.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("notifications/mattermost")]
         public async Task<bool> MattermostNotificationSettings([FromBody] MattermostNotificationsViewModel model)
         {
@@ -1025,6 +1074,7 @@ namespace Ombi.Controllers.V1
         /// Gets the Mattermost Notification Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("notifications/mattermost")]
         public async Task<MattermostNotificationsViewModel> MattermostNotificationSettings()
         {
@@ -1041,6 +1091,7 @@ namespace Ombi.Controllers.V1
         /// Gets the Twilio Notification Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("notifications/twilio")]
         public async Task<TwilioSettingsViewModel> TwilioNotificationSettings()
         {
@@ -1062,6 +1113,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="model">The model.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("notifications/twilio")]
         public async Task<bool> TwilioNotificationSettings([FromBody] TwilioSettingsViewModel model)
         {
@@ -1080,6 +1132,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="model">The model.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("notifications/mobile")]
         public async Task<bool> MobileNotificationSettings([FromBody] MobileNotificationsViewModel model)
         {
@@ -1097,6 +1150,7 @@ namespace Ombi.Controllers.V1
         /// Gets the Mobile Notification Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("notifications/mobile")]
         public async Task<MobileNotificationsViewModel> MobileNotificationSettings()
         {
@@ -1114,6 +1168,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="model">The model.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("notifications/gotify")]
         public async Task<bool> GotifyNotificationSettings([FromBody] GotifyNotificationViewModel model)
         {
@@ -1131,6 +1186,7 @@ namespace Ombi.Controllers.V1
         /// Gets the gotify Notification Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("notifications/gotify")]
         public async Task<GotifyNotificationViewModel> GotifyNotificationSettings()
         {
@@ -1148,6 +1204,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="model">The model.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("notifications/webhook")]
         public async Task<bool> WebhookNotificationSettings([FromBody] WebhookNotificationViewModel model)
         {
@@ -1161,6 +1218,7 @@ namespace Ombi.Controllers.V1
         /// Gets the webhook notification settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("notifications/webhook")]
         public async Task<WebhookNotificationViewModel> WebhookNotificationSettings()
         {
@@ -1175,6 +1233,7 @@ namespace Ombi.Controllers.V1
         /// </summary>
         /// <param name="model">The model.</param>
         /// <returns></returns>
+        [Admin]
         [HttpPost("notifications/newsletter")]
         public async Task<bool> NewsletterSettings([FromBody] NewsletterNotificationViewModel model)
         {
@@ -1189,6 +1248,7 @@ namespace Ombi.Controllers.V1
         }
 
         [ApiExplorerSettings(IgnoreApi = true)]
+        [Admin]
         [HttpPost("notifications/newsletterdatabase")]
         public async Task<bool> UpdateNewsletterDatabase()
         {
@@ -1199,6 +1259,7 @@ namespace Ombi.Controllers.V1
         /// Gets the Newsletter Notification Settings.
         /// </summary>
         /// <returns></returns>
+        [Admin]
         [HttpGet("notifications/newsletter")]
         public async Task<NewsletterNotificationViewModel> NewsletterSettings()
         {

src/Ombi/Controllers/V2/WizardController.cs

@@ -1,4 +1,6 @@
-using Microsoft.AspNetCore.Authorization;
+using System;
+using System.Threading;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Ombi.Attributes;
 using Ombi.Core.Settings;
@@ -6,6 +8,10 @@ using Ombi.Helpers;
 using Ombi.Models.V2;
 using Ombi.Settings.Settings.Models;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using MySqlConnector;
+using Npgsql;
+using Ombi.Core.Services;
 
 namespace Ombi.Controllers.V2
 {
@@ -13,15 +19,25 @@ namespace Ombi.Controllers.V2
     [AllowAnonymous]
     public class WizardController : V2Controller
     {
+        private readonly ISettingsService<OmbiSettings> _ombiSettings;
+        private readonly IDatabaseConfigurationService _databaseConfigurationService;
+        private readonly ILogger _logger;
         private ISettingsService<CustomizationSettings> _customizationSettings { get; }
 
-        public WizardController(ISettingsService<CustomizationSettings> customizationSettings)
+        public WizardController(
+            ISettingsService<CustomizationSettings> customizationSettings, 
+            ISettingsService<OmbiSettings> ombiSettings,
+            IDatabaseConfigurationService databaseConfigurationService,
+            ILogger<WizardController> logger)
         {
+            _ombiSettings = ombiSettings;
+            _databaseConfigurationService = databaseConfigurationService;
+            _logger = logger;
             _customizationSettings = customizationSettings;
         }
 
         [HttpPost("config")]
-        [ApiExplorerSettings(IgnoreApi =true)]
+        [ApiExplorerSettings(IgnoreApi = true)]
         public async Task<IActionResult> OmbiConfig([FromBody] OmbiConfigModel config)
         {
             if (config == null)
@@ -29,6 +45,13 @@ namespace Ombi.Controllers.V2
                 return BadRequest();
             }
 
+            var ombiSettings = await _ombiSettings.GetSettingsAsync();
+            if (ombiSettings.Wizard)
+            {
+                _logger.LogError("Wizard has already been completed");
+                return BadRequest();
+            }
+
             var settings = await _customizationSettings.GetSettingsAsync();
 
             if (config.ApplicationName.HasValue())
@@ -50,5 +73,67 @@ namespace Ombi.Controllers.V2
 
             return new OkObjectResult(settings);
         }
+
+        [HttpPost("database")]
+        [ApiExplorerSettings(IgnoreApi = true)]
+        public async Task<IActionResult> DatabaseConfig([FromBody] WizardDatabaseConfiguration config, CancellationToken token)
+        {
+            if (config == null)
+            {
+                return BadRequest();
+            }            
+            
+            var ombiSettings = await _ombiSettings.GetSettingsAsync();
+            if (ombiSettings.Wizard)
+            {
+                _logger.LogError("Wizard has already been completed");
+                return BadRequest();
+            }
+
+            var sanitizedType = config.Type.Replace(Environment.NewLine, "").Replace("\n", "").Replace("\r", "");
+            _logger.LogInformation("Setting up database type: {0}", sanitizedType);
+
+            var connectionString = string.Empty;
+            if (config.Type == IDatabaseConfigurationService.MySqlDatabase)
+            {
+                _logger.LogInformation("Building MySQL connectionstring");
+                var builder = new MySqlConnectionStringBuilder
+                {
+                    Database = config.Name,
+                    Port = Convert.ToUInt32(config.Port),
+                    Server = config.Host,
+                    UserID = config.User,
+                    Password = config.Password
+                };
+
+                connectionString = builder.ToString();
+            }
+
+            if (config.Type == IDatabaseConfigurationService.PostgresDatabase)
+            {
+                _logger.LogInformation("Building Postgres connectionstring");
+                var builder = new NpgsqlConnectionStringBuilder
+                {
+                    Host = config.Host,
+                    Port = config.Port,
+                    Database = config.Name,
+                    Username = config.User,
+                    Password = config.Password
+                };
+                connectionString = builder.ToString();
+            }
+
+            var result = await _databaseConfigurationService.ConfigureDatabase(config.Type, connectionString, token);
+            
+            if (!result)
+            {
+                return BadRequest(new DatabaseConfigurationResult(false, "Could not configure the database, please check the logs"));
+            }
+            
+            return Ok(new DatabaseConfigurationResult(true, "Database configured successfully"));
+        }
+
+        public record DatabaseConfigurationResult(bool Success, string Message);
+
     }
 }

src/Ombi/Extensions/DatabaseExtensions.cs

@@ -8,6 +8,8 @@ using Microsoft.Extensions.Diagnostics.HealthChecks;
 using MySqlConnector;
 using Newtonsoft.Json;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal;
+using Ombi.Core.Helpers;
+using Ombi.Core.Models;
 using Ombi.Helpers;
 using Ombi.Store.Context;
 using Ombi.Store.Context.MySql;
@@ -38,11 +40,11 @@ namespace Ombi.Extensions
                     AddSqliteHealthCheck(hcBuilder, "Ombi Database", configuration.OmbiDatabase);
                     break;
                 case var type when type.Equals(MySqlDatabase, StringComparison.InvariantCultureIgnoreCase):
-                    services.AddDbContext<OmbiContext, OmbiMySqlContext>(x => ConfigureMySql(x, configuration.OmbiDatabase));
+                    services.AddDbContext<OmbiContext, OmbiMySqlContext>(x => DatabaseConfigurationSetup.ConfigureMySql(x, configuration.OmbiDatabase));
                     AddMySqlHealthCheck(hcBuilder, "Ombi Database", configuration.OmbiDatabase);
                     break;
                 case var type when type.Equals(PostgresDatabase, StringComparison.InvariantCultureIgnoreCase):
-                    services.AddDbContext<OmbiContext, OmbiPostgresContext>(x => ConfigurePostgres(x, configuration.OmbiDatabase));
+                    services.AddDbContext<OmbiContext, OmbiPostgresContext>(x => DatabaseConfigurationSetup.ConfigurePostgres(x, configuration.OmbiDatabase));
                     AddPostgresHealthCheck(hcBuilder, "Ombi Database", configuration.OmbiDatabase);
                     break;
             }
@@ -54,11 +56,11 @@ namespace Ombi.Extensions
                     AddSqliteHealthCheck(hcBuilder, "External Database", configuration.ExternalDatabase);
                     break;
                 case var type when type.Equals(MySqlDatabase, StringComparison.InvariantCultureIgnoreCase):
-                    services.AddDbContext<ExternalContext, ExternalMySqlContext>(x => ConfigureMySql(x, configuration.ExternalDatabase));
+                    services.AddDbContext<ExternalContext, ExternalMySqlContext>(x => DatabaseConfigurationSetup.ConfigureMySql(x, configuration.ExternalDatabase));
                     AddMySqlHealthCheck(hcBuilder, "External Database", configuration.ExternalDatabase);
                     break;
                 case var type when type.Equals(PostgresDatabase, StringComparison.InvariantCultureIgnoreCase):
-                    services.AddDbContext<ExternalContext, ExternalPostgresContext>(x => ConfigurePostgres(x, configuration.ExternalDatabase));
+                    services.AddDbContext<ExternalContext, ExternalPostgresContext>(x => DatabaseConfigurationSetup.ConfigurePostgres(x, configuration.ExternalDatabase));
                     AddPostgresHealthCheck(hcBuilder, "External Database", configuration.ExternalDatabase);
                     break;
             }
@@ -70,11 +72,11 @@ namespace Ombi.Extensions
                     AddSqliteHealthCheck(hcBuilder, "Settings Database", configuration.SettingsDatabase);
                     break;
                 case var type when type.Equals(MySqlDatabase, StringComparison.InvariantCultureIgnoreCase):
-                    services.AddDbContext<SettingsContext, SettingsMySqlContext>(x => ConfigureMySql(x, configuration.SettingsDatabase));
+                    services.AddDbContext<SettingsContext, SettingsMySqlContext>(x => DatabaseConfigurationSetup.ConfigureMySql(x, configuration.SettingsDatabase));
                     AddMySqlHealthCheck(hcBuilder, "Settings Database", configuration.SettingsDatabase);
                     break;
                 case var type when type.Equals(PostgresDatabase, StringComparison.InvariantCultureIgnoreCase):
-                    services.AddDbContext<SettingsContext, SettingsPostgresContext>(x => ConfigurePostgres(x, configuration.SettingsDatabase));
+                    services.AddDbContext<SettingsContext, SettingsPostgresContext>(x => DatabaseConfigurationSetup.ConfigurePostgres(x, configuration.SettingsDatabase));
                     AddPostgresHealthCheck(hcBuilder, "Settings Database", configuration.SettingsDatabase);
                     break;
             }
@@ -150,95 +152,5 @@ namespace Ombi.Extensions
             SQLitePCL.raw.sqlite3_config(raw.SQLITE_CONFIG_MULTITHREAD);
             options.UseSqlite(config.ConnectionString);
         }
-
-        public static void ConfigureMySql(DbContextOptionsBuilder options, PerDatabaseConfiguration config)
-        {
-            if (string.IsNullOrEmpty(config.ConnectionString))
-            {
-                throw new ArgumentNullException("ConnectionString for the MySql/Mariadb database is empty");
-            }
-
-            options.UseMySql(config.ConnectionString, GetServerVersion(config.ConnectionString), b =>
-            {
-                //b.CharSetBehavior(Pomelo.EntityFrameworkCore.MySql.Infrastructure.CharSetBehavior.NeverAppend); // ##ISSUE, link to migrations?
-                b.EnableRetryOnFailure();
-            });
-        }
-
-        public static void ConfigurePostgres(DbContextOptionsBuilder options, PerDatabaseConfiguration config)
-        {
-            options.UseNpgsql(config.ConnectionString, b =>
-            {
-                b.EnableRetryOnFailure();
-            }).ReplaceService<ISqlGenerationHelper, NpgsqlCaseInsensitiveSqlGenerationHelper>();
-        }
-
-        private static ServerVersion GetServerVersion(string connectionString)
-        {
-            // Workaround Windows bug, that can lead to the following exception:
-            //
-            // MySqlConnector.MySqlException (0x80004005): SSL Authentication Error
-            //     ---> System.Security.Authentication.AuthenticationException: Authentication failed, see inner exception.
-            //     ---> System.ComponentModel.Win32Exception (0x8009030F): The message or signature supplied for verification has been altered
-            //
-            // See https://github.com/dotnet/runtime/issues/17005#issuecomment-305848835
-            //
-            // Also workaround for the fact, that ServerVersion.AutoDetect() does not use any retrying strategy.
-            ServerVersion serverVersion = null;
-#pragma warning disable EF1001
-            var retryPolicy = Policy.Handle<Exception>(exception => MySqlTransientExceptionDetector.ShouldRetryOn(exception))
-#pragma warning restore EF1001
-                .WaitAndRetry(3, (count, context) => TimeSpan.FromMilliseconds(count * 250));
-
-            serverVersion = retryPolicy.Execute(() => serverVersion = ServerVersion.AutoDetect(connectionString));
-
-            return serverVersion;
-        }
-
-        public class DatabaseConfiguration
-        {
-            public DatabaseConfiguration()
-            {
-
-            }
-
-            public DatabaseConfiguration(string defaultSqlitePath)
-            {
-                OmbiDatabase = new PerDatabaseConfiguration(SqliteDatabase, $"Data Source={Path.Combine(defaultSqlitePath, "Ombi.db")}");
-                SettingsDatabase = new PerDatabaseConfiguration(SqliteDatabase, $"Data Source={Path.Combine(defaultSqlitePath, "OmbiSettings.db")}");
-                ExternalDatabase = new PerDatabaseConfiguration(SqliteDatabase, $"Data Source={Path.Combine(defaultSqlitePath, "OmbiExternal.db")}");
-            }
-            public PerDatabaseConfiguration OmbiDatabase { get; set; }
-            public PerDatabaseConfiguration SettingsDatabase { get; set; }
-            public PerDatabaseConfiguration ExternalDatabase { get; set; }
-        }
-
-        public class PerDatabaseConfiguration
-        {
-            public PerDatabaseConfiguration(string type, string connectionString)
-            {
-                Type = type;
-                ConnectionString = connectionString;
-            }
-
-            // Used in Deserialization
-            public PerDatabaseConfiguration()
-            {
-
-            }
-            public string Type { get; set; }
-            public string ConnectionString { get; set; }
-        }
-
-        public class NpgsqlCaseInsensitiveSqlGenerationHelper : NpgsqlSqlGenerationHelper
-        {
-            const string EFMigrationsHisory = "__EFMigrationsHistory";
-            public NpgsqlCaseInsensitiveSqlGenerationHelper(RelationalSqlGenerationHelperDependencies dependencies)
-                : base(dependencies) { }
-            public override string DelimitIdentifier(string identifier) =>
-                base.DelimitIdentifier(identifier == EFMigrationsHisory ? identifier : identifier.ToLower());
-            public override void DelimitIdentifier(StringBuilder builder, string identifier)
-                => base.DelimitIdentifier(builder, identifier == EFMigrationsHisory ? identifier : identifier.ToLower());
-        }
     }
 }

src/Ombi/Models/V2/WizardDatabaseConfiguration.cs

@@ -0,0 +1,3 @@
+namespace Ombi.Models.V2;
+
+public record WizardDatabaseConfiguration(string Type, string Host, int Port, string Name, string User, string Password);

src/Ombi/Ombi.csproj

@@ -54,10 +54,6 @@
     <Content Remove="database.json" />
   </ItemGroup>
   
-  <ItemGroup>
-    <None Include="database.json" />
-  </ItemGroup>
-  
   <ItemGroup>
     <None Include="..\.editorconfig" Link=".editorconfig" />
   </ItemGroup>

src/Ombi/Startup.cs

@@ -87,7 +87,10 @@ namespace Ombi
             services.AddJwtAuthentication();
 
             services.AddMvc()
-                .AddNewtonsoftJson(x => x.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore);
+                .AddNewtonsoftJson(x => {
+                    x.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
+                    x.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Utc;
+                });
 
             services.AddOmbiMappingProfile();
             services.AddAutoMapper(expression => expression.AddCollectionMappers());