Search: Remove ConditionalContextMenu

Was required for iOS 15 to properly update its state. This is no longer
a requirement.

Signed-off-by: kingbri <bdashore3@proton.me>

.github/workflows/nightly.yml

@@ -6,13 +6,13 @@ on:
 
 jobs:
   build:
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: latest
+          xcode-version: latest-stable
       - name: Get commit SHA
         run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
       - name: Build
@@ -25,7 +25,7 @@ jobs:
           cp -r build/Ferrite.xcarchive/Products/Applications/Ferrite.app Payload
           zip -r Ferrite-iOS_nightly-${{ env.sha_short }}.ipa Payload
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Ferrite-iOS_nightly-${{ env.sha_short }}.ipa
           path: Ferrite-iOS_nightly-${{ env.sha_short }}.ipa

.github/workflows/release.yml

@@ -7,13 +7,13 @@ on:
 
 jobs:
   build:
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: latest
+          xcode-version: latest-stable
       - name: Build
         run: xcodebuild -scheme Ferrite -configuration Release archive -archivePath build/Ferrite.xcarchive CODE_SIGN_IDENTITY= CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
         env:
@@ -30,7 +30,7 @@ jobs:
         run: |
           zip -j Ferrite-iOS_v${{ env.app_version }}.ipa.zip Ferrite-iOS_v${{ env.app_version }}.ipa
       - name: Upload release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: Ferrite-iOS_v${{ env.app_version }}.ipa.zip

Ferrite.xcodeproj/project.pbxproj

@@ -12,6 +12,9 @@
 		0C03EB72296F619900162E9A /* PluginList+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C03EB70296F619900162E9A /* PluginList+CoreDataProperties.swift */; };
 		0C0755C6293424A200ECA142 /* DebridLabelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0755C5293424A200ECA142 /* DebridLabelView.swift */; };
 		0C0755C8293425B500ECA142 /* DebridManagerModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0755C7293425B500ECA142 /* DebridManagerModels.swift */; };
+		0C07C6042C1A859B00808A46 /* FormDataBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C07C6032C1A859B00808A46 /* FormDataBody.swift */; };
+		0C07C6062C1B2F7600808A46 /* OffCloudModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C07C6052C1B2F7600808A46 /* OffCloudModels.swift */; };
+		0C07C6082C1B2F8000808A46 /* OffCloudWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C07C6072C1B2F8000808A46 /* OffCloudWrapper.swift */; };
 		0C0974B029CCAAAF006DE7A3 /* OperatingSystemVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0974AF29CCAAAF006DE7A3 /* OperatingSystemVersion.swift */; };
 		0C0D50E5288DFE7F0035ECC8 /* SourceModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0D50E4288DFE7F0035ECC8 /* SourceModels.swift */; };
 		0C0D50E7288DFF850035ECC8 /* PluginAggregateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0D50E6288DFF850035ECC8 /* PluginAggregateView.swift */; };
@@ -20,7 +23,6 @@
 		0C1A3E5229C8A7F500DA9730 /* SettingsModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C1A3E5129C8A7F500DA9730 /* SettingsModels.swift */; };
 		0C1A3E5629C9488C00DA9730 /* CodableWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C1A3E5529C9488C00DA9730 /* CodableWrapper.swift */; };
 		0C2886D22960AC2800D6FC16 /* DebridCloudView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C2886D12960AC2800D6FC16 /* DebridCloudView.swift */; };
-		0C2886D72960C50900D6FC16 /* RealDebridCloudView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C2886D62960C50900D6FC16 /* RealDebridCloudView.swift */; };
 		0C2B028F29E9E61E00DCF127 /* SortFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C2B028E29E9E61E00DCF127 /* SortFilterView.swift */; };
 		0C2D9653299316CC00A504B6 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C2D9652299316CC00A504B6 /* Tag.swift */; };
 		0C31133C28B1ABFA004DCB0D /* SourceJsonParser+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C31133A28B1ABFA004DCB0D /* SourceJsonParser+CoreDataClass.swift */; };
@@ -39,7 +41,6 @@
 		0C422E80293542F300486D65 /* PremiumizeModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C422E7F293542F300486D65 /* PremiumizeModels.swift */; };
 		0C42B5982932F6DD008057A0 /* Set.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C42B5972932F6DD008057A0 /* Set.swift */; };
 		0C445C62293F9A0B0060744D /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C445C61293F9A0B0060744D /* Bundle.swift */; };
-		0C448BE929A135F100F4E266 /* Introspect-Static in Frameworks */ = {isa = PBXBuildFile; productRef = 0C448BE829A135F100F4E266 /* Introspect-Static */; };
 		0C44E2A828D4DDDC007711AE /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C44E2A728D4DDDC007711AE /* Application.swift */; };
 		0C44E2AD28D51C63007711AE /* BackupManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C44E2AC28D51C63007711AE /* BackupManager.swift */; };
 		0C44E2AF28D52E8A007711AE /* BackupsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C44E2AE28D52E8A007711AE /* BackupsView.swift */; };
@@ -54,7 +55,6 @@
 		0C54D36428C5086E00BFEEE2 /* History+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C54D36228C5086E00BFEEE2 /* History+CoreDataProperties.swift */; };
 		0C5708EB29B8F89300BE07F9 /* SettingsLogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C5708EA29B8F89300BE07F9 /* SettingsLogView.swift */; };
 		0C57D4CC289032ED008534E8 /* SearchResultInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C57D4CB289032ED008534E8 /* SearchResultInfoView.swift */; };
-		0C5FCB05296744F300849E87 /* AllDebridCloudView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C5FCB04296744F300849E87 /* AllDebridCloudView.swift */; };
 		0C64A4B4288903680079976D /* Base32 in Frameworks */ = {isa = PBXBuildFile; productRef = 0C64A4B3288903680079976D /* Base32 */; };
 		0C64A4B7288903880079976D /* KeychainSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 0C64A4B6288903880079976D /* KeychainSwift */; };
 		0C6771F429B3B4FD005D38D2 /* KodiWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C6771F329B3B4FD005D38D2 /* KodiWrapper.swift */; };
@@ -68,7 +68,6 @@
 		0C6C7C9D29315292002DF910 /* AllDebridModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C6C7C9C29315292002DF910 /* AllDebridModels.swift */; };
 		0C7075E429D374C50093DB2D /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C7075E329D374C50093DB2D /* Color.swift */; };
 		0C7075E629D3845D0093DB2D /* ShareSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C7075E529D3845D0093DB2D /* ShareSheet.swift */; };
-		0C70E40228C3CE9C00A5C72D /* ConditionalContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C70E40128C3CE9C00A5C72D /* ConditionalContextMenu.swift */; };
 		0C70E40628C40C4E00A5C72D /* NotificationCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C70E40528C40C4E00A5C72D /* NotificationCenter.swift */; };
 		0C733287289C4C820058D1FE /* SourceSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C733286289C4C820058D1FE /* SourceSettingsView.swift */; };
 		0C748EDA29D9256D0049B8BE /* Yams in Frameworks */ = {isa = PBXBuildFile; productRef = 0C748ED929D9256D0049B8BE /* Yams */; };
@@ -81,6 +80,7 @@
 		0C794B6D289EFA2E00DD1CC8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0C794B6C289EFA2E00DD1CC8 /* LaunchScreen.storyboard */; };
 		0C79DC072899AF3C003F1C5A /* SourceSeedLeech+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C79DC052899AF3C003F1C5A /* SourceSeedLeech+CoreDataClass.swift */; };
 		0C79DC082899AF3C003F1C5A /* SourceSeedLeech+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C79DC062899AF3C003F1C5A /* SourceSeedLeech+CoreDataProperties.swift */; };
+		0C7B4A002CB051550048FA28 /* SwiftUIIntrospect in Frameworks */ = {isa = PBXBuildFile; productRef = 0C7B49FF2CB051550048FA28 /* SwiftUIIntrospect */; };
 		0C7C128628DAA3CD00381CD1 /* URL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C7C128528DAA3CD00381CD1 /* URL.swift */; };
 		0C7D11FE28AA03FE00ED92DB /* View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C7D11FD28AA03FE00ED92DB /* View.swift */; };
 		0C7ED14128D61BBA009E29AD /* BackupModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C7ED14028D61BBA009E29AD /* BackupModels.swift */; };
@@ -96,10 +96,14 @@
 		0C84FCE729E4B61A00B0DFE4 /* FilterModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C84FCE629E4B61A00B0DFE4 /* FilterModels.swift */; };
 		0C84FCE929E5ADEF00B0DFE4 /* FilterAmountLabelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C84FCE829E5ADEF00B0DFE4 /* FilterAmountLabelView.swift */; };
 		0C871BDF29994D9D005279AC /* FilterLabelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C871BDE29994D9D005279AC /* FilterLabelView.swift */; };
+		0C890E492C188808003B17B5 /* TorBoxWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C890E482C188808003B17B5 /* TorBoxWrapper.swift */; };
+		0C890E4B2C188FA7003B17B5 /* TorBoxModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C890E4A2C188FA7003B17B5 /* TorBoxModels.swift */; };
+		0C8AE2482C0FFB6600701675 /* Store.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C8AE2472C0FFB6600701675 /* Store.swift */; };
 		0C8DC35229CE287E008A83AD /* PluginInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C8DC35129CE287E008A83AD /* PluginInfoView.swift */; };
 		0C8DC35429CE2AB5008A83AD /* SourceSettingsBaseUrlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C8DC35329CE2AB5008A83AD /* SourceSettingsBaseUrlView.swift */; };
 		0C8DC35629CE2ABF008A83AD /* SourceSettingsApiView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C8DC35529CE2ABF008A83AD /* SourceSettingsApiView.swift */; };
 		0C8DC35829CE2ACA008A83AD /* SourceSettingsMethodView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C8DC35729CE2ACA008A83AD /* SourceSettingsMethodView.swift */; };
+		0C93DED82CF80101009EA8D2 /* SettingsDebridLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C93DED72CF80101009EA8D2 /* SettingsDebridLinkView.swift */; };
 		0C95D8D828A55B03005E22B3 /* DefaultActionPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C95D8D728A55B03005E22B3 /* DefaultActionPickerView.swift */; };
 		0CA05457288EE58200850554 /* SettingsPluginListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA05456288EE58200850554 /* SettingsPluginListView.swift */; };
 		0CA05459288EE9E600850554 /* PluginManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA05458288EE9E600850554 /* PluginManager.swift */; };
@@ -107,7 +111,6 @@
 		0CA148D6288903F000DE2211 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148BB288903F000DE2211 /* SettingsView.swift */; };
 		0CA148D7288903F000DE2211 /* LoginWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148BC288903F000DE2211 /* LoginWebView.swift */; };
 		0CA148D8288903F000DE2211 /* ActionChoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148BD288903F000DE2211 /* ActionChoiceView.swift */; };
-		0CA148DB288903F000DE2211 /* NavView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148C1288903F000DE2211 /* NavView.swift */; };
 		0CA148DC288903F000DE2211 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0CA148C2288903F000DE2211 /* Assets.xcassets */; };
 		0CA148DD288903F000DE2211 /* ScrapingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148C3288903F000DE2211 /* ScrapingViewModel.swift */; };
 		0CA148DF288903F000DE2211 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0CA148C6288903F000DE2211 /* Preview Assets.xcassets */; };
@@ -129,12 +132,11 @@
 		0CA3FB2028B91D9500FA10A8 /* IndeterminateProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA3FB1F28B91D9500FA10A8 /* IndeterminateProgressView.swift */; };
 		0CA429F828C5098D000D0610 /* DateFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA429F728C5098D000D0610 /* DateFormatter.swift */; };
 		0CAF1C7B286F5C8600296F86 /* SwiftSoup in Frameworks */ = {isa = PBXBuildFile; productRef = 0CAF1C7A286F5C8600296F86 /* SwiftSoup */; };
-		0CAF9319296399190050812A /* PremiumizeCloudView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CAF9318296399190050812A /* PremiumizeCloudView.swift */; };
 		0CB0115B29D36D9E009AFEDE /* SearchResultsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB0115A29D36D9E009AFEDE /* SearchResultsView.swift */; };
 		0CB0AB5F29BD2A200015422C /* KodiServerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB0AB5E29BD2A200015422C /* KodiServerView.swift */; };
-		0CB6516328C5A57300DCA721 /* ConditionalId.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB6516228C5A57300DCA721 /* ConditionalId.swift */; };
 		0CB6516528C5A5D700DCA721 /* InlinedList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB6516428C5A5D700DCA721 /* InlinedList.swift */; };
-		0CB6516A28C5B4A600DCA721 /* InlineHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB6516928C5B4A600DCA721 /* InlineHeader.swift */; };
+		0CB725322C123E6F0047FC0B /* CloudDownloadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB725312C123E6F0047FC0B /* CloudDownloadView.swift */; };
+		0CB725342C123E760047FC0B /* CloudMagnetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB725332C123E760047FC0B /* CloudMagnetView.swift */; };
 		0CBAB83628D12ED500AC903E /* DisableInteraction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CBAB83528D12ED500AC903E /* DisableInteraction.swift */; };
 		0CBC76FD288D914F0054BE44 /* BatchChoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CBC76FC288D914F0054BE44 /* BatchChoiceView.swift */; };
 		0CBC76FF288DAAD00054BE44 /* NavigationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CBC76FE288DAAD00054BE44 /* NavigationViewModel.swift */; };
@@ -154,6 +156,8 @@
 		0CE1C4182981E8D700418F20 /* Plugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE1C4172981E8D700418F20 /* Plugin.swift */; };
 		0CEC8AAE299B31B6007BFE8F /* SearchFilterHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CEC8AAD299B31B6007BFE8F /* SearchFilterHeaderView.swift */; };
 		0CEC8AB2299B3B57007BFE8F /* LibraryPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CEC8AB1299B3B57007BFE8F /* LibraryPickerView.swift */; };
+		0CEE11B12C1743E0004C8BB2 /* SourceRequest+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CEE11AF2C1743E0004C8BB2 /* SourceRequest+CoreDataClass.swift */; };
+		0CEE11B22C1743E0004C8BB2 /* SourceRequest+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CEE11B02C1743E0004C8BB2 /* SourceRequest+CoreDataProperties.swift */; };
 		0CF1ABDC2C0C04B2009F6C26 /* Debrid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CF1ABDB2C0C04B2009F6C26 /* Debrid.swift */; };
 		0CF1ABE22C0C3D2F009F6C26 /* DebridModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CF1ABE12C0C3D2F009F6C26 /* DebridModels.swift */; };
 		0CF2C0A529D1EBD400E716DD /* UIApplication.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CF2C0A429D1EBD400E716DD /* UIApplication.swift */; };
@@ -165,6 +169,9 @@
 		0C03EB70296F619900162E9A /* PluginList+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PluginList+CoreDataProperties.swift"; sourceTree = "<group>"; };
 		0C0755C5293424A200ECA142 /* DebridLabelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebridLabelView.swift; sourceTree = "<group>"; };
 		0C0755C7293425B500ECA142 /* DebridManagerModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebridManagerModels.swift; sourceTree = "<group>"; };
+		0C07C6032C1A859B00808A46 /* FormDataBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormDataBody.swift; sourceTree = "<group>"; };
+		0C07C6052C1B2F7600808A46 /* OffCloudModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OffCloudModels.swift; sourceTree = "<group>"; };
+		0C07C6072C1B2F8000808A46 /* OffCloudWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OffCloudWrapper.swift; sourceTree = "<group>"; };
 		0C0974AF29CCAAAF006DE7A3 /* OperatingSystemVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OperatingSystemVersion.swift; sourceTree = "<group>"; };
 		0C0D50E4288DFE7F0035ECC8 /* SourceModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceModels.swift; sourceTree = "<group>"; };
 		0C0D50E6288DFF850035ECC8 /* PluginAggregateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluginAggregateView.swift; sourceTree = "<group>"; };
@@ -173,7 +180,6 @@
 		0C1A3E5129C8A7F500DA9730 /* SettingsModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsModels.swift; sourceTree = "<group>"; };
 		0C1A3E5529C9488C00DA9730 /* CodableWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableWrapper.swift; sourceTree = "<group>"; };
 		0C2886D12960AC2800D6FC16 /* DebridCloudView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebridCloudView.swift; sourceTree = "<group>"; };
-		0C2886D62960C50900D6FC16 /* RealDebridCloudView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RealDebridCloudView.swift; sourceTree = "<group>"; };
 		0C2B028E29E9E61E00DCF127 /* SortFilterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SortFilterView.swift; sourceTree = "<group>"; };
 		0C2D9652299316CC00A504B6 /* Tag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
 		0C31133A28B1ABFA004DCB0D /* SourceJsonParser+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceJsonParser+CoreDataClass.swift"; sourceTree = "<group>"; };
@@ -206,7 +212,6 @@
 		0C54D36228C5086E00BFEEE2 /* History+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "History+CoreDataProperties.swift"; sourceTree = "<group>"; };
 		0C5708EA29B8F89300BE07F9 /* SettingsLogView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsLogView.swift; sourceTree = "<group>"; };
 		0C57D4CB289032ED008534E8 /* SearchResultInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultInfoView.swift; sourceTree = "<group>"; };
-		0C5FCB04296744F300849E87 /* AllDebridCloudView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllDebridCloudView.swift; sourceTree = "<group>"; };
 		0C6771F329B3B4FD005D38D2 /* KodiWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KodiWrapper.swift; sourceTree = "<group>"; };
 		0C6771F529B3B602005D38D2 /* SettingsKodiView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsKodiView.swift; sourceTree = "<group>"; };
 		0C6771F929B3D1AE005D38D2 /* KodiModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KodiModels.swift; sourceTree = "<group>"; };
@@ -218,7 +223,6 @@
 		0C6C7C9C29315292002DF910 /* AllDebridModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllDebridModels.swift; sourceTree = "<group>"; };
 		0C7075E329D374C50093DB2D /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = "<group>"; };
 		0C7075E529D3845D0093DB2D /* ShareSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareSheet.swift; sourceTree = "<group>"; };
-		0C70E40128C3CE9C00A5C72D /* ConditionalContextMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConditionalContextMenu.swift; sourceTree = "<group>"; };
 		0C70E40528C40C4E00A5C72D /* NotificationCenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationCenter.swift; sourceTree = "<group>"; };
 		0C733286289C4C820058D1FE /* SourceSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceSettingsView.swift; sourceTree = "<group>"; };
 		0C750742289B003E004B3906 /* SourceRssParser+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceRssParser+CoreDataClass.swift"; sourceTree = "<group>"; };
@@ -244,10 +248,14 @@
 		0C84FCE629E4B61A00B0DFE4 /* FilterModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterModels.swift; sourceTree = "<group>"; };
 		0C84FCE829E5ADEF00B0DFE4 /* FilterAmountLabelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterAmountLabelView.swift; sourceTree = "<group>"; };
 		0C871BDE29994D9D005279AC /* FilterLabelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterLabelView.swift; sourceTree = "<group>"; };
+		0C890E482C188808003B17B5 /* TorBoxWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TorBoxWrapper.swift; sourceTree = "<group>"; };
+		0C890E4A2C188FA7003B17B5 /* TorBoxModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TorBoxModels.swift; sourceTree = "<group>"; };
+		0C8AE2472C0FFB6600701675 /* Store.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Store.swift; sourceTree = "<group>"; };
 		0C8DC35129CE287E008A83AD /* PluginInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluginInfoView.swift; sourceTree = "<group>"; };
 		0C8DC35329CE2AB5008A83AD /* SourceSettingsBaseUrlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceSettingsBaseUrlView.swift; sourceTree = "<group>"; };
 		0C8DC35529CE2ABF008A83AD /* SourceSettingsApiView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceSettingsApiView.swift; sourceTree = "<group>"; };
 		0C8DC35729CE2ACA008A83AD /* SourceSettingsMethodView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceSettingsMethodView.swift; sourceTree = "<group>"; };
+		0C93DED72CF80101009EA8D2 /* SettingsDebridLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsDebridLinkView.swift; sourceTree = "<group>"; };
 		0C95D8D728A55B03005E22B3 /* DefaultActionPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultActionPickerView.swift; sourceTree = "<group>"; };
 		0CA05456288EE58200850554 /* SettingsPluginListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsPluginListView.swift; sourceTree = "<group>"; };
 		0CA05458288EE9E600850554 /* PluginManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluginManager.swift; sourceTree = "<group>"; };
@@ -255,7 +263,6 @@
 		0CA148BB288903F000DE2211 /* SettingsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
 		0CA148BC288903F000DE2211 /* LoginWebView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginWebView.swift; sourceTree = "<group>"; };
 		0CA148BD288903F000DE2211 /* ActionChoiceView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActionChoiceView.swift; sourceTree = "<group>"; };
-		0CA148C1288903F000DE2211 /* NavView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavView.swift; sourceTree = "<group>"; };
 		0CA148C2288903F000DE2211 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		0CA148C3288903F000DE2211 /* ScrapingViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScrapingViewModel.swift; sourceTree = "<group>"; };
 		0CA148C6288903F000DE2211 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
@@ -277,12 +284,11 @@
 		0CA3FB1F28B91D9500FA10A8 /* IndeterminateProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IndeterminateProgressView.swift; sourceTree = "<group>"; };
 		0CA429F728C5098D000D0610 /* DateFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateFormatter.swift; sourceTree = "<group>"; };
 		0CAF1C68286F5C0E00296F86 /* Ferrite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Ferrite.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		0CAF9318296399190050812A /* PremiumizeCloudView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PremiumizeCloudView.swift; sourceTree = "<group>"; };
 		0CB0115A29D36D9E009AFEDE /* SearchResultsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultsView.swift; sourceTree = "<group>"; };
 		0CB0AB5E29BD2A200015422C /* KodiServerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KodiServerView.swift; sourceTree = "<group>"; };
-		0CB6516228C5A57300DCA721 /* ConditionalId.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConditionalId.swift; sourceTree = "<group>"; };
 		0CB6516428C5A5D700DCA721 /* InlinedList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InlinedList.swift; sourceTree = "<group>"; };
-		0CB6516928C5B4A600DCA721 /* InlineHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InlineHeader.swift; sourceTree = "<group>"; };
+		0CB725312C123E6F0047FC0B /* CloudDownloadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudDownloadView.swift; sourceTree = "<group>"; };
+		0CB725332C123E760047FC0B /* CloudMagnetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudMagnetView.swift; sourceTree = "<group>"; };
 		0CBAB83528D12ED500AC903E /* DisableInteraction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisableInteraction.swift; sourceTree = "<group>"; };
 		0CBC76FC288D914F0054BE44 /* BatchChoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BatchChoiceView.swift; sourceTree = "<group>"; };
 		0CBC76FE288DAAD00054BE44 /* NavigationViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationViewModel.swift; sourceTree = "<group>"; };
@@ -302,6 +308,8 @@
 		0CE1C4172981E8D700418F20 /* Plugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Plugin.swift; sourceTree = "<group>"; };
 		0CEC8AAD299B31B6007BFE8F /* SearchFilterHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchFilterHeaderView.swift; sourceTree = "<group>"; };
 		0CEC8AB1299B3B57007BFE8F /* LibraryPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LibraryPickerView.swift; sourceTree = "<group>"; };
+		0CEE11AF2C1743E0004C8BB2 /* SourceRequest+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceRequest+CoreDataClass.swift"; sourceTree = "<group>"; };
+		0CEE11B02C1743E0004C8BB2 /* SourceRequest+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceRequest+CoreDataProperties.swift"; sourceTree = "<group>"; };
 		0CF1ABDB2C0C04B2009F6C26 /* Debrid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Debrid.swift; sourceTree = "<group>"; };
 		0CF1ABE12C0C3D2F009F6C26 /* DebridModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebridModels.swift; sourceTree = "<group>"; };
 		0CF2C0A429D1EBD400E716DD /* UIApplication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIApplication.swift; sourceTree = "<group>"; };
@@ -313,13 +321,13 @@
 			buildActionMask = 2147483647;
 			files = (
 				0C7506D728B1AC9A008BEE38 /* SwiftyJSON in Frameworks */,
-				0C448BE929A135F100F4E266 /* Introspect-Static in Frameworks */,
 				0C64A4B4288903680079976D /* Base32 in Frameworks */,
 				0C4CFC462897030D00AD9FAD /* Regex in Frameworks */,
 				0C64A4B7288903880079976D /* KeychainSwift in Frameworks */,
 				0CAF1C7B286F5C8600296F86 /* SwiftSoup in Frameworks */,
 				0C748EDA29D9256D0049B8BE /* Yams in Frameworks */,
 				0CDDDE052935235E006810B1 /* BetterSafariView in Frameworks */,
+				0C7B4A002CB051550048FA28 /* SwiftUIIntrospect in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -383,6 +391,8 @@
 				0C84F47B2895BFED0074B7C9 /* Source+CoreDataProperties.swift */,
 				0C84F47C2895BFED0074B7C9 /* SourceHtmlParser+CoreDataClass.swift */,
 				0C84F47D2895BFED0074B7C9 /* SourceHtmlParser+CoreDataProperties.swift */,
+				0CEE11AF2C1743E0004C8BB2 /* SourceRequest+CoreDataClass.swift */,
+				0CEE11B02C1743E0004C8BB2 /* SourceRequest+CoreDataProperties.swift */,
 			);
 			path = Classes;
 			sourceTree = "<group>";
@@ -404,6 +414,8 @@
 				0C3E00D7296F5B9A00ECECB2 /* PluginModels.swift */,
 				0C6771F929B3D1AE005D38D2 /* KodiModels.swift */,
 				0C1A3E5129C8A7F500DA9730 /* SettingsModels.swift */,
+				0C890E4A2C188FA7003B17B5 /* TorBoxModels.swift */,
+				0C07C6052C1B2F7600808A46 /* OffCloudModels.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -411,9 +423,8 @@
 		0C2886D52960C4F800D6FC16 /* Cloud */ = {
 			isa = PBXGroup;
 			children = (
-				0C2886D62960C50900D6FC16 /* RealDebridCloudView.swift */,
+				0CB725312C123E6F0047FC0B /* CloudDownloadView.swift */,
-				0CAF9318296399190050812A /* PremiumizeCloudView.swift */,
+				0CB725332C123E760047FC0B /* CloudMagnetView.swift */,
-				0C5FCB04296744F300849E87 /* AllDebridCloudView.swift */,
 			);
 			path = Cloud;
 			sourceTree = "<group>";
@@ -457,6 +468,8 @@
 				0C44E2A728D4DDDC007711AE /* Application.swift */,
 				0C1A3E5529C9488C00DA9730 /* CodableWrapper.swift */,
 				0CD0265629FEFBF900A83D25 /* FerriteKeychain.swift */,
+				0C8AE2472C0FFB6600701675 /* Store.swift */,
+				0C07C6032C1A859B00808A46 /* FormDataBody.swift */,
 			);
 			path = Utils;
 			sourceTree = "<group>";
@@ -464,8 +477,6 @@
 		0C44E2A928D4DFC4007711AE /* Modifiers */ = {
 			isa = PBXGroup;
 			children = (
-				0C70E40128C3CE9C00A5C72D /* ConditionalContextMenu.swift */,
-				0CB6516228C5A57300DCA721 /* ConditionalId.swift */,
 				0CD5E78828CD932B001BF684 /* DisabledAppearance.swift */,
 				0CBAB83528D12ED500AC903E /* DisableInteraction.swift */,
 				0CB6516428C5A5D700DCA721 /* InlinedList.swift */,
@@ -536,6 +547,7 @@
 				0C10848A28BD9A38008F0BA6 /* SettingsAppVersionView.swift */,
 				0C6771FD29B521F1005D38D2 /* SettingsDebridInfoView.swift */,
 				0C5708EA29B8F89300BE07F9 /* SettingsLogView.swift */,
+				0C93DED72CF80101009EA8D2 /* SettingsDebridLinkView.swift */,
 			);
 			path = Settings;
 			sourceTree = "<group>";
@@ -565,9 +577,7 @@
 			children = (
 				0C44E2A928D4DFC4007711AE /* Modifiers */,
 				0CDCB91728C662640098B513 /* EmptyInstructionView.swift */,
-				0CA148C1288903F000DE2211 /* NavView.swift */,
 				0CA3FB1F28B91D9500FA10A8 /* IndeterminateProgressView.swift */,
-				0CB6516928C5B4A600DCA721 /* InlineHeader.swift */,
 				0C32FB562890D1F2002BD219 /* ListRowViews.swift */,
 				0C2D9652299316CC00A504B6 /* Tag.swift */,
 				0C6771FB29B3E0DB005D38D2 /* HybridSecureField.swift */,
@@ -655,6 +665,8 @@
 				0C422E7D293542EA00486D65 /* PremiumizeWrapper.swift */,
 				0CA148D0288903F000DE2211 /* RealDebridWrapper.swift */,
 				0C6771F329B3B4FD005D38D2 /* KodiWrapper.swift */,
+				0C890E482C188808003B17B5 /* TorBoxWrapper.swift */,
+				0C07C6072C1B2F8000808A46 /* OffCloudWrapper.swift */,
 			);
 			path = API;
 			sourceTree = "<group>";
@@ -732,8 +744,8 @@
 				0C4CFC452897030D00AD9FAD /* Regex */,
 				0C7506D628B1AC9A008BEE38 /* SwiftyJSON */,
 				0CDDDE042935235E006810B1 /* BetterSafariView */,
-				0C448BE829A135F100F4E266 /* Introspect-Static */,
 				0C748ED929D9256D0049B8BE /* Yams */,
+				0C7B49FF2CB051550048FA28 /* SwiftUIIntrospect */,
 			);
 			productName = Torrenter;
 			productReference = 0CAF1C68286F5C0E00296F86 /* Ferrite.app */;
@@ -747,7 +759,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1400;
-				LastUpgradeCheck = 1400;
+				LastUpgradeCheck = 1600;
 				TargetAttributes = {
 					0CAF1C67286F5C0E00296F86 = {
 						CreatedOnToolsVersion = 14.0;
@@ -770,8 +782,8 @@
 				0C4CFC442897030D00AD9FAD /* XCRemoteSwiftPackageReference "Regex" */,
 				0C7506D528B1AC9A008BEE38 /* XCRemoteSwiftPackageReference "SwiftyJSON" */,
 				0CDDDE032935235E006810B1 /* XCRemoteSwiftPackageReference "BetterSafariView" */,
-				0C448BE729A135F100F4E266 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */,
 				0C748ED829D9256D0049B8BE /* XCRemoteSwiftPackageReference "Yams" */,
+				0C7B49FE2CB051550048FA28 /* XCRemoteSwiftPackageReference "swiftui-introspect" */,
 			);
 			productRefGroup = 0CAF1C69286F5C0E00296F86 /* Products */;
 			projectDirPath = "";
@@ -823,6 +835,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				0C07C6042C1A859B00808A46 /* FormDataBody.swift in Sources */,
 				0C7ED14328D65518009E29AD /* FileManager.swift in Sources */,
 				0C03EB71296F619900162E9A /* PluginList+CoreDataClass.swift in Sources */,
 				0C6771FA29B3D1AE005D38D2 /* KodiModels.swift in Sources */,
@@ -830,13 +843,11 @@
 				0CB6516528C5A5D700DCA721 /* InlinedList.swift in Sources */,
 				0C8DC35429CE2AB5008A83AD /* SourceSettingsBaseUrlView.swift in Sources */,
 				0C32FB532890D19D002BD219 /* AboutView.swift in Sources */,
-				0CB6516328C5A57300DCA721 /* ConditionalId.swift in Sources */,
 				0C70E40628C40C4E00A5C72D /* NotificationCenter.swift in Sources */,
 				0C84F4832895BFED0074B7C9 /* Source+CoreDataProperties.swift in Sources */,
 				0C2D9653299316CC00A504B6 /* Tag.swift in Sources */,
 				0C84FCE129E4B41D00B0DFE4 /* SourceFilterView.swift in Sources */,
 				0CD5E78928CD932B001BF684 /* DisabledAppearance.swift in Sources */,
-				0CA148DB288903F000DE2211 /* NavView.swift in Sources */,
 				0CA3B23C28C2AA5600616D3A /* Bookmark+CoreDataClass.swift in Sources */,
 				0CD4030A29DA01B6008D9F03 /* PluginInfoMetaView.swift in Sources */,
 				0C750745289B003E004B3906 /* SourceRssParser+CoreDataProperties.swift in Sources */,
@@ -853,17 +864,16 @@
 				0C5005522992B6750064606A /* PluginTagsView.swift in Sources */,
 				0CB0AB5F29BD2A200015422C /* KodiServerView.swift in Sources */,
 				0CF2C0A529D1EBD400E716DD /* UIApplication.swift in Sources */,
-				0C2886D72960C50900D6FC16 /* RealDebridCloudView.swift in Sources */,
 				0C3DD44229B6ACD9006429DB /* KodiServer+CoreDataClass.swift in Sources */,
 				0C794B6B289DACF100DD1CC8 /* PluginCatalogButtonView.swift in Sources */,
 				0C54D36428C5086E00BFEEE2 /* History+CoreDataProperties.swift in Sources */,
 				0CA148E9288903F000DE2211 /* MainView.swift in Sources */,
+				0C8AE2482C0FFB6600701675 /* Store.swift in Sources */,
 				0C3E00D2296F4FD200ECECB2 /* PluginsView.swift in Sources */,
 				0CBC76FD288D914F0054BE44 /* BatchChoiceView.swift in Sources */,
 				0C7D11FE28AA03FE00ED92DB /* View.swift in Sources */,
 				0CD0265729FEFBF900A83D25 /* FerriteKeychain.swift in Sources */,
 				0CA3B23728C2660700616D3A /* HistoryView.swift in Sources */,
-				0C70E40228C3CE9C00A5C72D /* ConditionalContextMenu.swift in Sources */,
 				0C50B7D0299DF63C00A9FA3C /* UIDevice.swift in Sources */,
 				0C0D50E7288DFF850035ECC8 /* PluginAggregateView.swift in Sources */,
 				0CA3B23428C2658700616D3A /* LibraryView.swift in Sources */,
@@ -871,10 +881,10 @@
 				0C44E2A828D4DDDC007711AE /* Application.swift in Sources */,
 				0CC389542970AD900066D06F /* Action+CoreDataProperties.swift in Sources */,
 				0C7ED14128D61BBA009E29AD /* BackupModels.swift in Sources */,
-				0CAF9319296399190050812A /* PremiumizeCloudView.swift in Sources */,
 				0C84FCE529E4B43200B0DFE4 /* SelectedDebridFilterView.swift in Sources */,
 				0CA148EC288903F000DE2211 /* ContentView.swift in Sources */,
 				0CC389532970AD900066D06F /* Action+CoreDataClass.swift in Sources */,
+				0CB725342C123E760047FC0B /* CloudMagnetView.swift in Sources */,
 				0C03EB72296F619900162E9A /* PluginList+CoreDataProperties.swift in Sources */,
 				0C95D8D828A55B03005E22B3 /* DefaultActionPickerView.swift in Sources */,
 				0C44E2AF28D52E8A007711AE /* BackupsView.swift in Sources */,
@@ -890,7 +900,6 @@
 				0CA148DD288903F000DE2211 /* ScrapingViewModel.swift in Sources */,
 				0C445C62293F9A0B0060744D /* Bundle.swift in Sources */,
 				0C0755C6293424A200ECA142 /* DebridLabelView.swift in Sources */,
-				0CB6516A28C5B4A600DCA721 /* InlineHeader.swift in Sources */,
 				0CA148D8288903F000DE2211 /* ActionChoiceView.swift in Sources */,
 				0C41BC6528C2AEB900B47DD6 /* SearchModels.swift in Sources */,
 				0C68135028BC1A2D00FAD890 /* GithubWrapper.swift in Sources */,
@@ -901,7 +910,6 @@
 				0C6C7C9D29315292002DF910 /* AllDebridModels.swift in Sources */,
 				0C6C7C9B2931521B002DF910 /* AllDebridWrapper.swift in Sources */,
 				0C68135228BC1A7C00FAD890 /* GithubModels.swift in Sources */,
-				0C5FCB05296744F300849E87 /* AllDebridCloudView.swift in Sources */,
 				0CA3B23928C2660D00616D3A /* BookmarksView.swift in Sources */,
 				0C79DC072899AF3C003F1C5A /* SourceSeedLeech+CoreDataClass.swift in Sources */,
 				0CA148E6288903F000DE2211 /* WebView.swift in Sources */,
@@ -922,17 +930,22 @@
 				0C84FCE929E5ADEF00B0DFE4 /* FilterAmountLabelView.swift in Sources */,
 				0C10848B28BD9A38008F0BA6 /* SettingsAppVersionView.swift in Sources */,
 				0CA05457288EE58200850554 /* SettingsPluginListView.swift in Sources */,
+				0C07C6062C1B2F7600808A46 /* OffCloudModels.swift in Sources */,
 				0C78041D28BFB3EA001E8CA3 /* String.swift in Sources */,
 				0C31133C28B1ABFA004DCB0D /* SourceJsonParser+CoreDataClass.swift in Sources */,
 				0CBC76FF288DAAD00054BE44 /* NavigationViewModel.swift in Sources */,
 				0C50055B2992BA6A0064606A /* PluginTag+CoreDataProperties.swift in Sources */,
 				0C7075E629D3845D0093DB2D /* ShareSheet.swift in Sources */,
 				0C871BDF29994D9D005279AC /* FilterLabelView.swift in Sources */,
+				0CEE11B12C1743E0004C8BB2 /* SourceRequest+CoreDataClass.swift in Sources */,
+				0CEE11B22C1743E0004C8BB2 /* SourceRequest+CoreDataProperties.swift in Sources */,
 				0CC2CA7429E24F63000A8585 /* ExpandedSearchable.swift in Sources */,
+				0C07C6082C1B2F8000808A46 /* OffCloudWrapper.swift in Sources */,
 				0CF1ABE22C0C3D2F009F6C26 /* DebridModels.swift in Sources */,
 				0C6771F429B3B4FD005D38D2 /* KodiWrapper.swift in Sources */,
 				0C3E00D0296F4DB200ECECB2 /* ActionModels.swift in Sources */,
 				0C44E2AD28D51C63007711AE /* BackupManager.swift in Sources */,
+				0C890E4B2C188FA7003B17B5 /* TorBoxModels.swift in Sources */,
 				0C7075E429D374C50093DB2D /* Color.swift in Sources */,
 				0C8DC35229CE287E008A83AD /* PluginInfoView.swift in Sources */,
 				0C422E80293542F300486D65 /* PremiumizeModels.swift in Sources */,
@@ -949,12 +962,15 @@
 				0CE1C4182981E8D700418F20 /* Plugin.swift in Sources */,
 				0CEC8AB2299B3B57007BFE8F /* LibraryPickerView.swift in Sources */,
 				0C6771F629B3B602005D38D2 /* SettingsKodiView.swift in Sources */,
+				0C890E492C188808003B17B5 /* TorBoxWrapper.swift in Sources */,
 				0CF1ABDC2C0C04B2009F6C26 /* Debrid.swift in Sources */,
 				0C84F4842895BFED0074B7C9 /* SourceHtmlParser+CoreDataClass.swift in Sources */,
 				0C32FB572890D1F2002BD219 /* ListRowViews.swift in Sources */,
 				0CEC8AAE299B31B6007BFE8F /* SearchFilterHeaderView.swift in Sources */,
 				0C84F4822895BFED0074B7C9 /* Source+CoreDataClass.swift in Sources */,
+				0C93DED82CF80101009EA8D2 /* SettingsDebridLinkView.swift in Sources */,
 				0C3DD43F29B6968D006429DB /* KodiEditorView.swift in Sources */,
+				0CB725322C123E6F0047FC0B /* CloudDownloadView.swift in Sources */,
 				0C3DD44329B6ACD9006429DB /* KodiServer+CoreDataProperties.swift in Sources */,
 				0C7C128628DAA3CD00381CD1 /* URL.swift in Sources */,
 				0C84F4852895BFED0074B7C9 /* SourceHtmlParser+CoreDataProperties.swift in Sources */,
@@ -972,6 +988,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
@@ -1004,6 +1021,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1025,6 +1043,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_STRICT_CONCURRENCY = minimal;
 			};
 			name = Debug;
 		};
@@ -1032,6 +1051,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
@@ -1064,6 +1084,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1078,6 +1099,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_STRICT_CONCURRENCY = minimal;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -1088,10 +1110,11 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_ASSET_PATHS = "\"Ferrite/Preview Content\"";
 				DEVELOPMENT_TEAM = 8A74DBQ6S3;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Ferrite/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Ferrite;
@@ -1102,12 +1125,12 @@
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportsDocumentBrowser = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.7.0;
+				MARKETING_VERSION = 0.7.3;
 				PRODUCT_BUNDLE_IDENTIFIER = me.kingbri.Ferrite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1123,10 +1146,11 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_ASSET_PATHS = "\"Ferrite/Preview Content\"";
 				DEVELOPMENT_TEAM = 8A74DBQ6S3;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Ferrite/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Ferrite;
@@ -1137,12 +1161,12 @@
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportsDocumentBrowser = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.7.0;
+				MARKETING_VERSION = 0.7.3;
 				PRODUCT_BUNDLE_IDENTIFIER = me.kingbri.Ferrite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1176,14 +1200,6 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		0C448BE729A135F100F4E266 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/siteline/SwiftUI-Introspect/";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 0.2.3;
-			};
-		};
 		0C4CFC442897030D00AD9FAD /* XCRemoteSwiftPackageReference "Regex" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/sindresorhus/Regex";
@@ -1224,6 +1240,14 @@
 				kind = branch;
 			};
 		};
+		0C7B49FE2CB051550048FA28 /* XCRemoteSwiftPackageReference "swiftui-introspect" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/siteline/swiftui-introspect";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.3.0;
+			};
+		};
 		0CAF1C79286F5C8600296F86 /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/scinfu/SwiftSoup.git";
@@ -1243,11 +1267,6 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		0C448BE829A135F100F4E266 /* Introspect-Static */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 0C448BE729A135F100F4E266 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */;
-			productName = "Introspect-Static";
-		};
 		0C4CFC452897030D00AD9FAD /* Regex */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 0C4CFC442897030D00AD9FAD /* XCRemoteSwiftPackageReference "Regex" */;
@@ -1273,6 +1292,11 @@
 			package = 0C7506D528B1AC9A008BEE38 /* XCRemoteSwiftPackageReference "SwiftyJSON" */;
 			productName = SwiftyJSON;
 		};
+		0C7B49FF2CB051550048FA28 /* SwiftUIIntrospect */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 0C7B49FE2CB051550048FA28 /* XCRemoteSwiftPackageReference "swiftui-introspect" */;
+			productName = SwiftUIIntrospect;
+		};
 		0CAF1C7A286F5C8600296F86 /* SwiftSoup */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 0CAF1C79286F5C8600296F86 /* XCRemoteSwiftPackageReference "SwiftSoup" */;

Ferrite.xcodeproj/xcshareddata/xcschemes/Ferrite.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Ferrite/API/AllDebridWrapper.swift

@@ -7,22 +7,55 @@
 
 import Foundation
 
-// TODO: Fix errors
+class AllDebrid: PollingDebridSource, ObservableObject {
-public class AllDebrid: PollingDebridSource {
+    let id = "AllDebrid"
-    public let id = "AllDebrid"
+    let abbreviation = "AD"
-    public let abbreviation = "AD"
+    let website = "https://alldebrid.com"
-    public let website = "https://alldebrid.com"
+    let description: String? = "AllDebrid is a debrid service that is used for downloads and media playback. " +
-    public var authTask: Task<Void, Error>?
+        "You must pay to access this service. \n\n" +
+        "It is not recommended to use this service since media cache checks are not possible via the API. " +
+        "Ferrite's instant availability solely looks at a user's magnet library. \n\n" +
+        "If you must use this service, it is recommended to download search results manually using the context menu. \n\n" +
+        "This service does not inform if a magnet link is a batch before downloading."
 
-    let baseApiUrl = "https://api.alldebrid.com/v4"
+    let cachedStatus: [String] = ["Ready"]
-    let appName = "Ferrite"
+    var authTask: Task<Void, Error>?
 
-    let jsonDecoder = JSONDecoder()
+    @Published var authProcessing: Bool = false
+    var isLoggedIn: Bool {
+        getToken() != nil
+    }
+
+    var manualToken: String? {
+        if UserDefaults.standard.bool(forKey: "AllDebrid.UseManualKey") {
+            return getToken()
+        } else {
+            return nil
+        }
+    }
+
+    @Published var IAValues: [DebridIA] = []
+    @Published var cloudDownloads: [DebridCloudDownload] = []
+    @Published var cloudMagnets: [DebridCloudMagnet] = []
+    var cloudTTL: Double = 0.0
+
+    private let baseApiUrl = "https://api.alldebrid.com/v4"
+    private let appName = "Ferrite"
+
+    private let jsonDecoder = JSONDecoder()
+
+    init() {
+        // Populate user downloads and magnets
+        Task {
+            try? await getUserDownloads()
+            try? await getUserMagnets()
+        }
+    }
 
     // MARK: - Auth
 
     // Fetches information for PIN auth
-    public func getAuthUrl() async throws -> URL {
+    func getAuthUrl() async throws -> URL {
         let url = try buildRequestURL(urlString: "\(baseApiUrl)/pin/get")
         let request = URLRequest(url: url)
 
@@ -32,7 +65,7 @@ public class AllDebrid: PollingDebridSource {
             // Validate the URL before doing anything else
             let rawResponse = try jsonDecoder.decode(ADResponse<PinResponse>.self, from: data).data
             guard let userUrl = URL(string: rawResponse.userURL) else {
-                throw ADError.AuthQuery(description: "The login URL is invalid")
+                throw DebridError.AuthQuery(description: "The login URL is invalid")
             }
 
             // Spawn the polling task separately
@@ -43,19 +76,19 @@ public class AllDebrid: PollingDebridSource {
             return userUrl
         } catch {
             print("Couldn't get pin information!")
-            throw ADError.AuthQuery(description: error.localizedDescription)
+            throw DebridError.AuthQuery(description: error.localizedDescription)
         }
     }
 
     // Fetches API keys
-    public func getApiKey(checkID: String, pin: String) async throws {
+    func getApiKey(checkID: String, pin: String) async throws {
         let queryItems = [
             URLQueryItem(name: "agent", value: appName),
             URLQueryItem(name: "check", value: checkID),
             URLQueryItem(name: "pin", value: pin)
         ]
 
-        let request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/pin/check", queryItems: queryItems))
+        let request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/pin/check", queryItems: queryItems))
 
         // Timer to poll AD API for key
         authTask = Task {
@@ -63,7 +96,7 @@ public class AllDebrid: PollingDebridSource {
 
             while count < 12 {
                 if Task.isCancelled {
-                    throw ADError.AuthQuery(description: "Token request cancelled.")
+                    throw DebridError.AuthQuery(description: "Token request cancelled.")
                 }
 
                 let (data, _) = try await URLSession.shared.data(for: request)
@@ -82,7 +115,7 @@ public class AllDebrid: PollingDebridSource {
                 }
             }
 
-            throw ADError.AuthQuery(description: "Could not fetch the client ID and secret in time. Try logging in again.")
+            throw DebridError.AuthQuery(description: "Could not fetch the client ID and secret in time. Try logging in again.")
         }
 
         if case let .failure(error) = await authTask?.result {
@@ -91,19 +124,17 @@ public class AllDebrid: PollingDebridSource {
     }
 
     // Adds a manual API key instead of web auth
-    public func setApiKey(_ key: String) -> Bool {
+    func setApiKey(_ key: String) {
         FerriteKeychain.shared.set(key, forKey: "AllDebrid.ApiKey")
         UserDefaults.standard.set(true, forKey: "AllDebrid.UseManualKey")
-
-        return FerriteKeychain.shared.get("AllDebrid.ApiKey") == key
     }
 
-    public func getToken() -> String? {
+    func getToken() -> String? {
         FerriteKeychain.shared.get("AllDebrid.ApiKey")
     }
 
     // Clears tokens. No endpoint to deregister a device
-    public func logout() {
+    func logout() {
         FerriteKeychain.shared.delete("AllDebrid.ApiKey")
         UserDefaults.standard.removeObject(forKey: "AllDebrid.UseManualKey")
     }
@@ -113,7 +144,7 @@ public class AllDebrid: PollingDebridSource {
     // Wrapper request function which matches the responses and returns data
     @discardableResult private func performRequest(request: inout URLRequest, requestName: String) async throws -> Data {
         guard let token = getToken() else {
-            throw ADError.InvalidToken
+            throw DebridError.InvalidToken
         }
 
         request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
@@ -121,23 +152,22 @@ public class AllDebrid: PollingDebridSource {
         let (data, response) = try await URLSession.shared.data(for: request)
 
         guard let response = response as? HTTPURLResponse else {
-            throw ADError.FailedRequest(description: "No HTTP response given")
+            throw DebridError.FailedRequest(description: "No HTTP response given")
         }
 
         if response.statusCode >= 200, response.statusCode <= 299 {
             return data
         } else if response.statusCode == 401 {
-            logout()
+            throw DebridError.FailedRequest(description: "The request \(requestName) failed because you were unauthorized. Please relogin to AllDebrid in Settings.")
-            throw ADError.FailedRequest(description: "The request \(requestName) failed because you were unauthorized. Please relogin to AllDebrid in Settings.")
         } else {
-            throw ADError.FailedRequest(description: "The request \(requestName) failed with status code \(response.statusCode).")
+            throw DebridError.FailedRequest(description: "The request \(requestName) failed with status code \(response.statusCode).")
         }
     }
 
     // Builds a URL for further requests
-    private func buildRequestURL(urlString: String, queryItems: [URLQueryItem] = []) throws -> URL {
+    func buildRequestURL(urlString: String, queryItems: [URLQueryItem] = []) throws -> URL {
         guard var components = URLComponents(string: urlString) else {
-            throw ADError.InvalidUrl
+            throw DebridError.InvalidUrl
         }
 
         components.queryItems = [
@@ -147,60 +177,104 @@ public class AllDebrid: PollingDebridSource {
         if let url = components.url {
             return url
         } else {
-            throw ADError.InvalidUrl
+            throw DebridError.InvalidUrl
         }
     }
 
     // MARK: - Instant availability
 
-    public func instantAvailability(magnets: [Magnet]) async throws -> [DebridIA] {
+    func instantAvailability(magnets: [Magnet]) async throws {
-        let queryItems = magnets.map { URLQueryItem(name: "magnets[]", value: $0.hash) }
+        let now = Date().timeIntervalSince1970
-        var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/magnet/instant", queryItems: queryItems))
 
-        let data = try await performRequest(request: &request, requestName: #function)
+        let sendMagnets = magnets.filter { magnet in
-        let rawResponse = try jsonDecoder.decode(ADResponse<InstantAvailabilityResponse>.self, from: data).data
+            if let IAIndex = IAValues.firstIndex(where: { $0.magnet.hash == magnet.hash }) {
-
+                if now > IAValues[IAIndex].expiryTimeStamp {
-        let filteredMagnets = rawResponse.magnets.filter { $0.instant == true && $0.files != nil }
+                    IAValues.remove(at: IAIndex)
-        let availableHashes = filteredMagnets.map { magnetResp in
+                    return true
-            // Force unwrap is OK here since the filter caught any nil values
+                } else {
-            let files = magnetResp.files!.enumerated().map { index, magnetFile in
+                    return false
-                DebridIAFile(fileId: index, name: magnetFile.name)
+                }
+            } else {
+                return true
             }
-
-            return DebridIA(
-                magnet: Magnet(hash: magnetResp.hash, link: magnetResp.magnet),
-                source: self.id,
-                expiryTimeStamp: Date().timeIntervalSince1970 + 300,
-                files: files
-            )
         }
 
-        return availableHashes
+        // Fetch the user magnets to the latest version
+        try await getUserMagnets()
+
+        for cloudMagnet in cloudMagnets {
+            if cachedStatus.contains(cloudMagnet.status),
+               sendMagnets.contains(where: { $0.hash == cloudMagnet.hash })
+            {
+                IAValues.append(
+                    DebridIA(
+                        magnet: Magnet(hash: cloudMagnet.hash, link: nil),
+                        expiryTimeStamp: Date().timeIntervalSince1970 + 300,
+                        files: []
+                    )
+                )
+            }
+        }
     }
 
     // MARK: - Downloading
 
     // Wrapper function to fetch a download link from the API
-    public func getDownloadLink(magnet: Magnet, ia: DebridIA?, iaFile: DebridIAFile?) async throws -> String {
+    func getRestrictedFile(magnet: Magnet, ia: DebridIA?, iaFile: DebridIAFile?) async throws -> (restrictedFile: DebridIAFile?, newIA: DebridIA?) {
-        let magnetID = try await addMagnet(magnet: magnet)
+        let selectedMagnetId: String
-        let lockedLink = try await fetchMagnetStatus(
+
-            magnetId: magnetID,
+        if let existingMagnet = cloudMagnets.first(where: {
-            selectedIndex: iaFile?.fileId ?? 0
+            $0.hash == magnet.hash && cachedStatus.contains($0.status)
+        }) {
+            selectedMagnetId = existingMagnet.id
+        } else {
+            let magnetId = try await addMagnet(magnet: magnet)
+            selectedMagnetId = String(magnetId)
+        }
+
+        let rawResponse = try await fetchMagnetStatus(
+            magnetId: selectedMagnetId,
+            selectedIndex: iaFile?.id ?? 0
         )
+        guard let magnets = rawResponse.magnets[safe: 0] else {
+            throw DebridError.EmptyUserMagnets
+        }
 
-        try await saveLink(link: lockedLink)
+        // Batches require an unrestrict from the user
-        let downloadUrl = try await unlockLink(lockedLink: lockedLink)
+        if magnets.links.count > 1, iaFile == nil {
+            var copiedIA = ia
 
-        return downloadUrl
+            copiedIA?.files = magnets.links.enumerated().compactMap { index, file in
+                DebridIAFile(
+                    id: index,
+                    name: file.filename,
+                    streamUrlString: file.link
+                )
+            }
+
+            return (nil, copiedIA)
+        }
+
+        if let cloudMagnetFile = magnets.links[safe: iaFile?.id ?? 0] {
+            let restrictedFile = DebridIAFile(
+                id: 0,
+                name: cloudMagnetFile.filename,
+                streamUrlString: cloudMagnetFile.link
+            )
+
+            return (restrictedFile, nil)
+        } else {
+            throw DebridError.EmptyUserMagnets
+        }
     }
 
     // Adds a magnet link to the user's AD account
-    public func addMagnet(magnet: Magnet) async throws -> Int {
+    func addMagnet(magnet: Magnet) async throws -> Int {
         guard let magnetLink = magnet.link else {
-            throw ADError.FailedRequest(description: "The magnet link is invalid")
+            throw DebridError.FailedRequest(description: "The magnet link is invalid")
         }
 
-        var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/magnet/upload"))
+        var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/magnet/upload"))
         request.httpMethod = "POST"
         request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
 
@@ -215,112 +289,107 @@ public class AllDebrid: PollingDebridSource {
         let rawResponse = try jsonDecoder.decode(ADResponse<AddMagnetResponse>.self, from: data).data
 
         if let magnet = rawResponse.magnets[safe: 0] {
+            if !magnet.ready {
+                throw DebridError.IsCaching
+            }
+
             return magnet.id
         } else {
-            throw ADError.InvalidResponse
+            throw DebridError.InvalidResponse
         }
     }
 
-    public func fetchMagnetStatus(magnetId: Int, selectedIndex: Int?) async throws -> String {
+    func fetchMagnetStatus(magnetId: String, selectedIndex: Int?) async throws -> MagnetStatusResponse {
         let queryItems = [
-            URLQueryItem(name: "id", value: String(magnetId))
+            URLQueryItem(name: "id", value: magnetId)
         ]
-        var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/magnet/status", queryItems: queryItems))
+        var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/magnet/status", queryItems: queryItems))
 
         let data = try await performRequest(request: &request, requestName: #function)
         let rawResponse = try jsonDecoder.decode(ADResponse<MagnetStatusResponse>.self, from: data).data
 
-        // Better to fetch no link at all than the wrong link
+        return rawResponse
-        if let linkWrapper = rawResponse.magnets[safe: 0]?.links[safe: selectedIndex ?? -1] {
-            return linkWrapper.link
-        } else {
-            throw ADError.EmptyTorrents
-        }
     }
 
-    public func unlockLink(lockedLink: String) async throws -> String {
+    // Known as unlockLink in AD's API
+    func unrestrictFile(_ restrictedFile: DebridIAFile) async throws -> String {
         let queryItems = [
-            URLQueryItem(name: "link", value: lockedLink)
+            URLQueryItem(name: "link", value: restrictedFile.streamUrlString)
         ]
-        var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/link/unlock", queryItems: queryItems))
+        var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/link/unlock", queryItems: queryItems))
 
-        let data = try await performRequest(request: &request, requestName: #function)
+        let data = try await performRequest(request: &request, requestName: "unlockLink")
         let rawResponse = try jsonDecoder.decode(ADResponse<UnlockLinkResponse>.self, from: data).data
 
         return rawResponse.link
     }
 
-    public func saveLink(link: String) async throws {
+    func saveLink(link: String) async throws {
         let queryItems = [
             URLQueryItem(name: "links[]", value: link)
         ]
-        var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/user/links/save", queryItems: queryItems))
+        var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/user/links/save", queryItems: queryItems))
 
         try await performRequest(request: &request, requestName: #function)
     }
 
     // MARK: - Cloud methods
 
-    // Referred to as "User magnets" in AllDebrid's API
+    func getUserMagnets() async throws {
-    public func getUserTorrents() async throws -> [DebridCloudTorrent] {
+        var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/magnet/status"))
-        var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/magnet/status"))
 
         let data = try await performRequest(request: &request, requestName: #function)
         let rawResponse = try jsonDecoder.decode(ADResponse<MagnetStatusResponse>.self, from: data).data
 
-        if rawResponse.magnets.isEmpty {
+        cloudMagnets = rawResponse.magnets.map { magnetResponse in
-            throw ADError.EmptyData
+            DebridCloudMagnet(
-        }
+                id: String(magnetResponse.id),
-
-        let torrents = rawResponse.magnets.map { magnetResponse in
-            DebridCloudTorrent(
-                torrentId: String(magnetResponse.id),
-                source: self.id,
                 fileName: magnetResponse.filename,
                 status: magnetResponse.status,
                 hash: magnetResponse.hash,
                 links: magnetResponse.links.map(\.link)
             )
         }
-
-        return torrents
     }
 
-    public func deleteTorrent(torrentId: String) async throws {
+    func deleteUserMagnet(cloudMagnetId: String?) async throws {
+        guard let cloudMagnetId else {
+            throw DebridError.FailedRequest(description: "The cloud magnetID \(String(describing: cloudMagnetId)) is invalid")
+        }
+
         let queryItems = [
-            URLQueryItem(name: "id", value: torrentId)
+            URLQueryItem(name: "id", value: cloudMagnetId)
         ]
-        var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/magnet/delete", queryItems: queryItems))
+        var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/magnet/delete", queryItems: queryItems))
 
         try await performRequest(request: &request, requestName: #function)
     }
 
-    public func getUserDownloads() async throws -> [DebridCloudDownload] {
+    func getUserDownloads() async throws {
-        var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/user/links"))
+        var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/user/links"))
 
         let data = try await performRequest(request: &request, requestName: #function)
         let rawResponse = try jsonDecoder.decode(ADResponse<SavedLinksResponse>.self, from: data).data
 
-        if rawResponse.links.isEmpty {
-            throw ADError.EmptyData
-        }
-
         // The link is also the ID
-        let downloads = rawResponse.links.map { link in
+        cloudDownloads = rawResponse.links.map { link in
             DebridCloudDownload(
-                downloadId: link.link, source: self.id, fileName: link.filename, link: link.link
+                id: link.link, fileName: link.filename, link: link.link
             )
         }
+    }
 
-        return downloads
+    // Not used
+    func checkUserDownloads(link: String) -> String? {
+        link
     }
 
     // The downloadId is actually the download link
-    public func deleteDownload(downloadId: String) async throws {
+    func deleteUserDownload(downloadId: String) async throws {
         let queryItems = [
             URLQueryItem(name: "link", value: downloadId)
         ]
-        var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/user/links/delete", queryItems: queryItems))
+        var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/user/links/delete", queryItems: queryItems))
 
         try await performRequest(request: &request, requestName: #function)
     }

Ferrite/API/GithubWrapper.swift

@@ -7,8 +7,8 @@
 
 import Foundation
 
-public class Github {
+class Github {
-    public func fetchLatestRelease() async throws -> Release? {
+    func fetchLatestRelease() async throws -> Release? {
         let url = URL(string: "https://api.github.com/repos/Ferrite-iOS/Ferrite/releases/latest")!
 
         let (data, _) = try await URLSession.shared.data(from: url)
@@ -17,7 +17,7 @@ public class Github {
         return rawResponse
     }
 
-    public func fetchReleases() async throws -> [Release]? {
+    func fetchReleases() async throws -> [Release]? {
         let url = URL(string: "https://api.github.com/repos/Ferrite-iOS/Ferrite/releases")!
 
         let (data, _) = try await URLSession.shared.data(from: url)

Ferrite/API/KodiWrapper.swift

@@ -7,15 +7,15 @@
 
 import Foundation
 
-public class Kodi {
+class Kodi {
-    let encoder = JSONEncoder()
+    private let encoder = JSONEncoder()
 
     // Used to add server to CoreData. Not part of API
-    public func addServer(urlString: String,
+    func addServer(urlString: String,
-                          friendlyName: String?,
+                   friendlyName: String?,
-                          username: String?,
+                   username: String?,
-                          password: String?,
+                   password: String?,
-                          existingServer: KodiServer? = nil) throws
+                   existingServer: KodiServer? = nil) throws
     {
         let backgroundContext = PersistenceController.shared.backgroundContext
 
@@ -65,7 +65,7 @@ public class Kodi {
         try backgroundContext.save()
     }
 
-    public func ping(server: KodiServer) async throws {
+    func ping(server: KodiServer) async throws {
         var request = URLRequest(url: URL(string: "\(server.urlString)/jsonrpc")!)
         request.httpMethod = "POST"
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
@@ -94,7 +94,7 @@ public class Kodi {
         }
     }
 
-    public func sendVideoUrl(urlString: String, server: KodiServer) async throws {
+    func sendVideoUrl(urlString: String, server: KodiServer) async throws {
         if URL(string: urlString) == nil {
             throw KodiError.InvalidPlaybackUrl
         }

Ferrite/API/OffCloudWrapper.swift

@@ -0,0 +1,277 @@
+//
+//  OffCloudWrapper.swift
+//  Ferrite
+//
+//  Created by Brian Dashore on 6/12/24.
+//
+
+import Foundation
+
+class OffCloud: DebridSource, ObservableObject {
+    let id = "OffCloud"
+    let abbreviation = "OC"
+    let website = "https://offcloud.com"
+    let description: String? = "OffCloud is a debrid service that is used for downloads and media playback. " +
+        "You must pay to access this service. \n\n" +
+        "This service does not inform if a magnet link is a batch before downloading."
+    let cachedStatus: [String] = ["downloaded"]
+
+    @Published var authProcessing: Bool = false
+    var isLoggedIn: Bool {
+        getToken() != nil
+    }
+
+    var manualToken: String? {
+        if UserDefaults.standard.bool(forKey: "OffCloud.UseManualKey") {
+            return getToken()
+        } else {
+            return nil
+        }
+    }
+
+    @Published var IAValues: [DebridIA] = []
+    @Published var cloudDownloads: [DebridCloudDownload] = []
+    @Published var cloudMagnets: [DebridCloudMagnet] = []
+    var cloudTTL: Double = 0.0
+
+    private let baseApiUrl = "https://offcloud.com/api"
+    private let jsonDecoder = JSONDecoder()
+    private let jsonEncoder = JSONEncoder()
+
+    init() {
+        // Populate user downloads and magnets
+        Task {
+            try? await getUserMagnets()
+        }
+    }
+
+    func setApiKey(_ key: String) {
+        FerriteKeychain.shared.set(key, forKey: "OffCloud.ApiKey")
+        UserDefaults.standard.set(true, forKey: "OffCloud.UseManualKey")
+    }
+
+    func logout() async {
+        FerriteKeychain.shared.delete("OffCloud.ApiKey")
+        UserDefaults.standard.removeObject(forKey: "OffCloud.UseManualKey")
+    }
+
+    private func getToken() -> String? {
+        FerriteKeychain.shared.get("OffCloud.ApiKey")
+    }
+
+    // Wrapper request function which matches the responses and returns data
+    @discardableResult private func performRequest(request: inout URLRequest, requestName: String) async throws -> Data {
+        let (data, response) = try await URLSession.shared.data(for: request)
+
+        guard let response = response as? HTTPURLResponse else {
+            throw DebridError.FailedRequest(description: "No HTTP response given")
+        }
+
+        if response.statusCode >= 200, response.statusCode <= 299 {
+            return data
+        } else if response.statusCode == 401 {
+            throw DebridError.FailedRequest(description: "The request \(requestName) failed because you were unauthorized. Please relogin to TorBox in Settings.")
+        } else {
+            print(response)
+            throw DebridError.FailedRequest(description: "The request \(requestName) failed with status code \(response.statusCode).")
+        }
+    }
+
+    // Builds a URL for further requests
+    private func buildRequestURL(urlString: String, queryItems: [URLQueryItem] = []) throws -> URL {
+        guard var components = URLComponents(string: urlString) else {
+            throw DebridError.InvalidUrl
+        }
+
+        guard let token = getToken() else {
+            throw DebridError.InvalidToken
+        }
+
+        components.queryItems = [
+            URLQueryItem(name: "key", value: token)
+        ] + queryItems
+
+        if let url = components.url {
+            return url
+        } else {
+            throw DebridError.InvalidUrl
+        }
+    }
+
+    func instantAvailability(magnets: [Magnet]) async throws {
+        let now = Date().timeIntervalSince1970
+
+        let sendMagnets = magnets.filter { magnet in
+            if let IAIndex = IAValues.firstIndex(where: { $0.magnet.hash == magnet.hash }) {
+                if now > IAValues[IAIndex].expiryTimeStamp {
+                    IAValues.remove(at: IAIndex)
+                    return true
+                } else {
+                    return false
+                }
+            } else {
+                return true
+            }
+        }
+
+        if sendMagnets.isEmpty {
+            return
+        }
+
+        var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/cache"))
+        request.httpMethod = "POST"
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+
+        let body = InstantAvailabilityRequest(hashes: sendMagnets.compactMap(\.hash))
+        request.httpBody = try jsonEncoder.encode(body)
+
+        let data = try await performRequest(request: &request, requestName: #function)
+        let rawResponse = try jsonDecoder.decode(InstantAvailabilityResponse.self, from: data)
+
+        let availableHashes = rawResponse.cachedItems.map {
+            DebridIA(
+                magnet: Magnet(hash: $0, link: nil),
+                expiryTimeStamp: Date().timeIntervalSince1970 + 300,
+                files: []
+            )
+        }
+
+        IAValues += availableHashes
+    }
+
+    // Cloud in OffCloud's API
+    func getRestrictedFile(magnet: Magnet, ia: DebridIA?, iaFile: DebridIAFile?) async throws -> (restrictedFile: DebridIAFile?, newIA: DebridIA?) {
+        let selectedCloudMagnet: DebridCloudMagnet
+
+        // Don't queue a new job if the magnet already exists in the user's account
+        if let existingCloudMagnet = cloudMagnets.first(where: { $0.hash == magnet.hash && cachedStatus.contains($0.status) }) {
+            selectedCloudMagnet = existingCloudMagnet
+        } else {
+            let cloudDownloadResponse = try await offcloudDownload(magnet: magnet)
+
+            guard cachedStatus.contains(cloudDownloadResponse.status) else {
+                throw DebridError.IsCaching
+            }
+
+            selectedCloudMagnet = DebridCloudMagnet(
+                id: cloudDownloadResponse.requestId,
+                fileName: cloudDownloadResponse.fileName,
+                status: cloudDownloadResponse.status,
+                hash: "",
+                links: [cloudDownloadResponse.url]
+            )
+        }
+
+        let cloudExploreResponse = try await cloudExplore(requestId: selectedCloudMagnet.id)
+
+        // Request will error if the file isn't a batch
+        if case let .links(cloudExploreLinks) = cloudExploreResponse {
+            var copiedIA = ia
+
+            copiedIA?.files = cloudExploreLinks.enumerated().compactMap { index, exploreLink in
+                guard let exploreURL = URL(string: exploreLink) else {
+                    return nil
+                }
+
+                return DebridIAFile(
+                    id: index,
+                    name: exploreURL.lastPathComponent,
+                    streamUrlString: exploreLink.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)
+                )
+            }
+
+            return (nil, copiedIA)
+        } else if case let .error(cloudExploreError) = cloudExploreResponse,
+                  cloudExploreError.error.lowercased() == "bad archive"
+        {
+            guard let selectedCloudLink = selectedCloudMagnet.links[safe: 0] else {
+                throw DebridError.EmptyUserMagnets
+            }
+
+            let restrictedFile = DebridIAFile(
+                id: 0,
+                name: selectedCloudMagnet.fileName,
+                streamUrlString: "\(selectedCloudLink)/\(selectedCloudMagnet.fileName)"
+            )
+
+            return (restrictedFile, nil)
+        } else {
+            return (nil, nil)
+        }
+    }
+
+    // Called as "cloud" in offcloud's API
+    private func offcloudDownload(magnet: Magnet) async throws -> CloudDownloadResponse {
+        var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/cloud"))
+        request.httpMethod = "POST"
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+
+        guard let magnetLink = magnet.link else {
+            throw DebridError.EmptyData
+        }
+
+        let body = CloudDownloadRequest(url: magnetLink)
+        request.httpBody = try jsonEncoder.encode(body)
+
+        let data = try await performRequest(request: &request, requestName: "cloud")
+        let rawResponse = try jsonDecoder.decode(CloudDownloadResponse.self, from: data)
+
+        return rawResponse
+    }
+
+    private func cloudExplore(requestId: String) async throws -> CloudExploreResponse {
+        var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/cloud/explore/\(requestId)"))
+
+        let data = try await performRequest(request: &request, requestName: "cloudExplore")
+        let rawResponse = try jsonDecoder.decode(CloudExploreResponse.self, from: data)
+
+        return rawResponse
+    }
+
+    func unrestrictFile(_ restrictedFile: DebridIAFile) async throws -> String {
+        guard let streamUrlString = restrictedFile.streamUrlString else {
+            throw DebridError.FailedRequest(description: "Could not get a streaming URL from the OffCloud API")
+        }
+
+        return streamUrlString
+    }
+
+    func getUserDownloads() {}
+
+    func checkUserDownloads(link: String) -> String? {
+        link
+    }
+
+    func deleteUserDownload(downloadId: String) {}
+
+    func getUserMagnets() async throws {
+        var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/cloud/history"))
+
+        let data = try await performRequest(request: &request, requestName: "cloudHistory")
+        let rawResponse = try jsonDecoder.decode([CloudHistoryResponse].self, from: data)
+
+        cloudMagnets = rawResponse.compactMap { cloudHistory in
+            guard let magnetHash = Magnet(hash: nil, link: cloudHistory.originalLink).hash else {
+                return nil
+            }
+
+            return DebridCloudMagnet(
+                id: cloudHistory.requestId,
+                fileName: cloudHistory.fileName,
+                status: cloudHistory.status,
+                hash: magnetHash,
+                links: [cloudHistory.originalLink]
+            )
+        }
+    }
+
+    // Uses the base website because this isn't present in the API path but still works like the API?
+    func deleteUserMagnet(cloudMagnetId: String?) async throws {
+        guard let cloudMagnetId else {
+            throw DebridError.InvalidPostBody
+        }
+
+        var request = try URLRequest(url: buildRequestURL(urlString: "\(website)/cloud/remove/\(cloudMagnetId)"))
+        try await performRequest(request: &request, requestName: "cloudRemove")
+    }
+}

Ferrite/API/PremiumizeWrapper.swift

@@ -7,20 +7,47 @@
 
 import Foundation
 
-public class Premiumize: OAuthDebridSource {
+class Premiumize: OAuthDebridSource, ObservableObject {
-    public let id = "Premiumize"
+    let id = "Premiumize"
-    public let abbreviation = "PM"
+    let abbreviation = "PM"
-    public let website = "https://premiumize.me"
+    let website = "https://premiumize.me"
+    let description: String? = "Premiumize is a debrid service that is used for downloads and media playback with seeding. " +
+        "You must pay to access the service."
 
-    let baseAuthUrl = "https://www.premiumize.me/authorize"
+    @Published var authProcessing: Bool = false
-    let baseApiUrl = "https://www.premiumize.me/api"
+    var isLoggedIn: Bool {
-    let clientId = "791565696"
+        getToken() != nil
+    }
 
-    let jsonDecoder = JSONDecoder()
+    var manualToken: String? {
+        if UserDefaults.standard.bool(forKey: "Premiumize.UseManualKey") {
+            return getToken()
+        } else {
+            return nil
+        }
+    }
+
+    @Published var IAValues: [DebridIA] = []
+    @Published var cloudDownloads: [DebridCloudDownload] = []
+    @Published var cloudMagnets: [DebridCloudMagnet] = []
+    var cloudTTL: Double = 0.0
+
+    private let baseAuthUrl = "https://www.premiumize.me/authorize"
+    private let baseApiUrl = "https://www.premiumize.me/api"
+    private let clientId = "791565696"
+
+    private let jsonDecoder = JSONDecoder()
+
+    init() {
+        // Populate user downloads and magnets
+        Task {
+            try? await getUserDownloads()
+        }
+    }
 
     // MARK: - Auth
 
-    public func getAuthUrl() throws -> URL {
+    func getAuthUrl() throws -> URL {
         var urlComponents = URLComponents(string: baseAuthUrl)!
         urlComponents.queryItems = [
             URLQueryItem(name: "client_id", value: clientId),
@@ -31,41 +58,39 @@ public class Premiumize: OAuthDebridSource {
         if let url = urlComponents.url {
             return url
         } else {
-            throw PMError.InvalidUrl
+            throw DebridError.InvalidUrl
         }
     }
 
-    public func handleAuthCallback(url: URL) throws {
+    func handleAuthCallback(url: URL) throws {
         let callbackComponents = URLComponents(url: url, resolvingAgainstBaseURL: false)
 
         guard let callbackFragment = callbackComponents?.fragment else {
-            throw PMError.InvalidResponse
+            throw DebridError.InvalidResponse
         }
 
         var fragmentComponents = URLComponents()
         fragmentComponents.query = callbackFragment
 
         guard let accessToken = fragmentComponents.queryItems?.first(where: { $0.name == "access_token" })?.value else {
-            throw PMError.InvalidToken
+            throw DebridError.InvalidToken
         }
 
         FerriteKeychain.shared.set(accessToken, forKey: "Premiumize.AccessToken")
     }
 
     // Adds a manual API key instead of web auth
-    public func setApiKey(_ key: String) -> Bool {
+    func setApiKey(_ key: String) {
         FerriteKeychain.shared.set(key, forKey: "Premiumize.AccessToken")
         UserDefaults.standard.set(true, forKey: "Premiumize.UseManualKey")
-
-        return FerriteKeychain.shared.get("Premiumize.AccessToken") == key
     }
 
-    public func getToken() -> String? {
+    func getToken() -> String? {
         FerriteKeychain.shared.get("Premiumize.AccessToken")
     }
 
     // Clears tokens. No endpoint to deregister a device
-    public func logout() {
+    func logout() {
         FerriteKeychain.shared.delete("Premiumize.AccessToken")
         UserDefaults.standard.removeObject(forKey: "Premiumize.UseManualKey")
     }
@@ -75,7 +100,7 @@ public class Premiumize: OAuthDebridSource {
     // Wrapper request function which matches the responses and returns data
     @discardableResult private func performRequest(request: inout URLRequest, requestName: String) async throws -> Data {
         guard let token = getToken() else {
-            throw PMError.InvalidToken
+            throw DebridError.InvalidToken
         }
 
         // Use the API query parameter if a manual API key is present
@@ -84,7 +109,7 @@ public class Premiumize: OAuthDebridSource {
                 let requestUrl = request.url,
                 var components = URLComponents(url: requestUrl, resolvingAgainstBaseURL: false)
             else {
-                throw PMError.InvalidUrl
+                throw DebridError.InvalidUrl
             }
 
             let apiTokenItem = URLQueryItem(name: "apikey", value: token)
@@ -103,47 +128,57 @@ public class Premiumize: OAuthDebridSource {
         let (data, response) = try await URLSession.shared.data(for: request)
 
         guard let response = response as? HTTPURLResponse else {
-            throw PMError.FailedRequest(description: "No HTTP response given")
+            throw DebridError.FailedRequest(description: "No HTTP response given")
         }
 
         if response.statusCode >= 200, response.statusCode <= 299 {
             return data
         } else if response.statusCode == 401 {
-            logout()
+            throw DebridError.FailedRequest(description: "The request \(requestName) failed because you were unauthorized. Please relogin to Premiumize in Settings.")
-            throw PMError.FailedRequest(description: "The request \(requestName) failed because you were unauthorized. Please relogin to Premiumize in Settings.")
         } else {
-            throw PMError.FailedRequest(description: "The request \(requestName) failed with status code \(response.statusCode).")
+            throw DebridError.FailedRequest(description: "The request \(requestName) failed with status code \(response.statusCode).")
         }
     }
 
     // MARK: - Instant availability
 
-    public func instantAvailability(magnets: [Magnet]) async throws -> [DebridIA] {
+    func instantAvailability(magnets: [Magnet]) async throws {
-        var collectedIA: [DebridIA] = []
+        let now = Date().timeIntervalSince1970
 
-        // Only strip magnets that don't have an associated link for PM
+        // Remove magnets that don't have an associated link for PM along with existing TTL logic
-        let strippedMagnets: [Magnet] = magnets.compactMap {
+        let sendMagnets = magnets.filter { magnet in
-            if let magnetLink = $0.link {
+            if magnet.link == nil {
-                return Magnet(hash: $0.hash, link: magnetLink)
+                return false
+            }
+
+            if let IAIndex = IAValues.firstIndex(where: { $0.magnet.hash == magnet.hash }) {
+                if now > IAValues[IAIndex].expiryTimeStamp {
+                    IAValues.remove(at: IAIndex)
+                    return true
+                } else {
+                    return false
+                }
             } else {
-                return nil
+                return true
             }
         }
 
-        let availableMagnets = try await divideCacheRequests(magnets: strippedMagnets)
+        if sendMagnets.isEmpty {
+            return
+        }
+
+        let availableMagnets = try await divideCacheRequests(magnets: sendMagnets)
 
         // Split DDL requests into chunks of 10
         for chunk in availableMagnets.chunked(into: 10) {
             let tempIA = try await divideDDLRequests(magnetChunk: chunk)
-            collectedIA += tempIA
+            IAValues += tempIA
         }
-
-        return collectedIA
     }
 
     // Function to divide and execute DDL endpoint requests in parallel
     // Calls this for 10 requests at a time to not overwhelm API servers
-    public func divideDDLRequests(magnetChunk: [Magnet]) async throws -> [DebridIA] {
+    func divideDDLRequests(magnetChunk: [Magnet]) async throws -> [DebridIA] {
         let tempIA = try await withThrowingTaskGroup(of: DebridIA.self) { group in
             for magnet in magnetChunk {
                 group.addTask {
@@ -162,9 +197,9 @@ public class Premiumize: OAuthDebridSource {
     }
 
     // Grabs DDL links
-    func fetchDDL(magnet: Magnet) async throws -> DebridIA {
+    private func fetchDDL(magnet: Magnet) async throws -> DebridIA {
         if magnet.hash == nil {
-            throw PMError.EmptyData
+            throw DebridError.EmptyData
         }
 
         var request = URLRequest(url: URL(string: "\(baseApiUrl)/transfer/directdl")!)
@@ -178,11 +213,12 @@ public class Premiumize: OAuthDebridSource {
 
         let data = try await performRequest(request: &request, requestName: #function)
         let rawResponse = try jsonDecoder.decode(DDLResponse.self, from: data)
+        let content = rawResponse.content ?? []
 
-        if !rawResponse.content.isEmpty {
+        if !content.isEmpty {
-            let files = rawResponse.content.map { file in
+            let files = content.map { file in
                 DebridIAFile(
-                    fileId: 0,
+                    id: 0,
                     name: file.path.split(separator: "/").last.flatMap { String($0) } ?? file.path,
                     streamUrlString: file.link
                 )
@@ -190,18 +226,17 @@ public class Premiumize: OAuthDebridSource {
 
             return DebridIA(
                 magnet: magnet,
-                source: id,
                 expiryTimeStamp: Date().timeIntervalSince1970 + 300,
                 files: files
             )
         } else {
-            throw PMError.EmptyData
+            throw DebridError.EmptyData
         }
     }
 
     // Function to divide and execute cache endpoint requests in parallel
     // Calls this for 100 hashes at a time due to API limits
-    public func divideCacheRequests(magnets: [Magnet]) async throws -> [Magnet] {
+    func divideCacheRequests(magnets: [Magnet]) async throws -> [Magnet] {
         let availableMagnets = try await withThrowingTaskGroup(of: [Magnet].self) { group in
             for chunk in magnets.chunked(into: 100) {
                 group.addTask {
@@ -221,11 +256,11 @@ public class Premiumize: OAuthDebridSource {
     }
 
     // Parent function for initial checking of the cache
-    func checkCache(magnets: [Magnet]) async throws -> [Magnet] {
+    private func checkCache(magnets: [Magnet]) async throws -> [Magnet] {
         var urlComponents = URLComponents(string: "\(baseApiUrl)/cache/check")!
         urlComponents.queryItems = magnets.map { URLQueryItem(name: "items[]", value: $0.hash) }
         guard let url = urlComponents.url else {
-            throw PMError.InvalidUrl
+            throw DebridError.InvalidUrl
         }
 
         var request = URLRequest(url: url)
@@ -234,7 +269,7 @@ public class Premiumize: OAuthDebridSource {
         let rawResponse = try jsonDecoder.decode(CacheCheckResponse.self, from: data)
 
         if rawResponse.response.isEmpty {
-            throw PMError.EmptyData
+            throw DebridError.EmptyData
         } else {
             let availableMagnets = magnets.enumerated().compactMap { index, magnet in
                 if rawResponse.response[safe: index] == true {
@@ -250,23 +285,30 @@ public class Premiumize: OAuthDebridSource {
 
     // MARK: - Downloading
 
-    // Wrapper function to fetch a DDL link from the API
+    func getRestrictedFile(magnet: Magnet, ia: DebridIA?, iaFile: DebridIAFile?) async throws -> (restrictedFile: DebridIAFile?, newIA: DebridIA?) {
-    public func getDownloadLink(magnet: Magnet, ia: DebridIA?, iaFile: DebridIAFile?) async throws -> String {
         // Store the item in PM cloud for later use
         try await createTransfer(magnet: magnet)
 
-        if let iaFile, let streamUrlString = iaFile.streamUrlString {
+        if let iaFile {
-            return streamUrlString
+            return (iaFile, nil)
-        } else if let premiumizeItem = ia, let firstFile = premiumizeItem.files[safe: 0], let streamUrlString = firstFile.streamUrlString {
+        } else if let premiumizeItem = ia, let firstFile = premiumizeItem.files[safe: 0] {
-            return streamUrlString
+            return (firstFile, nil)
         } else {
-            throw PMError.FailedRequest(description: "Could not fetch your file from the Premiumize API")
+            throw DebridError.FailedRequest(description: "Could not fetch your file from the Premiumize API")
         }
     }
 
-    func createTransfer(magnet: Magnet) async throws {
+    func unrestrictFile(_ restrictedFile: DebridIAFile) async throws -> String {
+        guard let streamUrlString = restrictedFile.streamUrlString else {
+            throw DebridError.FailedRequest(description: "Could not get a streaming URL from the Premiumize API")
+        }
+
+        return streamUrlString
+    }
+
+    private func createTransfer(magnet: Magnet) async throws {
         guard let magnetLink = magnet.link else {
-            throw PMError.FailedRequest(description: "The magnet link is invalid")
+            throw DebridError.FailedRequest(description: "The magnet link is invalid")
         }
 
         var request = URLRequest(url: URL(string: "\(baseApiUrl)/transfer/create")!)
@@ -283,29 +325,27 @@ public class Premiumize: OAuthDebridSource {
 
     // MARK: - Cloud methods
 
-    public func getUserDownloads() async throws -> [DebridCloudDownload] {
+    func getUserDownloads() async throws {
         var request = URLRequest(url: URL(string: "\(baseApiUrl)/item/listall")!)
 
         let data = try await performRequest(request: &request, requestName: #function)
         let rawResponse = try jsonDecoder.decode(AllItemsResponse.self, from: data)
 
         if rawResponse.files.isEmpty {
-            throw PMError.EmptyData
+            throw DebridError.EmptyData
         }
 
         // The "link" is the ID for Premiumize
-        let downloads = rawResponse.files.map { file in
+        cloudDownloads = rawResponse.files.map { file in
-            DebridCloudDownload(downloadId: file.id, source: self.id, fileName: file.name, link: file.id)
+            DebridCloudDownload(id: file.id, fileName: file.name, link: file.id)
         }
-
-        return downloads
     }
 
-    func itemDetails(itemID: String) async throws -> ItemDetailsResponse {
+    private func itemDetails(itemID: String) async throws -> ItemDetailsResponse {
         var urlComponents = URLComponents(string: "\(baseApiUrl)/item/details")!
         urlComponents.queryItems = [URLQueryItem(name: "id", value: itemID)]
         guard let url = urlComponents.url else {
-            throw PMError.InvalidUrl
+            throw DebridError.InvalidUrl
         }
 
         var request = URLRequest(url: url)
@@ -316,7 +356,12 @@ public class Premiumize: OAuthDebridSource {
         return rawResponse
     }
 
-    public func deleteDownload(downloadId: String) async throws {
+    func checkUserDownloads(link: String) async throws -> String? {
+        // Link is the cloud item ID
+        try await itemDetails(itemID: link).link
+    }
+
+    func deleteUserDownload(downloadId: String) async throws {
         var request = URLRequest(url: URL(string: "\(baseApiUrl)/item/delete")!)
         request.httpMethod = "POST"
         request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
@@ -329,10 +374,8 @@ public class Premiumize: OAuthDebridSource {
         try await performRequest(request: &request, requestName: #function)
     }
 
-    // No user torrents for Premiumize
+    // No user magnets for Premiumize
-    public func getUserTorrents() async throws -> [DebridCloudTorrent] {
+    func getUserMagnets() {}
-        []
-    }
 
-    public func deleteTorrent(torrentId: String) async throws {}
+    func deleteUserMagnet(cloudMagnetId: String?) {}
 }

Ferrite/API/RealDebridWrapper.swift

@@ -7,32 +7,68 @@
 
 import Foundation
 
-public class RealDebrid: PollingDebridSource {
+class RealDebrid: PollingDebridSource, ObservableObject {
-    public let id = "RealDebrid"
+    let id = "RealDebrid"
-    public let abbreviation = "RD"
+    let abbreviation = "RD"
-    public let website = "https://real-debrid.com"
+    let website = "https://real-debrid.com"
-    public var authTask: Task<Void, Error>?
+    let description: String? = "RealDebrid is a debrid service that is used for downloads and media playback. " +
+        "You must pay to access this service. \n\n" +
+        "It is not recommended to use this service since media cache checks are not possible via the API. " +
+        "Ferrite's instant availability solely looks at a user's magnet library. \n\n" +
+        "If you must use this service, it is recommended to download search results manually using the context menu. \n\n" +
+        "This service does not inform if a magnet link is a batch before downloading."
 
-    let baseAuthUrl = "https://api.real-debrid.com/oauth/v2"
+    let cachedStatus: [String] = ["downloaded"]
-    let baseApiUrl = "https://api.real-debrid.com/rest/1.0"
+    var authTask: Task<Void, Error>?
-    let openSourceClientId = "X245A4XAIBGVM"
 
-    let jsonDecoder = JSONDecoder()
+    @Published var authProcessing: Bool = false
+
+    // Check the manual token since getTokens() is async
+    var isLoggedIn: Bool {
+        FerriteKeychain.shared.get("RealDebrid.AccessToken") != nil
+    }
+
+    var manualToken: String? {
+        if UserDefaults.standard.bool(forKey: "RealDebrid.UseManualKey") {
+            return FerriteKeychain.shared.get("RealDebrid.AccessToken")
+        } else {
+            return nil
+        }
+    }
+
+    @Published var IAValues: [DebridIA] = []
+    @Published var cloudDownloads: [DebridCloudDownload] = []
+    @Published var cloudMagnets: [DebridCloudMagnet] = []
+    var cloudTTL: Double = 0.0
+
+    private let baseAuthUrl = "https://api.real-debrid.com/oauth/v2"
+    private let baseApiUrl = "https://api.real-debrid.com/rest/1.0"
+    private let openSourceClientId = "X245A4XAIBGVM"
+
+    private let jsonDecoder = JSONDecoder()
 
     @MainActor
-    func setUserDefaultsValue(_ value: Any, forKey: String) {
+    private func setUserDefaultsValue(_ value: Any, forKey: String) {
         UserDefaults.standard.set(value, forKey: forKey)
     }
 
     @MainActor
-    func removeUserDefaultsValue(forKey: String) {
+    private func removeUserDefaultsValue(forKey: String) {
         UserDefaults.standard.removeObject(forKey: forKey)
     }
 
+    init() {
+        // Populate user downloads and magnets
+        Task {
+            try? await getUserDownloads()
+            try? await getUserMagnets()
+        }
+    }
+
     // MARK: - Auth
 
     // Fetches the device code from RD
-    public func getAuthUrl() async throws -> URL {
+    func getAuthUrl() async throws -> URL {
         var urlComponents = URLComponents(string: "\(baseAuthUrl)/device/code")!
         urlComponents.queryItems = [
             URLQueryItem(name: "client_id", value: openSourceClientId),
@@ -40,7 +76,7 @@ public class RealDebrid: PollingDebridSource {
         ]
 
         guard let url = urlComponents.url else {
-            throw RDError.InvalidUrl
+            throw DebridError.InvalidUrl
         }
 
         let request = URLRequest(url: url)
@@ -50,7 +86,7 @@ public class RealDebrid: PollingDebridSource {
             // Validate the URL before doing anything else
             let rawResponse = try jsonDecoder.decode(DeviceCodeResponse.self, from: data)
             guard let directVerificationUrl = URL(string: rawResponse.directVerificationURL) else {
-                throw RDError.AuthQuery(description: "The verification URL is invalid")
+                throw DebridError.AuthQuery(description: "The verification URL is invalid")
             }
 
             // Spawn the polling task separately
@@ -61,12 +97,12 @@ public class RealDebrid: PollingDebridSource {
             return directVerificationUrl
         } catch {
             print("Couldn't get the new client creds!")
-            throw RDError.AuthQuery(description: error.localizedDescription)
+            throw DebridError.AuthQuery(description: error.localizedDescription)
         }
     }
 
     // Fetches the user's client ID and secret
-    public func getDeviceCredentials(deviceCode: String) async throws {
+    func getDeviceCredentials(deviceCode: String) async throws {
         var urlComponents = URLComponents(string: "\(baseAuthUrl)/device/credentials")!
         urlComponents.queryItems = [
             URLQueryItem(name: "client_id", value: openSourceClientId),
@@ -74,7 +110,7 @@ public class RealDebrid: PollingDebridSource {
         ]
 
         guard let url = urlComponents.url else {
-            throw RDError.InvalidUrl
+            throw DebridError.InvalidUrl
         }
 
         let request = URLRequest(url: url)
@@ -84,7 +120,7 @@ public class RealDebrid: PollingDebridSource {
 
         while count < 12 {
             if Task.isCancelled {
-                throw RDError.AuthQuery(description: "Token request cancelled.")
+                throw DebridError.AuthQuery(description: "Token request cancelled.")
             }
 
             let (data, _) = try await URLSession.shared.data(for: request)
@@ -97,7 +133,7 @@ public class RealDebrid: PollingDebridSource {
                 await setUserDefaultsValue(clientId, forKey: "RealDebrid.ClientId")
                 FerriteKeychain.shared.set(clientSecret, forKey: "RealDebrid.ClientSecret")
 
-                try await getTokens(deviceCode: deviceCode)
+                try await getApiTokens(deviceCode: deviceCode)
 
                 return
             } else {
@@ -106,17 +142,17 @@ public class RealDebrid: PollingDebridSource {
             }
         }
 
-        throw RDError.AuthQuery(description: "Could not fetch the client ID and secret in time. Try logging in again.")
+        throw DebridError.AuthQuery(description: "Could not fetch the client ID and secret in time. Try logging in again.")
     }
 
     // Fetch all tokens for the user and store in FerriteKeychain.shared
-    public func getTokens(deviceCode: String) async throws {
+    func getApiTokens(deviceCode: String) async throws {
         guard let clientId = UserDefaults.standard.string(forKey: "RealDebrid.ClientId") else {
-            throw RDError.EmptyData
+            throw DebridError.EmptyData
         }
 
         guard let clientSecret = FerriteKeychain.shared.get("RealDebrid.ClientSecret") else {
-            throw RDError.EmptyData
+            throw DebridError.EmptyData
         }
 
         var request = URLRequest(url: URL(string: "\(baseAuthUrl)/token")!)
@@ -144,13 +180,13 @@ public class RealDebrid: PollingDebridSource {
         await setUserDefaultsValue(accessTimestamp, forKey: "RealDebrid.AccessTokenStamp")
     }
 
-    public func fetchToken() async -> String? {
+    func getToken() async -> String? {
         let accessTokenStamp = UserDefaults.standard.double(forKey: "RealDebrid.AccessTokenStamp")
 
         if Date().timeIntervalSince1970 > accessTokenStamp {
             do {
                 if let refreshToken = FerriteKeychain.shared.get("RealDebrid.RefreshToken") {
-                    try await getTokens(deviceCode: refreshToken)
+                    try await getApiTokens(deviceCode: refreshToken)
                 }
             } catch {
                 print(error)
@@ -163,18 +199,16 @@ public class RealDebrid: PollingDebridSource {
 
     // Adds a manual API key instead of web auth
     // Clear out existing refresh tokens and timestamps
-    public func setApiKey(_ key: String) -> Bool {
+    func setApiKey(_ key: String) {
         FerriteKeychain.shared.set(key, forKey: "RealDebrid.AccessToken")
         FerriteKeychain.shared.delete("RealDebrid.RefreshToken")
         FerriteKeychain.shared.delete("RealDebrid.AccessTokenStamp")
 
         UserDefaults.standard.set(true, forKey: "RealDebrid.UseManualKey")
-
-        return FerriteKeychain.shared.get("RealDebrid.AccessToken") == key
     }
 
     // Deletes tokens from device and RD's servers
-    public func logout() async {
+    func logout() async {
         FerriteKeychain.shared.delete("RealDebrid.RefreshToken")
         FerriteKeychain.shared.delete("RealDebrid.ClientSecret")
         await removeUserDefaultsValue(forKey: "RealDebrid.ClientId")
@@ -195,8 +229,8 @@ public class RealDebrid: PollingDebridSource {
 
     // Wrapper request function which matches the responses and returns data
     @discardableResult private func performRequest(request: inout URLRequest, requestName: String) async throws -> Data {
-        guard let token = await fetchToken() else {
+        guard let token = await getToken() else {
-            throw RDError.InvalidToken
+            throw DebridError.InvalidToken
         }
 
         request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
@@ -204,115 +238,116 @@ public class RealDebrid: PollingDebridSource {
         let (data, response) = try await URLSession.shared.data(for: request)
 
         guard let response = response as? HTTPURLResponse else {
-            throw RDError.FailedRequest(description: "No HTTP response given")
+            throw DebridError.FailedRequest(description: "No HTTP response given")
         }
 
         if response.statusCode >= 200, response.statusCode <= 299 {
             return data
         } else if response.statusCode == 401 {
-            await logout()
+            throw DebridError.FailedRequest(description: "The request \(requestName) failed because you were unauthorized. Please relogin to RealDebrid in Settings.")
-            throw RDError.FailedRequest(description: "The request \(requestName) failed because you were unauthorized. Please relogin to RealDebrid in Settings.")
         } else {
-            throw RDError.FailedRequest(description: "The request \(requestName) failed with status code \(response.statusCode).")
+            throw DebridError.FailedRequest(description: "The request \(requestName) failed with status code \(response.statusCode).")
         }
     }
 
     // MARK: - Instant availability
 
-    // Checks if the magnet is streamable on RD
+    // Post-API changes
-    public func instantAvailability(magnets: [Magnet]) async throws -> [DebridIA] {
+    // Use user magnets to check for IA instead
-        var availableHashes: [DebridIA] = []
+    func instantAvailability(magnets: [Magnet]) async throws {
-        var request = URLRequest(url: URL(string: "\(baseApiUrl)/torrents/instantAvailability/\(magnets.compactMap(\.hash).joined(separator: "/"))")!)
+        let now = Date().timeIntervalSince1970
 
-        let data = try await performRequest(request: &request, requestName: #function)
+        let sendMagnets = magnets.filter { magnet in
-
+            if let IAIndex = IAValues.firstIndex(where: { $0.magnet.hash == magnet.hash }) {
-        // Does not account for torrent packs at the moment
+                if now > IAValues[IAIndex].expiryTimeStamp {
-        let rawResponseDict = try jsonDecoder.decode([String: InstantAvailabilityResponse].self, from: data)
+                    IAValues.remove(at: IAIndex)
-
+                    return true
-        for (hash, response) in rawResponseDict {
+                } else {
-            guard let data = response.data else {
+                    return false
-                continue
-            }
-
-            if data.rd.isEmpty {
-                continue
-            }
-
-            // Is this a batch?
-            if data.rd.count > 1 || data.rd[0].count > 1 {
-                // Batch array
-                let batches = data.rd.map { fileDict in
-                    let batchFiles: [RealDebrid.IABatchFile] = fileDict.map { key, value in
-                        // Force unwrapped ID. Is safe because ID is guaranteed on a successful response
-                        RealDebrid.IABatchFile(id: Int(key)!, fileName: value.filename)
-                    }.sorted(by: { $0.id < $1.id })
-
-                    return RealDebrid.IABatch(files: batchFiles)
                 }
-
-                var files: [DebridIAFile] = []
-
-                for batch in batches {
-                    let batchFileIds = batch.files.map(\.id)
-
-                    for batchFile in batch.files {
-                        if !files.contains(where: { $0.fileId == batchFile.id }) {
-                            files.append(
-                                DebridIAFile(
-                                    fileId: batchFile.id,
-                                    name: batchFile.fileName,
-                                    batchIds: batchFileIds
-                                )
-                            )
-                        }
-                    }
-                }
-
-                // TTL: 5 minutes
-                availableHashes.append(
-                    DebridIA(
-                        magnet: Magnet(hash: hash, link: nil),
-                        source: id,
-                        expiryTimeStamp: Date().timeIntervalSince1970 + 300,
-                        files: files
-                    )
-                )
             } else {
-                availableHashes.append(
+                return true
+            }
+        }
+
+        // Fetch the user magnets to the latest version
+        try await getUserMagnets()
+
+        for cloudMagnet in cloudMagnets {
+            if cachedStatus.contains(cloudMagnet.status),
+               sendMagnets.contains(where: { $0.hash == cloudMagnet.hash })
+            {
+                IAValues.append(
                     DebridIA(
-                        magnet: Magnet(hash: hash, link: nil),
+                        magnet: Magnet(hash: cloudMagnet.hash, link: nil),
-                        source: id,
                         expiryTimeStamp: Date().timeIntervalSince1970 + 300,
                         files: []
                     )
                 )
             }
         }
-
-        return availableHashes
     }
 
     // MARK: - Downloading
 
     // Wrapper function to fetch a download link from the API
-    public func getDownloadLink(magnet: Magnet, ia: DebridIA?, iaFile: DebridIAFile?) async throws -> String {
+    func getRestrictedFile(magnet: Magnet, ia: DebridIA?, iaFile: DebridIAFile?) async throws -> (restrictedFile: DebridIAFile?, newIA: DebridIA?) {
-        let selectedMagnetId = try await addMagnet(magnet: magnet)
+        var selectedMagnetId = ""
 
-        try await selectFiles(debridID: selectedMagnetId, fileIds: iaFile?.batchIds ?? [])
+        do {
+            // Don't queue a new job if the magnet already exists in the user's library
+            if let existingCloudMagnet = cloudMagnets.first(where: {
+                $0.hash == magnet.hash && cachedStatus.contains($0.status)
+            }) {
+                selectedMagnetId = existingCloudMagnet.id
+            } else {
+                selectedMagnetId = try await addMagnet(magnet: magnet)
 
-        let torrentLink = try await torrentInfo(
+                try await selectFiles(debridID: selectedMagnetId, fileIds: iaFile?.batchIds ?? [])
-            debridID: selectedMagnetId,
+            }
-            selectedIndex: iaFile?.fileId ?? 0
-        )
-        let downloadLink = try await unrestrictLink(debridDownloadLink: torrentLink)
 
-        return downloadLink
+            let response = try await torrentInfo(debridID: selectedMagnetId)
+            let filteredFiles = response.files.filter { $0.selected == 1 }
+
+            // Need to return this to the user
+            if filteredFiles.count > 1, iaFile == nil {
+                var copiedIA = ia
+
+                copiedIA?.files = response.files.enumerated().compactMap { index, file in
+                    DebridIAFile(
+                        id: index,
+                        name: file.path,
+                        streamUrlString: response.links[safe: index]
+                    )
+                }
+
+                return (nil, copiedIA)
+            }
+
+            // RealDebrid has 1 as the first ID for a file
+            let selectedFileId = iaFile?.id ?? 1
+            let linkIndex = filteredFiles.firstIndex(where: { $0.id == selectedFileId })
+
+            guard let cloudMagnetLink = response.links[safe: linkIndex ?? -1] else {
+                throw DebridError.EmptyUserMagnets
+            }
+
+            let restrictedFile = DebridIAFile(id: 0, name: response.filename, streamUrlString: cloudMagnetLink)
+            return (restrictedFile, nil)
+        } catch {
+            if case DebridError.EmptyUserMagnets = error, !selectedMagnetId.isEmpty {
+                try? await deleteUserMagnet(cloudMagnetId: selectedMagnetId)
+            }
+
+            // Re-raise the error to the calling function
+            throw error
+        }
     }
 
     // Adds a magnet link to the user's RD account
-    public func addMagnet(magnet: Magnet) async throws -> String {
+    func addMagnet(magnet: Magnet) async throws -> String {
         guard let magnetLink = magnet.link else {
-            throw RDError.FailedRequest(description: "The magnet link is invalid")
+            throw DebridError.FailedRequest(description: "The magnet link is invalid")
         }
 
         var request = URLRequest(url: URL(string: "\(baseApiUrl)/torrents/addMagnet")!)
@@ -331,7 +366,7 @@ public class RealDebrid: PollingDebridSource {
     }
 
     // Queues the magnet link for downloading
-    public func selectFiles(debridID: String, fileIds: [Int]) async throws {
+    func selectFiles(debridID: String, fileIds: [Int]) async throws {
         var request = URLRequest(url: URL(string: "\(baseApiUrl)/torrents/selectFiles/\(debridID)")!)
         request.httpMethod = "POST"
         request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
@@ -351,32 +386,31 @@ public class RealDebrid: PollingDebridSource {
     }
 
     // Gets the info of a torrent from a given ID
-    public func torrentInfo(debridID: String, selectedIndex: Int?) async throws -> String {
+    func torrentInfo(debridID: String) async throws -> TorrentInfoResponse {
         var request = URLRequest(url: URL(string: "\(baseApiUrl)/torrents/info/\(debridID)")!)
 
         let data = try await performRequest(request: &request, requestName: #function)
         let rawResponse = try jsonDecoder.decode(TorrentInfoResponse.self, from: data)
-        let filteredFiles = rawResponse.files.filter { $0.selected == 1 }
-        let linkIndex = filteredFiles.firstIndex(where: { $0.id == selectedIndex })
 
-        // Let the user know if a torrent is downloading
+        // Let the user know if a magnet is downloading
-        if let torrentLink = rawResponse.links[safe: linkIndex ?? -1], rawResponse.status == "downloaded" {
+        switch rawResponse.status {
-            return torrentLink
+        case "downloaded":
-        } else if rawResponse.status == "downloading" || rawResponse.status == "queued" {
+            return rawResponse
-            throw RDError.EmptyTorrents
+        case "downloading", "queued":
-        } else {
+            throw DebridError.IsCaching
-            throw RDError.EmptyData
+        default:
+            throw DebridError.EmptyUserMagnets
         }
     }
 
     // Downloads link from selectFiles for playback
-    public func unrestrictLink(debridDownloadLink: String) async throws -> String {
+    func unrestrictFile(_ restrictedFile: DebridIAFile) async throws -> String {
         var request = URLRequest(url: URL(string: "\(baseApiUrl)/unrestrict/link")!)
         request.httpMethod = "POST"
         request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
 
         var bodyComponents = URLComponents()
-        bodyComponents.queryItems = [URLQueryItem(name: "link", value: debridDownloadLink)]
+        bodyComponents.queryItems = [URLQueryItem(name: "link", value: restrictedFile.streamUrlString)]
 
         request.httpBody = bodyComponents.query?.data(using: .utf8)
 
@@ -388,48 +422,63 @@ public class RealDebrid: PollingDebridSource {
 
     // MARK: - Cloud methods
 
-    // Gets the user's torrent library
+    // Gets the user's cloud magnet library
-    public func getUserTorrents() async throws -> [DebridCloudTorrent] {
+    func getUserMagnets() async throws {
         var request = URLRequest(url: URL(string: "\(baseApiUrl)/torrents")!)
 
         let data = try await performRequest(request: &request, requestName: #function)
         let rawResponse = try jsonDecoder.decode([UserTorrentsResponse].self, from: data)
-        let torrents = rawResponse.map { response in
+        cloudMagnets = rawResponse.map { response in
-            DebridCloudTorrent(
+            DebridCloudMagnet(
-                torrentId: response.id,
+                id: response.id,
-                source: self.id,
                 fileName: response.filename,
                 status: response.status,
                 hash: response.hash,
-                links: response.links
+                links: [response.id]
             )
         }
-
-        return torrents
     }
 
-    // Deletes a torrent download from RD
+    // Deletes a magnet download from RD
-    public func deleteTorrent(torrentId: String) async throws {
+    func deleteUserMagnet(cloudMagnetId: String?) async throws {
-        var request = URLRequest(url: URL(string: "\(baseApiUrl)/torrents/delete/\(torrentId)")!)
+        let deleteId: String
+
+        if let cloudMagnetId {
+            deleteId = cloudMagnetId
+        } else {
+            // Refresh the user magnet list
+            // The first file is the currently caching one
+            let _ = try await getUserMagnets()
+            guard let firstCloudMagnet = cloudMagnets[safe: -1] else {
+                throw DebridError.EmptyUserMagnets
+            }
+
+            deleteId = firstCloudMagnet.id
+        }
+
+        var request = URLRequest(url: URL(string: "\(baseApiUrl)/torrents/delete/\(deleteId)")!)
         request.httpMethod = "DELETE"
 
         try await performRequest(request: &request, requestName: #function)
     }
 
     // Gets the user's downloads
-    public func getUserDownloads() async throws -> [DebridCloudDownload] {
+    func getUserDownloads() async throws {
         var request = URLRequest(url: URL(string: "\(baseApiUrl)/downloads")!)
 
         let data = try await performRequest(request: &request, requestName: #function)
         let rawResponse = try jsonDecoder.decode([UserDownloadsResponse].self, from: data)
-        let downloads = rawResponse.map { response in
+        cloudDownloads = rawResponse.map { response in
-            DebridCloudDownload(downloadId: response.id, source: self.id, fileName: response.filename, link: response.download)
+            DebridCloudDownload(id: response.id, fileName: response.filename, link: response.download)
         }
-
-        return downloads
     }
 
-    public func deleteDownload(downloadId: String) async throws {
+    // Not used
+    func checkUserDownloads(link: String) -> String? {
+        link
+    }
+
+    func deleteUserDownload(downloadId: String) async throws {
         var request = URLRequest(url: URL(string: "\(baseApiUrl)/downloads/delete/\(downloadId)")!)
         request.httpMethod = "DELETE"
 

Ferrite/API/TorBoxWrapper.swift

@@ -0,0 +1,270 @@
+//
+//  TorBoxWrapper.swift
+//  Ferrite
+//
+//  Created by Brian Dashore on 6/11/24.
+//
+
+import Foundation
+
+class TorBox: DebridSource, ObservableObject {
+    let id = "TorBox"
+    let abbreviation = "TB"
+    let website = "https://torbox.app"
+    let description: String? = "TorBox is a debrid service that is used for downloads and media playback with seeding. " +
+        "Both free and paid plans are available."
+    let cachedStatus: [String] = ["cached", "completed"]
+
+    @Published var authProcessing: Bool = false
+    var isLoggedIn: Bool {
+        getToken() != nil
+    }
+
+    var manualToken: String? {
+        if UserDefaults.standard.bool(forKey: "TorBox.UseManualKey") {
+            return getToken()
+        } else {
+            return nil
+        }
+    }
+
+    @Published var IAValues: [DebridIA] = []
+    @Published var cloudDownloads: [DebridCloudDownload] = []
+    @Published var cloudMagnets: [DebridCloudMagnet] = []
+    var cloudTTL: Double = 0.0
+
+    private let baseApiUrl = "https://api.torbox.app/v1/api"
+    private let jsonDecoder = JSONDecoder()
+    private let jsonEncoder = JSONEncoder()
+
+    init() {
+        // Populate user downloads and magnets
+        Task {
+            try? await getUserMagnets()
+        }
+    }
+
+    // MARK: - Auth
+
+    func setApiKey(_ key: String) {
+        FerriteKeychain.shared.set(key, forKey: "TorBox.ApiKey")
+        UserDefaults.standard.set(true, forKey: "TorBox.UseManualKey")
+    }
+
+    func logout() async {
+        FerriteKeychain.shared.delete("TorBox.ApiKey")
+        UserDefaults.standard.removeObject(forKey: "TorBox.UseManualKey")
+    }
+
+    private func getToken() -> String? {
+        FerriteKeychain.shared.get("TorBox.ApiKey")
+    }
+
+    // MARK: - Common request
+
+    // Wrapper request function which matches the responses and returns data
+    @discardableResult private func performRequest(request: inout URLRequest, requestName: String) async throws -> Data {
+        guard let token = getToken() else {
+            throw DebridError.InvalidToken
+        }
+
+        request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
+
+        let (data, response) = try await URLSession.shared.data(for: request)
+
+        guard let response = response as? HTTPURLResponse else {
+            throw DebridError.FailedRequest(description: "No HTTP response given")
+        }
+
+        if response.statusCode >= 200, response.statusCode <= 299 {
+            return data
+        } else if response.statusCode == 401 {
+            throw DebridError.FailedRequest(description: "The request \(requestName) failed because you were unauthorized. Please relogin to TorBox in Settings.")
+        } else {
+            throw DebridError.FailedRequest(description: "The request \(requestName) failed with status code \(response.statusCode).")
+        }
+    }
+
+    // MARK: - Instant availability
+
+    func instantAvailability(magnets: [Magnet]) async throws {
+        let now = Date().timeIntervalSince1970
+
+        let sendMagnets = magnets.filter { magnet in
+            if let IAIndex = IAValues.firstIndex(where: { $0.magnet.hash == magnet.hash }) {
+                if now > IAValues[IAIndex].expiryTimeStamp {
+                    IAValues.remove(at: IAIndex)
+                    return true
+                } else {
+                    return false
+                }
+            } else {
+                return true
+            }
+        }
+
+        if sendMagnets.isEmpty {
+            return
+        }
+
+        var components = URLComponents(string: "\(baseApiUrl)/torrents/checkcached")!
+        components.queryItems = sendMagnets.map { URLQueryItem(name: "hash", value: $0.hash) }
+        components.queryItems?.append(URLQueryItem(name: "format", value: "list"))
+        components.queryItems?.append(URLQueryItem(name: "list_files", value: "true"))
+
+        guard let url = components.url else {
+            throw DebridError.InvalidUrl
+        }
+
+        var request = URLRequest(url: url)
+
+        let data = try await performRequest(request: &request, requestName: #function)
+        let rawResponse = try jsonDecoder.decode(TBResponse<InstantAvailabilityData>.self, from: data)
+
+        // If the data is a failure, return
+        guard case let .links(iaObjects) = rawResponse.data else {
+            return
+        }
+
+        let availableHashes = iaObjects.map { iaObject in
+            DebridIA(
+                magnet: Magnet(hash: iaObject.hash, link: nil),
+                expiryTimeStamp: Date().timeIntervalSince1970 + 300,
+                files: iaObject.files.enumerated().compactMap { index, iaFile in
+                    guard let fileName = iaFile.name.split(separator: "/").last else {
+                        return nil
+                    }
+
+                    return DebridIAFile(
+                        id: index,
+                        name: String(fileName)
+                    )
+                }
+            )
+        }
+
+        IAValues += availableHashes
+    }
+
+    // MARK: - Downloading
+
+    func getRestrictedFile(magnet: Magnet, ia: DebridIA?, iaFile: DebridIAFile?) async throws -> (restrictedFile: DebridIAFile?, newIA: DebridIA?) {
+        let cloudMagnetId = try await createTorrent(magnet: magnet)
+        let cloudMagnetList = try await myTorrentList()
+        guard let filteredCloudMagnet = cloudMagnetList.first(where: { $0.id == cloudMagnetId }) else {
+            throw DebridError.FailedRequest(description: "Could not find a cached magnet. Are you sure it's cached?")
+        }
+
+        // If the user magnet isn't saved, it's considered as caching
+        guard cachedStatus.contains(filteredCloudMagnet.downloadState) else {
+            throw DebridError.IsCaching
+        }
+
+        guard let cloudMagnetFile = filteredCloudMagnet.files[safe: iaFile?.id ?? 0] else {
+            throw DebridError.EmptyUserMagnets
+        }
+
+        let restrictedFile = DebridIAFile(id: cloudMagnetFile.id, name: cloudMagnetFile.name, streamUrlString: String(cloudMagnetId))
+        return (restrictedFile, nil)
+    }
+
+    private func createTorrent(magnet: Magnet) async throws -> Int {
+        var request = URLRequest(url: URL(string: "\(baseApiUrl)/torrents/createtorrent")!)
+        request.httpMethod = "POST"
+
+        guard let magnetLink = magnet.link else {
+            throw DebridError.EmptyData
+        }
+
+        let formData = FormDataBody(params: ["magnet": magnetLink])
+        request.setValue("multipart/form-data; boundary=\(formData.boundary)", forHTTPHeaderField: "Content-Type")
+        request.httpBody = formData.body
+
+        let data = try await performRequest(request: &request, requestName: #function)
+        let rawResponse = try jsonDecoder.decode(TBResponse<CreateTorrentResponse>.self, from: data)
+
+        guard let torrentId = rawResponse.data?.torrentId else {
+            throw DebridError.EmptyData
+        }
+
+        return torrentId
+    }
+
+    private func myTorrentList() async throws -> [MyTorrentListResponse] {
+        var request = URLRequest(url: URL(string: "\(baseApiUrl)/torrents/mylist")!)
+
+        let data = try await performRequest(request: &request, requestName: #function)
+        let rawResponse = try jsonDecoder.decode(TBResponse<[MyTorrentListResponse]>.self, from: data)
+
+        guard let torrentList = rawResponse.data else {
+            throw DebridError.EmptyData
+        }
+
+        return torrentList
+    }
+
+    func unrestrictFile(_ restrictedFile: DebridIAFile) async throws -> String {
+        var components = URLComponents(string: "\(baseApiUrl)/torrents/requestdl")!
+        components.queryItems = [
+            URLQueryItem(name: "token", value: getToken()),
+            URLQueryItem(name: "torrent_id", value: restrictedFile.streamUrlString),
+            URLQueryItem(name: "file_id", value: String(restrictedFile.id))
+        ]
+
+        guard let url = components.url else {
+            throw DebridError.InvalidUrl
+        }
+
+        var request = URLRequest(url: url)
+
+        let data = try await performRequest(request: &request, requestName: #function)
+        let rawResponse = try jsonDecoder.decode(TBResponse<RequestDLResponse>.self, from: data)
+
+        guard let unrestrictedLink = rawResponse.data else {
+            throw DebridError.FailedRequest(description: "Could not get an unrestricted URL from TorBox.")
+        }
+
+        return unrestrictedLink
+    }
+
+    // MARK: - Cloud methods
+
+    // Unused
+    func getUserDownloads() {}
+
+    func checkUserDownloads(link: String) -> String? {
+        link
+    }
+
+    func deleteUserDownload(downloadId: String) {}
+
+    func getUserMagnets() async throws {
+        let cloudMagnetList = try await myTorrentList()
+        cloudMagnets = cloudMagnetList.map { cloudMagnet in
+
+            // Only need one link to force a green badge
+            DebridCloudMagnet(
+                id: String(cloudMagnet.id),
+                fileName: cloudMagnet.name,
+                status: cloudMagnet.downloadState,
+                hash: cloudMagnet.hash,
+                links: cloudMagnet.files.map { String($0.id) }
+            )
+        }
+    }
+
+    func deleteUserMagnet(cloudMagnetId: String?) async throws {
+        guard let cloudMagnetId else {
+            throw DebridError.InvalidPostBody
+        }
+
+        var request = URLRequest(url: URL(string: "\(baseApiUrl)/torrents/controltorrent")!)
+        request.httpMethod = "POST"
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+
+        let body = ControlTorrentRequest(torrentId: cloudMagnetId, operation: "Delete")
+        request.httpBody = try jsonEncoder.encode(body)
+
+        try await performRequest(request: &request, requestName: "controltorrent")
+    }
+}

Ferrite/DataManagement/Classes/Bookmark+CoreDataClass.swift

@@ -10,4 +10,4 @@ import CoreData
 import Foundation
 
 @objc(Bookmark)
-public class Bookmark: NSManagedObject {}
+class Bookmark: NSManagedObject {}

Ferrite/DataManagement/Classes/Bookmark+CoreDataProperties.swift

@@ -9,7 +9,7 @@
 import CoreData
 import Foundation
 
-public extension Bookmark {
+extension Bookmark {
     @nonobjc class func fetchRequest() -> NSFetchRequest<Bookmark> {
         NSFetchRequest<Bookmark>(entityName: "Bookmark")
     }

Ferrite/DataManagement/Classes/SourceHtmlParser+CoreDataProperties.swift

@@ -16,6 +16,7 @@ public extension SourceHtmlParser {
 
     @NSManaged var rows: String
     @NSManaged var searchUrl: String?
+    @NSManaged var request: SourceRequest?
     @NSManaged var magnetHash: SourceMagnetHash?
     @NSManaged var magnetLink: SourceMagnetLink?
     @NSManaged var parentSource: Source?

Ferrite/DataManagement/Classes/SourceJsonParser+CoreDataProperties.swift

@@ -17,6 +17,7 @@ public extension SourceJsonParser {
     @NSManaged var results: String?
     @NSManaged var subResults: String?
     @NSManaged var searchUrl: String
+    @NSManaged var request: SourceRequest?
     @NSManaged var magnetHash: SourceMagnetHash?
     @NSManaged var magnetLink: SourceMagnetLink?
     @NSManaged var parentSource: Source?

Ferrite/DataManagement/Classes/SourceRequest+CoreDataClass.swift

@@ -0,0 +1,13 @@
+//
+//  SourceRequest+CoreDataClass.swift
+//  Ferrite
+//
+//  Created by Brian Dashore on 6/10/24.
+//
+//
+
+import CoreData
+import Foundation
+
+@objc(SourceRequest)
+public class SourceRequest: NSManagedObject {}

Ferrite/DataManagement/Classes/SourceRequest+CoreDataProperties.swift

@@ -0,0 +1,25 @@
+//
+//  SourceRequest+CoreDataProperties.swift
+//  Ferrite
+//
+//  Created by Brian Dashore on 6/10/24.
+//
+//
+
+import CoreData
+import Foundation
+
+public extension SourceRequest {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<SourceRequest> {
+        NSFetchRequest<SourceRequest>(entityName: "SourceRequest")
+    }
+
+    @NSManaged var method: String?
+    @NSManaged var headers: [String: String]?
+    @NSManaged var body: String?
+    @NSManaged var parentHtmlParser: SourceHtmlParser?
+    @NSManaged var parentRssParser: SourceRssParser?
+    @NSManaged var parentJsonParser: SourceJsonParser?
+}
+
+extension SourceRequest: Identifiable {}

Ferrite/DataManagement/Classes/SourceRssParser+CoreDataProperties.swift

@@ -17,6 +17,7 @@ public extension SourceRssParser {
     @NSManaged var items: String
     @NSManaged var rssUrl: String?
     @NSManaged var searchUrl: String
+    @NSManaged var request: SourceRequest?
     @NSManaged var magnetHash: SourceMagnetHash?
     @NSManaged var magnetLink: SourceMagnetLink?
     @NSManaged var parentSource: Source?

Ferrite/DataManagement/FerriteDB.xcdatamodeld/FerriteDB_v2.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21513" systemVersion="22D49" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22758" systemVersion="23F79" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Action" representedClassName="Action" syncable="YES">
         <attribute name="about" optional="YES" attributeType="String"/>
         <attribute name="author" attributeType="String" defaultValueString=""/>
@@ -106,6 +106,7 @@
         <relationship name="magnetHash" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceMagnetHash" inverseName="parentHtmlParser" inverseEntity="SourceMagnetHash"/>
         <relationship name="magnetLink" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceMagnetLink" inverseName="parentHtmlParser" inverseEntity="SourceMagnetLink"/>
         <relationship name="parentSource" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="htmlParser" inverseEntity="Source"/>
+        <relationship name="request" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceRequest" inverseName="parentHtmlParser" inverseEntity="SourceRequest"/>
         <relationship name="seedLeech" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceSeedLeech" inverseName="parentHtmlParser" inverseEntity="SourceSeedLeech"/>
         <relationship name="size" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceSize" inverseName="parentHtmlParser" inverseEntity="SourceSize"/>
         <relationship name="subName" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceSubName" inverseName="parentHtmlParser" inverseEntity="SourceSubName"/>
@@ -118,6 +119,7 @@
         <relationship name="magnetHash" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceMagnetHash" inverseName="parentJsonParser" inverseEntity="SourceMagnetHash"/>
         <relationship name="magnetLink" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceMagnetLink" inverseName="parentJsonParser" inverseEntity="SourceMagnetLink"/>
         <relationship name="parentSource" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="jsonParser" inverseEntity="Source"/>
+        <relationship name="request" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceRequest" inverseName="parentJsonParser" inverseEntity="SourceRequest"/>
         <relationship name="seedLeech" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceSeedLeech" inverseName="parentJsonParser" inverseEntity="SourceSeedLeech"/>
         <relationship name="size" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceSize" inverseName="parentJsonParser" inverseEntity="SourceSize"/>
         <relationship name="subName" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceSubName" inverseName="parentJsonParser" inverseEntity="SourceSubName"/>
@@ -134,6 +136,14 @@
         <relationship name="parentJsonParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceJsonParser" inverseName="magnetLink" inverseEntity="SourceJsonParser"/>
         <relationship name="parentRssParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceRssParser" inverseName="magnetLink" inverseEntity="SourceRssParser"/>
     </entity>
+    <entity name="SourceRequest" representedClassName="SourceRequest" syncable="YES">
+        <attribute name="body" optional="YES" attributeType="String" valueTransformerName="NSSecureUnarchiveFromData"/>
+        <attribute name="headers" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" customClassName="[String: String]"/>
+        <attribute name="method" optional="YES" attributeType="String"/>
+        <relationship name="parentHtmlParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceHtmlParser" inverseName="request" inverseEntity="SourceHtmlParser"/>
+        <relationship name="parentJsonParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceJsonParser" inverseName="request" inverseEntity="SourceJsonParser"/>
+        <relationship name="parentRssParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceRssParser" inverseName="request" inverseEntity="SourceRssParser"/>
+    </entity>
     <entity name="SourceRssParser" representedClassName="SourceRssParser" syncable="YES">
         <attribute name="items" attributeType="String" defaultValueString=""/>
         <attribute name="rssUrl" optional="YES" attributeType="String"/>
@@ -141,6 +151,7 @@
         <relationship name="magnetHash" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceMagnetHash" inverseName="parentRssParser" inverseEntity="SourceMagnetHash"/>
         <relationship name="magnetLink" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceMagnetLink" inverseName="parentRssParser" inverseEntity="SourceMagnetLink"/>
         <relationship name="parentSource" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="rssParser" inverseEntity="Source"/>
+        <relationship name="request" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceRequest" inverseName="parentRssParser" inverseEntity="SourceRequest"/>
         <relationship name="seedLeech" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceSeedLeech" inverseName="parentRssParser" inverseEntity="SourceSeedLeech"/>
         <relationship name="size" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceSize" inverseName="parentRssParser" inverseEntity="SourceSize"/>
         <relationship name="subName" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceSubName" inverseName="parentRssParser" inverseEntity="SourceSubName"/>

Ferrite/Extensions/Color.swift

@@ -7,7 +7,7 @@
 
 import SwiftUI
 
-public extension Color {
+extension Color {
     init(hex: String) {
         let hex = hex.trimmingCharacters(in: CharacterSet.alphanumerics.inverted)
         var int: UInt64 = 0

Ferrite/Extensions/Set.swift

@@ -1,5 +1,5 @@
 //
-//  Array.swift
+//  Set.swift
 //  Ferrite
 //
 //  Created by Brian Dashore on 11/26/22.

Ferrite/Extensions/UIDevice.swift

@@ -9,10 +9,6 @@ import UIKit
 
 extension UIDevice {
     var hasNotch: Bool {
-        if #available(iOS 11.0, *) {
+        UIApplication.shared.currentUIWindow?.safeAreaInsets.bottom ?? 0 > 0
-            return UIApplication.shared.currentUIWindow?.safeAreaInsets.bottom ?? 0 > 0
-        } else {
-            return false
-        }
     }
 }

Ferrite/Extensions/View.swift

@@ -5,13 +5,12 @@
 //  Created by Brian Dashore on 8/15/22.
 //
 
-import Introspect
 import SwiftUI
 
 extension View {
     // Modifies properties of a view. Works the same way as a ViewModifier
     // From: https://github.com/SwiftUIX/SwiftUIX/blob/master/Sources/Intermodular/Extensions/SwiftUI/View%2B%2B.swift#L10
-    public func modifyViewProp(_ body: (inout Self) -> Void) -> Self {
+    func modifyViewProp(_ body: (inout Self) -> Void) -> Self {
         var result = self
         body(&result)
 
@@ -20,16 +19,6 @@ extension View {
 
     // MARK: Modifiers
 
-    func conditionalContextMenu(id: some Hashable,
-                                @ViewBuilder _ internalContent: @escaping () -> some View) -> some View
-    {
-        modifier(ConditionalContextMenuModifier(internalContent, id: id))
-    }
-
-    func conditionalId(_ id: some Hashable) -> some View {
-        modifier(ConditionalIdModifier(id: id))
-    }
-
     func disabledAppearance(_ disabled: Bool, dimmedOpacity: Double? = nil, animation: Animation? = nil) -> some View {
         modifier(DisabledAppearanceModifier(disabled: disabled, dimmedOpacity: dimmedOpacity, animation: animation))
     }

Ferrite/Info.plist

@@ -24,7 +24,7 @@
 			<string>Ferrite</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>ferrite://</string>
+				<string>ferrite</string>
 			</array>
 		</dict>
 	</array>

Ferrite/Models/ActionModels.swift

@@ -7,30 +7,30 @@
 
 import Foundation
 
-public struct ActionJson: Codable, Hashable, PluginJson {
+struct ActionJson: Codable, Hashable, PluginJson {
-    public let name: String
+    let name: String
-    public let version: Int16
+    let version: Int16
     let minVersion: String?
     let about: String?
     let website: String?
     let requires: [ActionRequirement]
     let deeplink: [DeeplinkActionJson]?
-    public let author: String?
+    let author: String?
-    public let listId: UUID?
+    let listId: UUID?
-    public let listName: String?
+    let listName: String?
-    public let tags: [PluginTagJson]?
+    let tags: [PluginTagJson]?
 
-    public init(name: String,
+    init(name: String,
-                version: Int16,
+         version: Int16,
-                minVersion: String?,
+         minVersion: String?,
-                about: String?,
+         about: String?,
-                website: String?,
+         website: String?,
-                requires: [ActionRequirement],
+         requires: [ActionRequirement],
-                deeplink: [DeeplinkActionJson]?,
+         deeplink: [DeeplinkActionJson]?,
-                author: String?,
+         author: String?,
-                listId: UUID?,
+         listId: UUID?,
-                listName: String?,
+         listName: String?,
-                tags: [PluginTagJson]?)
+         tags: [PluginTagJson]?)
     {
         self.name = name
         self.version = version
@@ -45,7 +45,7 @@ public struct ActionJson: Codable, Hashable, PluginJson {
         self.tags = tags
     }
 
-    public init(from decoder: Decoder) throws {
+    init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         name = try container.decode(String.self, forKey: .name)
         version = try container.decode(Int16.self, forKey: .version)
@@ -68,7 +68,7 @@ public struct ActionJson: Codable, Hashable, PluginJson {
     }
 }
 
-public struct DeeplinkActionJson: Codable, Hashable {
+struct DeeplinkActionJson: Codable, Hashable {
     let os: [String]
     let scheme: String
 
@@ -77,7 +77,7 @@ public struct DeeplinkActionJson: Codable, Hashable {
         self.scheme = scheme
     }
 
-    public init(from decoder: Decoder) throws {
+    init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
 
         if let os = try? container.decode(String.self, forKey: .os) {
@@ -92,7 +92,7 @@ public struct DeeplinkActionJson: Codable, Hashable {
     }
 }
 
-public extension ActionJson {
+extension ActionJson {
     // Fetches all tags without optional requirement
     // Avoids the need for extra tag additions in DB
     func getTags() -> [PluginTagJson] {
@@ -100,7 +100,7 @@ public extension ActionJson {
     }
 }
 
-public enum ActionRequirement: String, Codable {
+enum ActionRequirement: String, Codable {
     case magnet
     case debrid
 }

Ferrite/Models/AllDebridModels.swift

@@ -7,21 +7,7 @@
 
 import Foundation
 
-public extension AllDebrid {
+extension AllDebrid {
-    // MARK: - Errors
-
-    // TODO: Hybridize debrid errors in one structure
-    enum ADError: Error {
-        case InvalidUrl
-        case InvalidPostBody
-        case InvalidResponse
-        case InvalidToken
-        case EmptyData
-        case EmptyTorrents
-        case FailedRequest(description: String)
-        case AuthQuery(description: String)
-    }
-
     // MARK: - Generic AllDebrid response
 
     // Uses a generic parametr for whatever underlying response is present
@@ -67,7 +53,7 @@ public extension AllDebrid {
 
     // MARK: - AddMagnetData
 
-    internal struct AddMagnetData: Codable {
+    struct AddMagnetData: Codable {
         let magnet, hash, name, filenameOriginal: String
         let size: Int
         let ready: Bool
@@ -85,7 +71,7 @@ public extension AllDebrid {
     struct MagnetStatusResponse: Codable {
         let magnets: [MagnetStatusData]
 
-        public init(from decoder: Decoder) throws {
+        init(from decoder: Decoder) throws {
             let container = try decoder.container(keyedBy: CodingKeys.self)
 
             if let data = try? container.decode(MagnetStatusData.self, forKey: .magnets) {
@@ -117,7 +103,7 @@ public extension AllDebrid {
     // MARK: - MagnetStatusLink
 
     // Abridged for required parameters
-    internal struct MagnetStatusLink: Codable {
+    struct MagnetStatusLink: Codable {
         let link: String
         let filename: String
         let size: Int
@@ -151,7 +137,7 @@ public extension AllDebrid {
 
     // MARK: - IAMagnetResponse
 
-    internal struct InstantAvailabilityMagnet: Codable {
+    struct InstantAvailabilityMagnet: Codable {
         let magnet, hash: String
         let instant: Bool
         let files: [InstantAvailabilityFile]?
@@ -159,7 +145,7 @@ public extension AllDebrid {
 
     // MARK: - IAFileResponse
 
-    internal struct InstantAvailabilityFile: Codable {
+    struct InstantAvailabilityFile: Codable {
         let name: String
 
         enum CodingKeys: String, CodingKey {

Ferrite/Models/BackupModels.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 // Version is optional until v1 is phased out
-public struct Backup: Codable {
+struct Backup: Codable {
     let version: Int?
     var bookmarks: [BookmarkJson]?
     var history: [HistoryJson]?

Ferrite/Models/DebridManagerModels.swift

@@ -10,7 +10,7 @@ import Foundation
 
 // MARK: - Universal IA enum (IA = InstantAvailability)
 
-public enum IAStatus: String, Codable, Hashable, Sendable, CaseIterable {
+enum IAStatus: String, Codable, Hashable, Sendable, CaseIterable {
     case full = "Cached"
     case partial = "Batch"
     case none = "Uncached"
@@ -18,7 +18,7 @@ public enum IAStatus: String, Codable, Hashable, Sendable, CaseIterable {
 
 // MARK: - Enum for debrid differentiation. 0 is nil
 
-public enum DebridType: Int, Codable, Hashable, CaseIterable {
+enum DebridType: Int, Codable, Hashable, CaseIterable {
     case realDebrid = 1
     case allDebrid = 2
     case premiumize = 3
@@ -47,7 +47,7 @@ public enum DebridType: Int, Codable, Hashable, CaseIterable {
 }
 
 // Wrapper struct for magnet links to contain both the link and hash for easy access
-public struct Magnet: Codable, Hashable, Sendable {
+struct Magnet: Codable, Hashable, Sendable {
     var hash: String?
     var link: String?
 
@@ -55,12 +55,14 @@ public struct Magnet: Codable, Hashable, Sendable {
         if let hash, link == nil {
             self.hash = parseHash(hash)
             self.link = generateLink(hash: hash, title: title, trackers: trackers)
-        } else if let parsedLink = parseLink(link), hash == nil {
+        } else if let link, hash == nil {
-            self.link = parsedLink
+            let (link, hash) = parseLink(link)
-            self.hash = parseHash(extractHash(link: parsedLink))
+
+            self.link = link
+            self.hash = hash
         } else {
             self.hash = parseHash(hash)
-            self.link = parseLink(link)
+            self.link = parseLink(link).link
         }
     }
 
@@ -108,19 +110,35 @@ public struct Magnet: Codable, Hashable, Sendable {
         }
     }
 
-    func parseLink(_ link: String?) -> String? {
+    func parseLink(_ link: String?, withHash: Bool = false) -> (link: String?, hash: String?) {
-        if let decodedLink = link?.removingPercentEncoding {
+        let separator = "magnet:?xt=urn:btih:"
-            let separator = "magnet:?xt=urn:btih:"
+
-            if decodedLink.starts(with: separator) {
+        // Remove percent encoding from the link and ensure it's a magnet
-                return decodedLink
+        guard let decodedLink = link?.removingPercentEncoding, decodedLink.contains(separator) else {
-            } else if decodedLink.contains(separator) {
+            return (nil, nil)
-                let splitLink = decodedLink.components(separatedBy: separator)
+        }
-                return splitLink.last.map { separator + $0 } ?? nil
+
-            } else {
+        // Isolate the magnet link if it's bundled with another protocol
-                return nil
+        let isolatedLink: String?
-            }
+        if decodedLink.starts(with: separator) {
+            isolatedLink = decodedLink
         } else {
-            return nil
+            let splitLink = decodedLink.components(separatedBy: separator)
+            isolatedLink = splitLink.last.map { separator + $0 }
+        }
+
+        guard let isolatedLink else {
+            return (nil, nil)
+        }
+
+        // If the hash can be extracted, decrypt it if necessary and return the revised link + hash
+        if let originalHash = extractHash(link: isolatedLink),
+           let parsedHash = parseHash(originalHash)
+        {
+            let replacedLink = isolatedLink.replacingOccurrences(of: originalHash, with: parsedHash)
+            return (replacedLink, parsedHash)
+        } else {
+            return (decodedLink, nil)
         }
     }
 }

Ferrite/Models/DebridModels.swift

@@ -7,39 +7,49 @@
 
 import Foundation
 
-public struct DebridIA: Hashable, Sendable {
+struct DebridIA: Hashable, Sendable {
     let magnet: Magnet
-    let source: String
     let expiryTimeStamp: Double
     var files: [DebridIAFile]
 }
 
-public struct DebridIAFile: Hashable, Sendable {
+struct DebridIAFile: Hashable, Sendable {
-    let fileId: Int
+    let id: Int
     let name: String
     let streamUrlString: String?
     let batchIds: [Int]
 
-    init(fileId: Int, name: String, streamUrlString: String? = nil, batchIds: [Int] = []) {
+    init(id: Int, name: String, streamUrlString: String? = nil, batchIds: [Int] = []) {
-        self.fileId = fileId
+        self.id = id
         self.name = name
         self.streamUrlString = streamUrlString
         self.batchIds = batchIds
     }
 }
 
-public struct DebridCloudDownload: Hashable, Sendable {
+struct DebridCloudDownload: Hashable, Sendable {
-    let downloadId: String
+    let id: String
-    let source: String
     let fileName: String
     let link: String
 }
 
-public struct DebridCloudTorrent: Hashable, Sendable {
+struct DebridCloudMagnet: Hashable, Sendable {
-    let torrentId: String
+    let id: String
-    let source: String
     let fileName: String
     let status: String
     let hash: String
     let links: [String]
 }
+
+enum DebridError: Error {
+    case InvalidUrl
+    case InvalidPostBody
+    case InvalidResponse
+    case InvalidToken
+    case EmptyData
+    case EmptyUserMagnets
+    case IsCaching
+    case FailedRequest(description: String)
+    case AuthQuery(description: String)
+    case NotImplemented
+}

Ferrite/Models/GithubModels.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-public extension Github {
+extension Github {
     struct Release: Codable, Hashable, Sendable {
         let htmlUrl: String
         let tagName: String

Ferrite/Models/OffCloudModels.swift

@@ -0,0 +1,70 @@
+//
+//  OffCloudModels.swift
+//  Ferrite
+//
+//  Created by Brian Dashore on 6/12/24.
+//
+
+import Foundation
+
+extension OffCloud {
+    struct ErrorResponse: Codable, Sendable {
+        let error: String
+    }
+
+    struct InstantAvailabilityRequest: Codable, Sendable {
+        let hashes: [String]
+    }
+
+    struct InstantAvailabilityResponse: Codable, Sendable {
+        let cachedItems: [String]
+    }
+
+    struct CloudDownloadRequest: Codable, Sendable {
+        let url: String
+    }
+
+    struct CloudDownloadResponse: Codable, Sendable {
+        let requestId: String
+        let fileName: String
+        let status: String
+        let originalLink: String
+        let url: String
+    }
+
+    enum CloudExploreResponse: Codable {
+        case links([String])
+        case error(ErrorResponse)
+
+        init(from decoder: Decoder) throws {
+            let container = try decoder.singleValueContainer()
+
+            // Only continue if the data is a List which indicates a success
+            if let linkArray = try? container.decode([String].self) {
+                self = .links(linkArray)
+            } else {
+                let value = try container.decode(ErrorResponse.self)
+                self = .error(value)
+            }
+        }
+
+        func encode(to encoder: Encoder) throws {
+            var container = encoder.singleValueContainer()
+            switch self {
+            case let .links(array):
+                try container.encode(array)
+            case let .error(value):
+                try container.encode(value)
+            }
+        }
+    }
+
+    struct CloudHistoryResponse: Codable, Sendable {
+        let requestId: String
+        let fileName: String
+        let status: String
+        let originalLink: String
+        let isDirectory: Bool
+        let server: String
+    }
+}

Ferrite/Models/PluginModels.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct PluginListJson: Codable {
+struct PluginListJson: Codable {
     let name: String
     let author: String
     var sources: [SourceJson]?
@@ -16,8 +16,8 @@ public struct PluginListJson: Codable {
 
 // Color: Hex value
 public struct PluginTagJson: Codable, Hashable, Sendable {
-    public let name: String
+    let name: String
-    public let colorHex: String?
+    let colorHex: String?
 
     enum CodingKeys: String, CodingKey {
         case name

Ferrite/Models/PremiumizeModels.swift

@@ -7,21 +7,7 @@
 
 import Foundation
 
-public extension Premiumize {
+extension Premiumize {
-    // MARK: - Errors
-
-    // TODO: Hybridize debrid errors in one structure
-    enum PMError: Error {
-        case InvalidUrl
-        case InvalidPostBody
-        case InvalidResponse
-        case InvalidToken
-        case EmptyData
-        case EmptyTorrents
-        case FailedRequest(description: String)
-        case AuthQuery(description: String)
-    }
-
     // MARK: - CacheCheckResponse
 
     struct CacheCheckResponse: Codable {
@@ -33,8 +19,7 @@ public extension Premiumize {
 
     struct DDLResponse: Codable {
         let status: String
-        let content: [DDLData]
+        let content: [DDLData]?
-        let location: String
         let filename: String
         let filesize: Int
     }

Ferrite/Models/RealDebridModels.swift

@@ -8,21 +8,7 @@
 
 import Foundation
 
-public extension RealDebrid {
+extension RealDebrid {
-    // MARK: - Errors
-
-    // TODO: Hybridize debrid errors in one structure
-    enum RDError: Error {
-        case InvalidUrl
-        case InvalidPostBody
-        case InvalidResponse
-        case InvalidToken
-        case EmptyData
-        case EmptyTorrents
-        case FailedRequest(description: String)
-        case AuthQuery(description: String)
-    }
-
     // MARK: - device code endpoint
 
     struct DeviceCodeResponse: Codable, Sendable {
@@ -72,7 +58,7 @@ public extension RealDebrid {
     struct InstantAvailabilityResponse: Codable, Sendable {
         var data: InstantAvailabilityData?
 
-        public init(from decoder: Decoder) throws {
+        init(from decoder: Decoder) throws {
             let container = try decoder.singleValueContainer()
 
             if let data = try? container.decode(InstantAvailabilityData.self) {
@@ -81,11 +67,11 @@ public extension RealDebrid {
         }
     }
 
-    internal struct InstantAvailabilityData: Codable, Sendable {
+    struct InstantAvailabilityData: Codable, Sendable {
         var rd: [[String: InstantAvailabilityInfo]]
     }
 
-    internal struct InstantAvailabilityInfo: Codable, Sendable {
+    struct InstantAvailabilityInfo: Codable, Sendable {
         var filename: String
         var filesize: Int
     }
@@ -110,7 +96,7 @@ public extension RealDebrid {
 
     // MARK: - torrentInfo endpoint
 
-    internal struct TorrentInfoResponse: Codable, Sendable {
+    struct TorrentInfoResponse: Codable, Sendable {
         let id, filename, originalFilename, hash: String
         let bytes, originalBytes: Int
         let host: String
@@ -131,7 +117,7 @@ public extension RealDebrid {
         }
     }
 
-    internal struct TorrentInfoFile: Codable, Sendable {
+    struct TorrentInfoFile: Codable, Sendable {
         let id: Int
         let path: String
         let bytes, selected: Int
@@ -150,7 +136,7 @@ public extension RealDebrid {
 
     // MARK: - unrestrictLink endpoint
 
-    internal struct UnrestrictLinkResponse: Codable, Sendable {
+    struct UnrestrictLinkResponse: Codable, Sendable {
         let id, filename: String
         let mimeType: String?
         let filesize: Int

Ferrite/Models/SearchModels.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 // A raw search result structure displayed on the UI
-public struct SearchResult: Codable, Hashable, Sendable {
+struct SearchResult: Codable, Hashable, Sendable {
     let title: String?
     let source: String
     let size: String?

Ferrite/Models/SourceModels.swift

@@ -7,14 +7,14 @@
 
 import Foundation
 
-public enum ApiCredentialResponseType: String, Codable, Hashable, Sendable {
+enum ApiCredentialResponseType: String, Codable, Hashable, Sendable {
     case json
     case text
 }
 
-public struct SourceJson: Codable, Hashable, Sendable, PluginJson {
+struct SourceJson: Codable, Hashable, Sendable, PluginJson {
-    public let name: String
+    let name: String
-    public let version: Int16
+    let version: Int16
     let minVersion: String?
     let about: String?
     let website: String?
@@ -25,33 +25,33 @@ public struct SourceJson: Codable, Hashable, Sendable, PluginJson {
     let jsonParser: SourceJsonParserJson?
     let rssParser: SourceRssParserJson?
     let htmlParser: SourceHtmlParserJson?
-    public let author: String?
+    let author: String?
-    public let listId: UUID?
+    let listId: UUID?
-    public let listName: String?
+    let listName: String?
-    public let tags: [PluginTagJson]?
+    let tags: [PluginTagJson]?
 }
 
-public extension SourceJson {
+extension SourceJson {
     // Fetches all tags without optional requirement
     func getTags() -> [PluginTagJson] {
         tags ?? []
     }
 }
 
-public enum SourcePreferredParser: Int16, CaseIterable, Sendable {
+enum SourcePreferredParser: Int16, CaseIterable, Sendable {
     // case none = 0
     case scraping = 1
     case rss = 2
     case siteApi = 3
 }
 
-public struct SourceApiJson: Codable, Hashable, Sendable {
+struct SourceApiJson: Codable, Hashable, Sendable {
     let apiUrl: String?
     let clientId: SourceApiCredentialJson?
     let clientSecret: SourceApiCredentialJson?
 }
 
-public struct SourceApiCredentialJson: Codable, Hashable, Sendable {
+struct SourceApiCredentialJson: Codable, Hashable, Sendable {
     let query: String?
     let value: String?
     let dynamic: Bool?
@@ -60,8 +60,9 @@ public struct SourceApiCredentialJson: Codable, Hashable, Sendable {
     let expiryLength: Double?
 }
 
-public struct SourceJsonParserJson: Codable, Hashable, Sendable {
+struct SourceJsonParserJson: Codable, Hashable, Sendable {
     let searchUrl: String
+    let request: SourceRequestJson?
     let results: String?
     let subResults: String?
     let title: SourceComplexQueryJson
@@ -72,9 +73,10 @@ public struct SourceJsonParserJson: Codable, Hashable, Sendable {
     let sl: SourceSLJson?
 }
 
-public struct SourceRssParserJson: Codable, Hashable, Sendable {
+struct SourceRssParserJson: Codable, Hashable, Sendable {
     let rssUrl: String?
     let searchUrl: String
+    let request: SourceRequestJson?
     let items: String
     let title: SourceComplexQueryJson
     let magnetHash: SourceComplexQueryJson?
@@ -84,8 +86,9 @@ public struct SourceRssParserJson: Codable, Hashable, Sendable {
     let sl: SourceSLJson?
 }
 
-public struct SourceHtmlParserJson: Codable, Hashable, Sendable {
+struct SourceHtmlParserJson: Codable, Hashable, Sendable {
     let searchUrl: String?
+    let request: SourceRequestJson?
     let rows: String
     let title: SourceComplexQueryJson
     let magnet: SourceMagnetJson
@@ -94,21 +97,21 @@ public struct SourceHtmlParserJson: Codable, Hashable, Sendable {
     let sl: SourceSLJson?
 }
 
-public struct SourceComplexQueryJson: Codable, Hashable, Sendable {
+struct SourceComplexQueryJson: Codable, Hashable, Sendable {
     let query: String
     let discriminator: String?
     let attribute: String?
     let regex: String?
 }
 
-public struct SourceMagnetJson: Codable, Hashable, Sendable {
+struct SourceMagnetJson: Codable, Hashable, Sendable {
     let query: String
     let attribute: String
     let regex: String?
     let externalLinkQuery: String?
 }
 
-public struct SourceSLJson: Codable, Hashable, Sendable {
+struct SourceSLJson: Codable, Hashable, Sendable {
     let seeders: String?
     let leechers: String?
     let combined: String?
@@ -117,3 +120,9 @@ public struct SourceSLJson: Codable, Hashable, Sendable {
     let seederRegex: String?
     let leecherRegex: String?
 }
+
+struct SourceRequestJson: Codable, Hashable, Sendable {
+    let method: String?
+    let headers: [String: String]?
+    let body: String?
+}

Ferrite/Models/TorBoxModels.swift

@@ -0,0 +1,110 @@
+//
+//  TorBoxModels.swift
+//  Ferrite
+//
+//  Created by Brian Dashore on 6/11/24.
+//
+
+import Foundation
+
+extension TorBox {
+    struct TBResponse<TBData: Codable>: Codable {
+        let success: Bool
+        let detail: String
+        let data: TBData?
+    }
+
+    // MARK: - InstantAvailability
+
+    enum InstantAvailabilityData: Codable {
+        case links([InstantAvailabilityDataObject])
+        case failure(InstantAvailabilityDataFailure)
+
+        init(from decoder: Decoder) throws {
+            let container = try decoder.singleValueContainer()
+
+            // Only continue if the data is a List which indicates a success
+            if let linkArray = try? container.decode([InstantAvailabilityDataObject].self) {
+                self = .links(linkArray)
+            } else {
+                let value = try container.decode(InstantAvailabilityDataFailure.self)
+                self = .failure(value)
+            }
+        }
+
+        func encode(to encoder: Encoder) throws {
+            var container = encoder.singleValueContainer()
+            switch self {
+            case let .links(array):
+                try container.encode(array)
+            case let .failure(value):
+                try container.encode(value)
+            }
+        }
+    }
+
+    struct InstantAvailabilityDataObject: Codable, Sendable {
+        let name: String
+        let size: Int
+        let hash: String
+        let files: [InstantAvailabilityFile]
+    }
+
+    struct InstantAvailabilityFile: Codable, Sendable {
+        let name: String
+        let size: Int
+    }
+
+    struct InstantAvailabilityDataFailure: Codable, Sendable {
+        let data: Bool
+    }
+
+    struct CreateTorrentResponse: Codable, Sendable {
+        let hash: String
+        let torrentId: Int
+        let authId: String
+
+        enum CodingKeys: String, CodingKey {
+            case hash
+            case torrentId = "torrent_id"
+            case authId = "auth_id"
+        }
+    }
+
+    struct MyTorrentListResponse: Codable, Sendable {
+        let id: Int
+        let hash: String
+        let name: String
+        let downloadState: String
+        let files: [MyTorrentListFile]
+
+        enum CodingKeys: String, CodingKey {
+            case id, hash, name, files
+            case downloadState = "download_state"
+        }
+    }
+
+    struct MyTorrentListFile: Codable, Sendable {
+        let id: Int
+        let hash: String
+        let name: String
+        let shortName: String
+
+        enum CodingKeys: String, CodingKey {
+            case id, hash, name
+            case shortName = "short_name"
+        }
+    }
+
+    typealias RequestDLResponse = String
+
+    struct ControlTorrentRequest: Codable, Sendable {
+        let torrentId: String
+        let operation: String
+
+        enum CodingKeys: String, CodingKey {
+            case operation
+            case torrentId = "torrent_id"
+        }
+    }
+}

Ferrite/Protocols/Debrid.swift

@@ -7,32 +7,66 @@
 
 import Foundation
 
-public protocol DebridSource {
+protocol DebridSource: AnyObservableObject {
     // ID of the service
+    // var id: DebridInfo { get }
     var id: String { get }
     var abbreviation: String { get }
     var website: String { get }
+    var description: String? { get }
+    var cachedStatus: [String] { get }
+
+    // Auth variables
+    var authProcessing: Bool { get set }
+    var isLoggedIn: Bool { get }
+
+    // Manual API key
+    var manualToken: String? { get }
+
+    // Instant availability variables
+    var IAValues: [DebridIA] { get set }
+
+    // Cloud variables
+    var cloudDownloads: [DebridCloudDownload] { get set }
+    var cloudMagnets: [DebridCloudMagnet] { get set }
+    var cloudTTL: Double { get set }
 
     // Common authentication functions
-    func setApiKey(_ key: String) -> Bool
+    func setApiKey(_ key: String)
     func logout() async
 
-    func instantAvailability(magnets: [Magnet]) async throws -> [DebridIA]
+    // Instant availability functions
+    func instantAvailability(magnets: [Magnet]) async throws
 
     // Fetches a download link from a source
     // Include the instant availability information with the args
-    func getDownloadLink(magnet: Magnet, ia: DebridIA?, iaFile: DebridIAFile?) async throws -> String
+    // Cloud magnets also checked here
+    func getRestrictedFile(magnet: Magnet, ia: DebridIA?, iaFile: DebridIAFile?) async throws -> (restrictedFile: DebridIAFile?, newIA: DebridIA?)
 
-    // Fetches cloud information from the service
+    // Unrestricts a locked file
-    func getUserDownloads() async throws -> [DebridCloudDownload]
+    func unrestrictFile(_ restrictedFile: DebridIAFile) async throws -> String
-    func getUserTorrents() async throws -> [DebridCloudTorrent]
 
-    // Deletes information from the service
+    // User downloads functions
-    func deleteDownload(downloadId: String) async throws
+    func getUserDownloads() async throws
-    func deleteTorrent(torrentId: String) async throws
+    func checkUserDownloads(link: String) async throws -> String?
+    func deleteUserDownload(downloadId: String) async throws
+
+    // User magnet functions
+    func getUserMagnets() async throws
+    func deleteUserMagnet(cloudMagnetId: String?) async throws
 }
 
-public protocol PollingDebridSource: DebridSource {
+extension DebridSource {
+    var description: String? {
+        nil
+    }
+
+    var cachedStatus: [String] {
+        []
+    }
+}
+
+protocol PollingDebridSource: DebridSource {
     // Task reference for polling
     var authTask: Task<Void, Error>? { get set }
 
@@ -40,7 +74,7 @@ public protocol PollingDebridSource: DebridSource {
     func getAuthUrl() async throws -> URL
 }
 
-public protocol OAuthDebridSource: DebridSource {
+protocol OAuthDebridSource: DebridSource {
     // Fetches the auth URL
     func getAuthUrl() throws -> URL
 

Ferrite/Protocols/Plugin.swift

@@ -8,7 +8,7 @@
 import CoreData
 import Foundation
 
-public protocol Plugin: ObservableObject, NSManagedObject {
+protocol Plugin: ObservableObject, NSManagedObject {
     var id: UUID { get set }
     var listId: UUID? { get set }
     var name: String { get set }
@@ -27,7 +27,7 @@ extension Plugin {
     }
 }
 
-public protocol PluginJson: Hashable {
+protocol PluginJson: Hashable {
     var name: String { get }
     var version: Int16 { get }
     var author: String? { get }

Ferrite/Utils/Application.swift

@@ -9,7 +9,7 @@
 
 import Foundation
 
-public class Application {
+class Application {
     static let shared = Application()
 
     // OS name for Plugins to read. Lowercase for ease of use

Ferrite/Utils/FormDataBody.swift

@@ -0,0 +1,27 @@
+//
+//  FormDataBody.swift
+//  Ferrite
+//
+//  Created by Brian Dashore on 6/12/24.
+//
+
+import Foundation
+
+struct FormDataBody {
+    let boundary: String = UUID().uuidString
+    let body: Data
+
+    init(params: [String: String]) {
+        var body = Data()
+
+        for (key, value) in params {
+            body.append("--\(boundary)\r\n".data(using: .utf8)!)
+            body.append("Content-Disposition: form-data; name=\"\(key)\"\r\n\r\n".data(using: .utf8)!)
+            body.append("\(value)\r\n".data(using: .utf8)!)
+        }
+
+        body.append("--\(boundary)--\r\n".data(using: .utf8)!)
+
+        self.body = body
+    }
+}

Ferrite/Utils/Store.swift

@@ -0,0 +1,147 @@
+//
+//  Store.swift
+//  Ferrite
+//
+//
+//  Originally created by William Baker on 09/06/2022.
+//  https://github.com/Tiny-Home-Consulting/Dependiject/blob/master/Dependiject/Store.swift
+//  Copyright (c) 2022 Tiny Home Consulting LLC. All rights reserved.
+//
+//  Combined together by Brian Dashore
+//
+//  TODO: Replace with Observable when minVersion >= iOS 17
+//
+
+import Combine
+import SwiftUI
+
+class ErasedObservableObject: ObservableObject {
+    let objectWillChange: AnyPublisher<Void, Never>
+
+    init(objectWillChange: AnyPublisher<Void, Never>) {
+        self.objectWillChange = objectWillChange
+    }
+
+    static func empty() -> ErasedObservableObject {
+        .init(objectWillChange: Empty().eraseToAnyPublisher())
+    }
+}
+
+protocol AnyObservableObject: AnyObject {
+    var objectWillChange: ObservableObjectPublisher { get }
+}
+
+// The generic type names were chosen to match the SwiftUI equivalents:
+// - ObjectType from StateObject<ObjectType> and ObservedObject<ObjectType>
+// - Subject from ObservedObject.Wrapper.subscript<Subject>(dynamicMember:)
+// - S from Publisher.receive<S>(on:options:)
+
+/// A property wrapper used to wrap injected observable objects.
+///
+/// This is similar to SwiftUI's
+/// [`StateObject`](https://developer.apple.com/documentation/swiftui/stateobject), but without
+/// compile-time type restrictions. The lack of compile-time restrictions means that `ObjectType`
+/// may be a protocol rather than a class.
+///
+/// - Important: At runtime, the wrapped value must conform to ``AnyObservableObject``.
+///
+/// To pass properties of the observable object down the view hierarchy as bindings, use the
+/// projected value:
+/// ```swift
+/// struct ExampleView: View {
+///     @Store var viewModel = Factory.shared.resolve(ViewModelProtocol.self)
+///
+///     var body: some View {
+///         TextField("username", text: $viewModel.username)
+///     }
+/// }
+/// ```
+/// Not all injected objects need this property wrapper. See the example projects for examples each
+/// way.
+@propertyWrapper
+struct Store<ObjectType> {
+    /// The underlying object being stored.
+    let wrappedValue: ObjectType
+
+    // See https://github.com/Tiny-Home-Consulting/Dependiject/issues/38
+    fileprivate var _observableObject: ObservedObject<ErasedObservableObject>
+
+    @MainActor var observableObject: ErasedObservableObject {
+        _observableObject.wrappedValue
+    }
+
+    /// A projected value which has the same properties as the wrapped value, but presented as
+    /// bindings.
+    ///
+    /// Use this to pass bindings down the view hierarchy:
+    /// ```swift
+    /// struct ExampleView: View {
+    ///     @Store var viewModel = Factory.shared.resolve(ViewModelProtocol.self)
+    ///
+    ///     var body: some View {
+    ///         TextField("username", text: $viewModel.username)
+    ///     }
+    /// }
+    /// ```
+    var projectedValue: Wrapper {
+        Wrapper(self)
+    }
+
+    /// Create a stored value on a custom scheduler.
+    ///
+    /// Use this init to schedule updates on a specific scheduler other than `DispatchQueue.main`.
+    init<S: Scheduler>(wrappedValue: ObjectType,
+                       on scheduler: S,
+                       schedulerOptions: S.SchedulerOptions? = nil)
+    {
+        self.wrappedValue = wrappedValue
+
+        if let observable = wrappedValue as? AnyObservableObject {
+            let objectWillChange = observable.objectWillChange
+                .receive(on: scheduler, options: schedulerOptions)
+                .eraseToAnyPublisher()
+            _observableObject = .init(initialValue: .init(objectWillChange: objectWillChange))
+        } else {
+            assertionFailure(
+                "Only use the Store property wrapper with objects conforming to AnyObservableObject."
+            )
+            _observableObject = .init(initialValue: .empty())
+        }
+    }
+
+    /// Create a stored value which publishes on the main thread.
+    ///
+    /// To control when updates are published, see ``init(wrappedValue:on:schedulerOptions:)``.
+    init(wrappedValue: ObjectType) {
+        self.init(wrappedValue: wrappedValue, on: DispatchQueue.main)
+    }
+
+    /// An equivalent to SwiftUI's
+    /// [`ObservedObject.Wrapper`](https://developer.apple.com/documentation/swiftui/observedobject/wrapper)
+    /// type.
+    @dynamicMemberLookup
+    struct Wrapper {
+        private var store: Store
+
+        init(_ store: Store<ObjectType>) {
+            self.store = store
+        }
+
+        /// Returns a binding to the resulting value of a given key path.
+        subscript<Subject>(
+            dynamicMember keyPath: ReferenceWritableKeyPath<ObjectType, Subject>
+        ) -> Binding<Subject> {
+            Binding {
+                self.store.wrappedValue[keyPath: keyPath]
+            } set: {
+                self.store.wrappedValue[keyPath: keyPath] = $0
+            }
+        }
+    }
+}
+
+extension Store: DynamicProperty {
+    nonisolated mutating func update() {
+        _observableObject.update()
+    }
+}

Ferrite/ViewModels/BackupManager.swift

@@ -7,9 +7,9 @@
 
 import Foundation
 
-public class BackupManager: ObservableObject {
+class BackupManager: ObservableObject {
     // Constant variable for backup versions
-    let latestBackupVersion: Int = 2
+    private let latestBackupVersion: Int = 2
 
     var logManager: LoggingManager?
 
@@ -21,17 +21,17 @@ public class BackupManager: ObservableObject {
     @Published var selectedBackupUrl: URL?
 
     @MainActor
-    func updateRestoreCompletedMessage(newString: String) {
+    private func updateRestoreCompletedMessage(newString: String) {
         restoreCompletedMessage.append(newString)
     }
 
     @MainActor
-    func toggleRestoreCompletedAlert() {
+    private func toggleRestoreCompletedAlert() {
         showRestoreCompletedAlert.toggle()
     }
 
     @MainActor
-    func updateBackupUrls(newUrl: URL) {
+    private func updateBackupUrls(newUrl: URL) {
         backupUrls.append(newUrl)
     }
 

Ferrite/ViewModels/LoggingManager.swift

@@ -1,5 +1,5 @@
 //
-//  ToastViewModel.swift
+//  LoggingManager.swift
 //  Ferrite
 //
 //  Created by Brian Dashore on 7/19/22.
@@ -70,8 +70,8 @@ class LoggingManager: ObservableObject {
 
     // TODO: Maybe append to a constant logfile?
 
-    public func info(_ message: String,
+    func info(_ message: String,
-                     description: String? = nil)
+              description: String? = nil)
     {
         let log = Log(
             level: .info,
@@ -88,8 +88,8 @@ class LoggingManager: ObservableObject {
         print("LOG: \(log.toMessage())")
     }
 
-    public func warn(_ message: String,
+    func warn(_ message: String,
-                     description: String? = nil)
+              description: String? = nil)
     {
         let log = Log(
             level: .warn,
@@ -106,9 +106,9 @@ class LoggingManager: ObservableObject {
         print("LOG: \(log.toMessage())")
     }
 
-    public func error(_ message: String,
+    func error(_ message: String,
-                      description: String? = nil,
+               description: String? = nil,
-                      showToast: Bool = true)
+               showToast: Bool = true)
     {
         let log = Log(
             level: .error,
@@ -121,7 +121,7 @@ class LoggingManager: ObservableObject {
             if let description {
                 toastDescription = description
             } else if showErrorToasts {
-                toastDescription = "An error was logged"
+                toastDescription = "An error was logged. Please look at logs in Settings."
             }
         }
 
@@ -132,7 +132,7 @@ class LoggingManager: ObservableObject {
 
     // MARK: - Indeterminate functions
 
-    public func updateIndeterminateToast(_ description: String, cancelAction: (() -> Void)?) {
+    func updateIndeterminateToast(_ description: String, cancelAction: (() -> Void)?) {
         indeterminateToastDescription = description
 
         if let cancelAction {
@@ -144,13 +144,13 @@ class LoggingManager: ObservableObject {
         }
     }
 
-    public func hideIndeterminateToast() {
+    func hideIndeterminateToast() {
         showIndeterminateToast = false
         indeterminateToastDescription = ""
         indeterminateCancelAction = nil
     }
 
-    public func exportLogs() {
+    func exportLogs() {
         logFormatter.dateFormat = "yyyy-MM-dd-HHmmss"
         let logFileName = "ferrite_session_\(logFormatter.string(from: Date())).txt"
         let logFolderPath = FileManager.default.appDirectory.appendingPathComponent("Logs")

Ferrite/ViewModels/NavigationViewModel.swift

@@ -8,12 +8,12 @@
 import SwiftUI
 
 @MainActor
-public class NavigationViewModel: ObservableObject {
+class NavigationViewModel: ObservableObject {
     var logManager: LoggingManager?
 
     // Used between SearchResultsView and MagnetChoiceView
-    public enum ChoiceSheetType: Identifiable {
+    enum ChoiceSheetType: Identifiable {
-        public var id: Int {
+        var id: Int {
             hashValue
         }
 
@@ -53,7 +53,7 @@ public class NavigationViewModel: ObservableObject {
     @Published var currentSortFilter: SortFilter?
     @Published var currentSortOrder: SortOrder = .forward
 
-    public func compareSearchResult(lhs: SearchResult, rhs: SearchResult) -> Bool {
+    func compareSearchResult(lhs: SearchResult, rhs: SearchResult) -> Bool {
         switch currentSortFilter {
         case .leechers:
             guard let lhsLeechers = lhs.leechers, let rhsLeechers = rhs.leechers else {
@@ -97,7 +97,7 @@ public class NavigationViewModel: ObservableObject {
 
     @Published var searchPrompt: String = "Search"
     @Published var lastSearchPromptIndex: Int = -1
-    let searchBarTextArray: [String] = [
+    private let searchBarTextArray: [String] = [
         "What's on your mind?",
         "Discover something interesting",
         "Find an engaging show",

Ferrite/ViewModels/PluginManager.swift

@@ -1,5 +1,5 @@
 //
-//  SourceManager.swift
+//  PluginManager.swift
 //  Ferrite
 //
 //  Created by Brian Dashore on 7/25/22.
@@ -9,7 +9,7 @@ import Foundation
 import SwiftUI
 import Yams
 
-public class PluginManager: ObservableObject {
+class PluginManager: ObservableObject {
     var logManager: LoggingManager?
     let kodi: Kodi = .init()
 
@@ -25,18 +25,18 @@ public class PluginManager: ObservableObject {
     @Published var actionSuccessAlertMessage: String = ""
 
     @MainActor
-    func cleanAvailablePlugins() {
+    private func cleanAvailablePlugins() {
         availableSources = []
         availableActions = []
     }
 
     @MainActor
-    func updateAvailablePlugins(_ newPlugins: AvailablePlugins) {
+    private func updateAvailablePlugins(_ newPlugins: AvailablePlugins) {
         availableSources += newPlugins.availableSources
         availableActions += newPlugins.availableActions
     }
 
-    public func fetchPluginsFromUrl() async {
+    func fetchPluginsFromUrl() async {
         let pluginListRequest = PluginList.fetchRequest()
         guard let pluginLists = try? PersistenceController.shared.backgroundContext.fetch(pluginListRequest) else {
             await logManager?.error("PluginManager: No plugin lists found")
@@ -97,7 +97,7 @@ public class PluginManager: ObservableObject {
         await logManager?.info("Plugin list fetch finished")
     }
 
-    func fetchPluginList(pluginList: PluginList, url: URL) async throws -> AvailablePlugins? {
+    private func fetchPluginList(pluginList: PluginList, url: URL) async throws -> AvailablePlugins? {
         var tempSources: [SourceJson] = []
         var tempActions: [ActionJson] = []
 
@@ -176,7 +176,7 @@ public class PluginManager: ObservableObject {
     }
 
     // Checks if a deeplink action is present and if there's a single action for the OS (or fallback)
-    func getFilteredDeeplinks(_ deeplinks: [DeeplinkActionJson]) -> [DeeplinkActionJson]? {
+    private func getFilteredDeeplinks(_ deeplinks: [DeeplinkActionJson]) -> [DeeplinkActionJson]? {
         let osArray = deeplinks.filter { deeplink in
             deeplink.os.contains(where: { $0.lowercased() == Application.shared.os.lowercased() })
         }
@@ -244,7 +244,7 @@ public class PluginManager: ObservableObject {
             }
     }
 
-    func fetchCastedPlugins<PJ: PluginJson>(_ forType: PJ.Type) -> [PJ] {
+    private func fetchCastedPlugins<PJ: PluginJson>(_ forType: PJ.Type) -> [PJ] {
         switch String(describing: PJ.self) {
         case "SourceJson":
             return availableSources as? [PJ] ?? []
@@ -256,7 +256,7 @@ public class PluginManager: ObservableObject {
     }
 
     // Checks if the current app version is supported by the source
-    func checkAppVersion(minVersion: String?) -> Bool {
+    private func checkAppVersion(minVersion: String?) -> Bool {
         // If there's no min version, assume that every version is supported
         guard let minVersion else {
             return true
@@ -266,7 +266,7 @@ public class PluginManager: ObservableObject {
     }
 
     // Fetches sources using the background context
-    public func fetchInstalledSources(searchResultsEmpty: Bool) -> [Source] {
+    func fetchInstalledSources(searchResultsEmpty: Bool) -> [Source] {
         let backgroundContext = PersistenceController.shared.backgroundContext
 
         if !filteredInstalledSources.isEmpty, !searchResultsEmpty {
@@ -279,7 +279,7 @@ public class PluginManager: ObservableObject {
     }
 
     @MainActor
-    public func runDefaultAction(urlString: String?, navModel: NavigationViewModel) {
+    func runDefaultAction(urlString: String?, navModel: NavigationViewModel) {
         let context = PersistenceController.shared.backgroundContext
 
         guard let urlString else {
@@ -332,7 +332,7 @@ public class PluginManager: ObservableObject {
 
     // The iOS version of Ferrite only runs deeplink actions
     @MainActor
-    public func runDeeplinkAction(_ action: Action, urlString: String?) {
+    func runDeeplinkAction(_ action: Action, urlString: String?) {
         guard let deeplink = action.deeplink, let urlString else {
             actionErrorAlertMessage = "Could not run action: \(action.name) since there is no deeplink to execute. Contact the action dev!"
             showActionErrorAlert.toggle()
@@ -355,7 +355,7 @@ public class PluginManager: ObservableObject {
     }
 
     @MainActor
-    public func sendToKodi(urlString: String?, server: KodiServer) async {
+    func sendToKodi(urlString: String?, server: KodiServer) async {
         guard let urlString else {
             actionErrorAlertMessage = "Could not send URL to Kodi since there is no playback URL to send"
             showActionErrorAlert.toggle()
@@ -380,7 +380,7 @@ public class PluginManager: ObservableObject {
         }
     }
 
-    public func installAction(actionJson: ActionJson?, doUpsert: Bool = false) async {
+    func installAction(actionJson: ActionJson?, doUpsert: Bool = false) async {
         guard let actionJson else {
             await logManager?.error("Action addition: No action present. Contact the app dev!")
             return
@@ -448,7 +448,7 @@ public class PluginManager: ObservableObject {
         }
     }
 
-    public func installSource(sourceJson: SourceJson?, doUpsert: Bool = false) async {
+    func installSource(sourceJson: SourceJson?, doUpsert: Bool = false) async {
         guard let sourceJson else {
             await logManager?.error("Source addition: No source present. Contact the app dev!")
             return
@@ -535,7 +535,7 @@ public class PluginManager: ObservableObject {
         }
     }
 
-    func addSourceApi(newSource: Source, apiJson: SourceApiJson) {
+    private func addSourceApi(newSource: Source, apiJson: SourceApiJson) {
         let backgroundContext = PersistenceController.shared.backgroundContext
 
         let newSourceApi = SourceApi(context: backgroundContext)
@@ -570,7 +570,8 @@ public class PluginManager: ObservableObject {
         newSource.api = newSourceApi
     }
 
-    func addJsonParser(newSource: Source, jsonParserJson: SourceJsonParserJson) {
+    // TODO: Migrate parser addition to a common protocol
+    private func addJsonParser(newSource: Source, jsonParserJson: SourceJsonParserJson) {
         let backgroundContext = PersistenceController.shared.backgroundContext
 
         let newSourceJsonParser = SourceJsonParser(context: backgroundContext)
@@ -578,6 +579,13 @@ public class PluginManager: ObservableObject {
         newSourceJsonParser.results = jsonParserJson.results
         newSourceJsonParser.subResults = jsonParserJson.subResults
 
+        if let requestJson = newSourceJsonParser.request {
+            let newParserRequest = SourceRequest(context: backgroundContext)
+            newParserRequest.method = requestJson.method
+            newParserRequest.headers = requestJson.headers
+            newParserRequest.body = requestJson.body
+        }
+
         // Tune these complex queries to the final JSON parser format
         if let magnetLinkJson = jsonParserJson.magnetLink {
             let newSourceMagnetLink = SourceMagnetLink(context: backgroundContext)
@@ -638,7 +646,7 @@ public class PluginManager: ObservableObject {
         newSource.jsonParser = newSourceJsonParser
     }
 
-    func addRssParser(newSource: Source, rssParserJson: SourceRssParserJson) {
+    private func addRssParser(newSource: Source, rssParserJson: SourceRssParserJson) {
         let backgroundContext = PersistenceController.shared.backgroundContext
 
         let newSourceRssParser = SourceRssParser(context: backgroundContext)
@@ -646,6 +654,13 @@ public class PluginManager: ObservableObject {
         newSourceRssParser.searchUrl = rssParserJson.searchUrl
         newSourceRssParser.items = rssParserJson.items
 
+        if let requestJson = newSourceRssParser.request {
+            let newParserRequest = SourceRequest(context: backgroundContext)
+            newParserRequest.method = requestJson.method
+            newParserRequest.headers = requestJson.headers
+            newParserRequest.body = requestJson.body
+        }
+
         if let magnetLinkJson = rssParserJson.magnetLink {
             let newSourceMagnetLink = SourceMagnetLink(context: backgroundContext)
             newSourceMagnetLink.query = magnetLinkJson.query
@@ -710,7 +725,7 @@ public class PluginManager: ObservableObject {
         newSource.rssParser = newSourceRssParser
     }
 
-    func addHtmlParser(newSource: Source, htmlParserJson: SourceHtmlParserJson) {
+    private func addHtmlParser(newSource: Source, htmlParserJson: SourceHtmlParserJson) {
         let backgroundContext = PersistenceController.shared.backgroundContext
 
         let newSourceHtmlParser = SourceHtmlParser(context: backgroundContext)
@@ -726,6 +741,16 @@ public class PluginManager: ObservableObject {
             newSourceHtmlParser.subName = newSourceSubName
         }
 
+        if let requestJson = htmlParserJson.request {
+            print(requestJson)
+            let newParserRequest = SourceRequest(context: backgroundContext)
+            newParserRequest.method = requestJson.method
+            newParserRequest.headers = requestJson.headers
+            newParserRequest.body = requestJson.body
+
+            newSourceHtmlParser.request = newParserRequest
+        }
+
         // Adds a title complex query
         let newSourceTitle = SourceTitle(context: backgroundContext)
         newSourceTitle.query = htmlParserJson.title.query
@@ -770,7 +795,7 @@ public class PluginManager: ObservableObject {
 
     // Adds a plugin list
     // Can move this to PersistenceController if needed
-    public func addPluginList(_ urlString: String, isSheet: Bool = false, existingPluginList: PluginList? = nil) async throws {
+    func addPluginList(_ urlString: String, isSheet: Bool = false, existingPluginList: PluginList? = nil) async throws {
         let backgroundContext = PersistenceController.shared.backgroundContext
 
         if urlString.isEmpty || !urlString.starts(with: "https://") && !urlString.starts(with: "http://") {

Ferrite/ViewModels/ScrapingViewModel.swift

@@ -27,18 +27,18 @@ class ScrapingViewModel: ObservableObject {
 
     // Only add results with valid magnet hashes to the search results array
     @MainActor
-    func updateSearchResults(newResults: [SearchResult]) {
+    private func updateSearchResults(newResults: [SearchResult]) {
         searchResults += newResults
     }
 
     @MainActor
-    func clearSearchResults() {
+    private func clearSearchResults() {
         searchResults = []
     }
 
     @Published var currentSourceNames: Set<String> = []
     @MainActor
-    func updateCurrentSourceNames(_ newName: String) {
+    private func updateCurrentSourceNames(_ newName: String) {
         currentSourceNames.insert(newName)
         logManager?.updateIndeterminateToast(
             "Loading \(currentSourceNames.joined(separator: ", "))",
@@ -47,7 +47,7 @@ class ScrapingViewModel: ObservableObject {
     }
 
     @MainActor
-    func removeCurrentSourceName(_ removedName: String) {
+    private func removeCurrentSourceName(_ removedName: String) {
         currentSourceNames.remove(removedName)
         logManager?.updateIndeterminateToast(
             "Loading \(currentSourceNames.joined(separator: ", "))",
@@ -56,17 +56,39 @@ class ScrapingViewModel: ObservableObject {
     }
 
     @MainActor
-    func clearCurrentSourceNames() {
+    private func clearCurrentSourceNames() {
         currentSourceNames = []
         logManager?.updateIndeterminateToast("Loading sources", cancelAction: nil)
     }
 
     // Utility function to print source specific errors
-    func sendSourceError(_ description: String) async {
+    private func sendSourceError(_ description: String) async {
         await logManager?.error(description, showToast: false)
     }
 
-    public func scanSources(sources: [Source], searchText: String, debridManager: DebridManager) async {
+    // Substitutes the given string with an arbitrary parameter dictionary
+    private func substituteParams(_ input: String, with params: [String: String]) -> String {
+        let replaced = params.reduce(input) { result, param -> String in
+            result.replacingOccurrences(of: "{\(param.key)}", with: param.value)
+        }
+
+        return replaced
+    }
+
+    // Cleans a SourceRequest's body and headers to be substituted
+    private func cleanRequest(request: SourceRequest, params: [String: String]) -> SourceRequest {
+        if let body = request.body {
+            request.body = substituteParams(body, with: params)
+        }
+
+        if let headers = request.headers {
+            request.headers = headers.mapValues { substituteParams($0, with: params) }
+        }
+
+        return request
+    }
+
+    func scanSources(sources: [Source], searchText: String, debridManager: DebridManager) async {
         await logManager?.info("Started scanning sources for query \"\(searchText)\"")
 
         if sources.isEmpty {
@@ -144,7 +166,7 @@ class ScrapingViewModel: ObservableObject {
         }
     }
 
-    func executeParser(source: Source) async -> SearchRequestResult? {
+    private func executeParser(source: Source) async -> SearchRequestResult? {
         guard let website = source.website else {
             await logManager?.error("Scraping: The base URL could not be found for source \(source.name)")
 
@@ -160,19 +182,26 @@ class ScrapingViewModel: ObservableObject {
             return nil
         }
 
+        // Initial params dict to reference
+        // More params are added here as needed
+        var params: [String: String] = [
+            "query": encodedQuery,
+            "queryFirstLetter": encodedQuery.first.map { String($0).lowercased() } ?? ""
+        ]
+
         switch preferredParser {
         case .scraping:
             if let htmlParser = source.htmlParser {
                 let replacedSearchUrl = htmlParser.searchUrl.map {
-                    $0
+                    substituteParams($0, with: params)
-                        .replacingOccurrences(of: "{query}", with: encodedQuery)
                 }
 
                 let data = await handleUrls(
                     website: website,
                     replacedSearchUrl: replacedSearchUrl,
                     fallbackUrls: source.fallbackUrls,
-                    sourceName: source.name
+                    sourceName: source.name,
+                    requestParams: htmlParser.request.map { cleanRequest(request: $0, params: params) }
                 )
 
                 if let data,
@@ -183,23 +212,25 @@ class ScrapingViewModel: ObservableObject {
             }
         case .rss:
             if let rssParser = source.rssParser {
-                let replacedSearchUrl = rssParser.searchUrl
+                params.updateValue(source.api?.clientSecret?.value ?? "", forKey: "secret")
-                    .replacingOccurrences(of: "{secret}", with: source.api?.clientSecret?.value ?? "")
+
-                    .replacingOccurrences(of: "{query}", with: encodedQuery)
+                let replacedSearchUrl = substituteParams(rssParser.searchUrl, with: params)
 
                 // Do not use fallback URLs if the base URL isn't used
                 let data: Data?
                 if let rssUrl = rssParser.rssUrl {
                     data = await fetchWebsiteData(
                         urlString: rssUrl + replacedSearchUrl,
-                        sourceName: source.name
+                        sourceName: source.name,
+                        requestParams: rssParser.request
                     )
                 } else {
                     data = await handleUrls(
                         website: website,
                         replacedSearchUrl: replacedSearchUrl,
                         fallbackUrls: source.fallbackUrls,
-                        sourceName: source.name
+                        sourceName: source.name,
+                        requestParams: rssParser.request
                     )
                 }
 
@@ -211,8 +242,7 @@ class ScrapingViewModel: ObservableObject {
             }
         case .siteApi:
             if let jsonParser = source.jsonParser {
-                var replacedSearchUrl = jsonParser.searchUrl
+                var replacedSearchUrl = substituteParams(jsonParser.searchUrl, with: params)
-                    .replacingOccurrences(of: "{query}", with: encodedQuery)
 
                 // Handle anything API related including tokens, client IDs, and appending the API URL
                 // The source API key is for APIs that require extra credentials or use a different URL
@@ -248,7 +278,8 @@ class ScrapingViewModel: ObservableObject {
                     website: passedUrl,
                     replacedSearchUrl: replacedSearchUrl,
                     fallbackUrls: source.fallbackUrls,
-                    sourceName: source.name
+                    sourceName: source.name,
+                    requestParams: jsonParser.request
                 )
 
                 if let data {
@@ -263,16 +294,16 @@ class ScrapingViewModel: ObservableObject {
     }
 
     // Checks the base URL for any website data then iterates through the fallback URLs
-    func handleUrls(website: String, replacedSearchUrl: String?, fallbackUrls: [String]?, sourceName: String) async -> Data? {
+    private func handleUrls(website: String, replacedSearchUrl: String?, fallbackUrls: [String]?, sourceName: String, requestParams: SourceRequest?) async -> Data? {
         let fetchUrl = website + (replacedSearchUrl.map { $0 } ?? "")
-        if let data = await fetchWebsiteData(urlString: fetchUrl, sourceName: sourceName) {
+        if let data = await fetchWebsiteData(urlString: fetchUrl, sourceName: sourceName, requestParams: requestParams) {
             return data
         }
 
         if let fallbackUrls {
             for fallbackUrl in fallbackUrls {
                 let fetchUrl = fallbackUrl + (replacedSearchUrl.map { $0 } ?? "")
-                if let data = await fetchWebsiteData(urlString: fetchUrl, sourceName: sourceName) {
+                if let data = await fetchWebsiteData(urlString: fetchUrl, sourceName: sourceName, requestParams: requestParams) {
                     return data
                 }
             }
@@ -281,12 +312,12 @@ class ScrapingViewModel: ObservableObject {
         return nil
     }
 
-    public func handleApiCredential(_ credential: SourceApiCredential,
+    private func handleApiCredential(_ credential: SourceApiCredential,
-                                    replacement: String,
+                                     replacement: String,
-                                    searchUrl: String,
+                                     searchUrl: String,
-                                    apiUrl: String?,
+                                     apiUrl: String?,
-                                    website: String,
+                                     website: String,
-                                    sourceName: String) async -> String?
+                                     sourceName: String) async -> String?
     {
         // Is the credential expired
         var isExpired = false
@@ -298,8 +329,7 @@ class ScrapingViewModel: ObservableObject {
 
         // Fetch a new credential if it's expired or doesn't exist yet
         if let value = credential.value, !isExpired {
-            return searchUrl
+            return substituteParams(searchUrl, with: [replacement: value])
-                .replacingOccurrences(of: replacement, with: value)
         } else if
             credential.value == nil || isExpired,
             let credentialUrl = credential.urlString,
@@ -323,9 +353,9 @@ class ScrapingViewModel: ObservableObject {
         return nil
     }
 
-    public func fetchApiCredential(urlString: String,
+    private func fetchApiCredential(urlString: String,
-                                   credential: SourceApiCredential,
+                                    credential: SourceApiCredential,
-                                   sourceName: String) async -> String?
+                                    sourceName: String) async -> String?
     {
         guard let url = URL(string: urlString) else {
             await sendSourceError("\(sourceName): Token URL \(urlString) is invalid.")
@@ -369,7 +399,7 @@ class ScrapingViewModel: ObservableObject {
     }
 
     // Fetches the data for a URL
-    public func fetchWebsiteData(urlString: String, sourceName: String) async -> Data? {
+    private func fetchWebsiteData(urlString: String, sourceName: String, requestParams: SourceRequest?) async -> Data? {
         guard let url = URL(string: urlString.trimmingCharacters(in: .whitespacesAndNewlines)) else {
             await sendSourceError("\(sourceName): Source doesn't contain a valid URL, contact the source dev!")
 
@@ -388,7 +418,12 @@ class ScrapingViewModel: ObservableObject {
             }
         }
 
-        let request = URLRequest(url: url, timeoutInterval: timeout)
+        var request = URLRequest(url: url, timeoutInterval: timeout)
+        request.httpMethod = requestParams?.method
+        request.httpBody = requestParams?.body?.data(using: .utf8)
+        requestParams?.headers?.forEach { field, value in
+            request.addValue(value, forHTTPHeaderField: field)
+        }
 
         do {
             let (data, _) = try await URLSession.shared.data(for: request)
@@ -411,7 +446,7 @@ class ScrapingViewModel: ObservableObject {
         }
     }
 
-    public func scrapeJson(source: Source, jsonData: Data) async -> SearchRequestResult? {
+    private func scrapeJson(source: Source, jsonData: Data) async -> SearchRequestResult? {
         guard let jsonParser = source.jsonParser else {
             return nil
         }
@@ -486,10 +521,10 @@ class ScrapingViewModel: ObservableObject {
     }
 
     // TODO: Add regex parsing for API
-    public func parseJsonResult(_ result: JSON,
+    private func parseJsonResult(_ result: JSON,
-                                jsonParser: SourceJsonParser,
+                                 jsonParser: SourceJsonParser,
-                                source: Source,
+                                 source: Source,
-                                existingSearchResult: SearchResult? = nil) -> SearchResult?
+                                 existingSearchResult: SearchResult? = nil) -> SearchResult?
     {
         // Enforce these parsers
         guard let titleParser = jsonParser.title else {
@@ -580,7 +615,7 @@ class ScrapingViewModel: ObservableObject {
     }
 
     // RSS feed scraper
-    public func scrapeRss(source: Source, rss: String) async -> SearchRequestResult? {
+    private func scrapeRss(source: Source, rss: String) async -> SearchRequestResult? {
         guard let rssParser = source.rssParser else {
             return nil
         }
@@ -715,11 +750,11 @@ class ScrapingViewModel: ObservableObject {
     }
 
     // Complex query parsing for RSS scraping
-    func runRssComplexQuery(item: Element,
+    private func runRssComplexQuery(item: Element,
-                            query: String,
+                                    query: String,
-                            attribute: String,
+                                    attribute: String,
-                            discriminator: String?,
+                                    discriminator: String?,
-                            regexString: String?) throws -> String?
+                                    regexString: String?) throws -> String?
     {
         var parsedValue: String?
 
@@ -748,7 +783,7 @@ class ScrapingViewModel: ObservableObject {
     }
 
     // HTML scraper
-    public func scrapeHtml(source: Source, website: String, html: String) async -> SearchRequestResult? {
+    private func scrapeHtml(source: Source, website: String, html: String) async -> SearchRequestResult? {
         guard let htmlParser = source.htmlParser else {
             return nil
         }
@@ -800,7 +835,7 @@ class ScrapingViewModel: ObservableObject {
 
                     let replacedMagnetUrl = externalMagnetUrl.starts(with: "/") ? website + externalMagnetUrl : externalMagnetUrl
                     guard
-                        let data = await fetchWebsiteData(urlString: replacedMagnetUrl, sourceName: source.name),
+                        let data = await fetchWebsiteData(urlString: replacedMagnetUrl, sourceName: source.name, requestParams: htmlParser.request),
                         let magnetHtml = String(data: data, encoding: .utf8)
                     else {
                         continue
@@ -885,7 +920,7 @@ class ScrapingViewModel: ObservableObject {
                             )
                         }
 
-                        if let leecherQuery = seederLeecher.seeders {
+                        if let leecherQuery = seederLeecher.leechers {
                             leechers = try? runHtmlComplexQuery(
                                 row: row,
                                 query: leecherQuery,
@@ -920,10 +955,10 @@ class ScrapingViewModel: ObservableObject {
     }
 
     // Complex query parsing for HTML scraping
-    func runHtmlComplexQuery(row: Element,
+    private func runHtmlComplexQuery(row: Element,
-                             query: String,
+                                     query: String,
-                             attribute: String,
+                                     attribute: String,
-                             regexString: String?) throws -> String?
+                                     regexString: String?) throws -> String?
     {
         var parsedValue: String?
 
@@ -945,7 +980,7 @@ class ScrapingViewModel: ObservableObject {
         }
     }
 
-    func runRegex(parsedValue: String, regexString: String) -> String? {
+    private func runRegex(parsedValue: String, regexString: String) -> String? {
         // TODO: Maybe dynamically parse flags
         let replacedRegexString = regexString
             .replacingOccurrences(of: "{query}", with: cleanedSearchText)
@@ -968,7 +1003,7 @@ class ScrapingViewModel: ObservableObject {
         }
     }
 
-    func parseSizeString(sizeString: String) -> String? {
+    private func parseSizeString(sizeString: String) -> String? {
         // Test if the string can be a full integer
         guard let size = Int(sizeString) else {
             return nil
@@ -990,7 +1025,7 @@ class ScrapingViewModel: ObservableObject {
         }
     }
 
-    func cleanApiCreds(api: SourceApi, sourceName: String) async {
+    private func cleanApiCreds(api: SourceApi, sourceName: String) async {
         let backgroundContext = PersistenceController.shared.backgroundContext
 
         let hasCredentials = api.clientId != nil || api.clientSecret != nil

Ferrite/Views/CommonViews/HybridSecureField.swift

@@ -56,7 +56,7 @@ struct HybridSecureField: View {
 }
 
 extension HybridSecureField {
-    public func fieldDisabled(_ isFieldDisabled: Bool) -> Self {
+    func fieldDisabled(_ isFieldDisabled: Bool) -> Self {
         modifyViewProp { $0.isFieldDisabled = isFieldDisabled }
     }
 }

Ferrite/Views/CommonViews/IndeterminateProgressView.swift

@@ -21,13 +21,12 @@ struct IndeterminateProgressView: View {
                         .foregroundColor(Color.accentColor)
                         .frame(width: reader.size.width * 0.26, height: 6)
                         .clipShape(Capsule())
-
                         .offset(x: -reader.size.width * 0.6, y: 0)
-                        .offset(x: reader.size.width * 1.2 * self.offset, y: 0)
+                        .offset(x: reader.size.width * 1.2 * offset, y: 0)
-                        .animation(.default.repeatForever().speed(0.5), value: self.offset)
+                        .animation(.default.repeatForever().speed(0.5), value: offset)
                         .onAppear {
                             withAnimation {
-                                self.offset = 1
+                                offset = 1
                             }
                         }
                 )

Ferrite/Views/CommonViews/InlineHeader.swift

@@ -1,27 +0,0 @@
-//
-//  InlineHeader.swift
-//  Ferrite
-//
-//  Created by Brian Dashore on 9/5/22.
-//
-//  For iOS 15's weird defaults regarding sectioned list padding
-//
-
-import SwiftUI
-
-struct InlineHeader: View {
-    let title: String
-
-    init(_ title: String) {
-        self.title = title
-    }
-
-    var body: some View {
-        if #available(iOS 16, *) {
-            Text(title)
-        } else {
-            Text(title)
-                .listRowInsets(EdgeInsets(top: 10, leading: 15, bottom: 0, trailing: 0))
-        }
-    }
-}

Ferrite/Views/CommonViews/Modifiers/ConditionalContextMenu.swift

@@ -1,39 +0,0 @@
-//
-//  ConditionalContextMenu.swift
-//  Ferrite
-//
-//  Created by Brian Dashore on 9/3/22.
-//
-//  Used as a workaround for iOS 15 not updating context views with conditional variables
-//  A stateful ID is required for the contextMenu to update itself.
-//
-
-import SwiftUI
-
-struct ConditionalContextMenuModifier<InternalContent: View, ID: Hashable>: ViewModifier {
-    let internalContent: () -> InternalContent
-    let id: ID
-
-    init(@ViewBuilder _ internalContent: @escaping () -> InternalContent, id: ID) {
-        self.internalContent = internalContent
-        self.id = id
-    }
-
-    func body(content: Content) -> some View {
-        if #available(iOS 16, *) {
-            content
-                .contextMenu {
-                    internalContent()
-                }
-        } else {
-            content
-                .background {
-                    Color.clear
-                        .contextMenu {
-                            internalContent()
-                        }
-                        .id(id)
-                }
-        }
-    }
-}

Ferrite/Views/CommonViews/Modifiers/ConditionalId.swift

@@ -1,24 +0,0 @@
-//
-//  ConditionalId.swift
-//  Ferrite
-//
-//  Created by Brian Dashore on 9/4/22.
-//
-//  Applies an ID below iOS 16
-//  This is due to ID workarounds making iOS 16 apps crash
-//
-
-import SwiftUI
-
-struct ConditionalIdModifier<ID: Hashable>: ViewModifier {
-    let id: ID
-
-    func body(content: Content) -> some View {
-        if #available(iOS 16, *) {
-            content
-        } else {
-            content
-                .id(id)
-        }
-    }
-}

Ferrite/Views/CommonViews/Modifiers/InlinedList.swift

@@ -5,26 +5,18 @@
 //  Created by Brian Dashore on 9/4/22.
 //
 //  Removes the top padding on unsectioned lists
-//  If a list is sectioned, see InlineHeader
 //
 
-import Introspect
 import SwiftUI
+import SwiftUIIntrospect
 
 struct InlinedListModifier: ViewModifier {
     let inset: CGFloat
 
     func body(content: Content) -> some View {
-        if #available(iOS 16, *) {
+        content
-            content
+            .introspect(.list, on: .iOS(.v16, .v17, .v18)) { collectionView in
-                .introspectCollectionView { collectionView in
+                collectionView.contentInset.top = inset
-                    collectionView.contentInset.top = inset
+            }
-                }
-        } else {
-            content
-                .introspectTableView { tableView in
-                    tableView.contentInset.top = inset
-                }
-        }
     }
 }

Ferrite/Views/CommonViews/NavView.swift

@@ -1,29 +0,0 @@
-//
-//  NavView.swift
-//  Ferrite
-//
-//  Created by Brian Dashore on 7/4/22.
-//  Contributed by Mantton
-//
-//  A wrapper that switches between NavigationStack and the legacy NavigationView
-//
-
-import SwiftUI
-
-struct NavView<Content: View>: View {
-    @ViewBuilder var content: Content
-
-    var body: some View {
-        // NavigationStack issues are fixed on iOS 17
-        if #available(iOS 17, *) {
-            NavigationStack {
-                content
-            }
-        } else {
-            NavigationView {
-                content
-            }
-            .navigationViewStyle(.stack)
-        }
-    }
-}

Ferrite/Views/ComponentViews/Debrid/DebridLabelView.swift

@@ -8,38 +8,34 @@
 import SwiftUI
 
 struct DebridLabelView: View {
-    @EnvironmentObject var debridManager: DebridManager
+    @Store var debridSource: DebridSource
 
     @State var cloudLinks: [String] = []
+    @State var tagColor: Color = .red
     var magnet: Magnet?
 
     var body: some View {
-        if let selectedDebridType = debridManager.selectedDebridType {
+        Tag(
-            Tag(
+            name: debridSource.abbreviation,
-                name: selectedDebridType.toString(abbreviated: true),
+            color: getTagColor(),
-                color: getTagColor(),
+            horizontalPadding: 5,
-                horizontalPadding: 5,
+            verticalPadding: 3
-                verticalPadding: 3
+        )
-            )
-        }
     }
 
     func getTagColor() -> Color {
         if let magnet, cloudLinks.isEmpty {
-            switch debridManager.matchMagnetHash(magnet) {
+            guard let match = debridSource.IAValues.first(where: { magnet.hash == $0.magnet.hash }) else {
-            case .full:
+                return .red
-                return Color.green
-            case .partial:
-                return Color.orange
-            case .none:
-                return Color.red
             }
+
+            return match.files.count > 1 ? .orange : .green
         } else if cloudLinks.count == 1 {
-            return Color.green
+            return .green
         } else if cloudLinks.count > 1 {
-            return Color.orange
+            return .orange
         } else {
-            return Color.red
+            return .red
         }
     }
 }

Ferrite/Views/ComponentViews/Filters/SelectedDebridFilterView.swift

@@ -15,23 +15,23 @@ struct SelectedDebridFilterView<Content: View>: View {
     var body: some View {
         Menu {
             Button {
-                debridManager.selectedDebridType = nil
+                debridManager.selectedDebridSource = nil
             } label: {
                 Text("None")
 
-                if debridManager.selectedDebridType == nil {
+                if debridManager.selectedDebridSource == nil {
                     Image(systemName: "checkmark")
                 }
             }
 
-            ForEach(DebridType.allCases, id: \.self) { (debridType: DebridType) in
+            ForEach(debridManager.debridSources, id: \.id) { debridSource in
-                if debridManager.enabledDebrids.contains(debridType) {
+                if debridSource.isLoggedIn {
                     Button {
-                        debridManager.selectedDebridType = debridType
+                        debridManager.selectedDebridSource = debridSource
                     } label: {
-                        Text(debridType.toString())
+                        Text(debridSource.id)
 
-                        if debridManager.selectedDebridType == debridType {
+                        if debridManager.selectedDebridSource?.id == debridSource.id {
                             Image(systemName: "checkmark")
                         }
                     }
@@ -40,6 +40,5 @@ struct SelectedDebridFilterView<Content: View>: View {
         } label: {
             label
         }
-        .id(debridManager.selectedDebridType)
     }
 }

Ferrite/Views/ComponentViews/Library/BookmarksView.swift

@@ -56,20 +56,27 @@ struct BookmarksView: View {
                 .frame(height: 15)
         }
         .task {
-            if debridManager.enabledDebrids.count > 0 {
+            await matchAgainstIA()
-                let magnets = bookmarks.compactMap {
+        }
-                    if let magnetHash = $0.magnetHash {
+        .refreshable {
-                        return Magnet(hash: magnetHash, link: $0.magnetLink)
+            await matchAgainstIA()
-                    } else {
-                        return nil
-                    }
-                }
-                await debridManager.populateDebridIA(magnets)
-            }
         }
     }
 
     func fetchPredicate() {
         bookmarks.nsPredicate = searchText.isEmpty ? nil : NSPredicate(format: "title CONTAINS[cd] %@", searchText)
     }
+
+    func matchAgainstIA() async {
+        if !debridManager.enabledDebrids.isEmpty {
+            let magnets = bookmarks.compactMap {
+                if let magnetHash = $0.magnetHash {
+                    return Magnet(hash: magnetHash, link: $0.magnetLink)
+                } else {
+                    return nil
+                }
+            }
+            await debridManager.populateDebridIA(magnets)
+        }
+    }
 }

Ferrite/Views/ComponentViews/Library/Cloud/AllDebridCloudView.swift

@@ -1,125 +0,0 @@
-//
-//  AllDebridCloudView.swift
-//  Ferrite
-//
-//  Created by Brian Dashore on 1/5/23.
-//
-
-import SwiftUI
-
-struct AllDebridCloudView: View {
-    @EnvironmentObject var debridManager: DebridManager
-    @EnvironmentObject var navModel: NavigationViewModel
-    @EnvironmentObject var pluginManager: PluginManager
-
-    @Binding var searchText: String
-
-    var body: some View {
-        DisclosureGroup("Links") {
-            ForEach(debridManager.allDebridCloudLinks.filter {
-                searchText.isEmpty ? true : $0.fileName.lowercased().contains(searchText.lowercased())
-            }, id: \.self) { cloudDownload in
-                Button(cloudDownload.fileName) {
-                    navModel.resultFromCloud = true
-                    navModel.selectedTitle = cloudDownload.fileName
-                    debridManager.downloadUrl = cloudDownload.link
-
-                    PersistenceController.shared.createHistory(
-                        HistoryEntryJson(
-                            name: cloudDownload.fileName,
-                            url: cloudDownload.link,
-                            source: DebridType.allDebrid.toString()
-                        ),
-                        performSave: true
-                    )
-
-                    pluginManager.runDefaultAction(
-                        urlString: debridManager.downloadUrl,
-                        navModel: navModel
-                    )
-                }
-                .disabledAppearance(navModel.currentChoiceSheet != nil, dimmedOpacity: 0.7, animation: .easeOut(duration: 0.2))
-                .tint(.primary)
-            }
-            .onDelete { offsets in
-                for index in offsets {
-                    if let cloudDownload = debridManager.allDebridCloudLinks[safe: index] {
-                        Task {
-                            await debridManager.deleteAdLink(link: cloudDownload.downloadId)
-                        }
-                    }
-                }
-            }
-        }
-
-        DisclosureGroup("Magnets") {
-            ForEach(debridManager.allDebridCloudMagnets.filter {
-                searchText.isEmpty ? true : $0.fileName.lowercased().contains(searchText.lowercased())
-            }, id: \.self) { cloudTorrent in
-                Button {
-                    if cloudTorrent.status == "Ready", !cloudTorrent.links.isEmpty {
-                        navModel.resultFromCloud = true
-                        navModel.selectedTitle = cloudTorrent.fileName
-
-                        var historyInfo = HistoryEntryJson(
-                            name: cloudTorrent.fileName,
-                            source: DebridType.allDebrid.toString()
-                        )
-
-                        Task {
-                            if cloudTorrent.links.count == 1 {
-                                if let torrentLink = cloudTorrent.links[safe: 0] {
-                                    await debridManager.fetchDebridDownload(magnet: nil, cloudInfo: torrentLink)
-                                    if !debridManager.downloadUrl.isEmpty {
-                                        historyInfo.url = debridManager.downloadUrl
-                                        PersistenceController.shared.createHistory(historyInfo, performSave: true)
-
-                                        pluginManager.runDefaultAction(
-                                            urlString: debridManager.downloadUrl,
-                                            navModel: navModel
-                                        )
-                                    }
-                                }
-                            } else {
-                                let magnet = Magnet(hash: cloudTorrent.hash, link: nil)
-
-                                // Do not clear old IA values
-                                await debridManager.populateDebridIA([magnet])
-
-                                if debridManager.selectDebridResult(magnet: magnet) {
-                                    navModel.selectedHistoryInfo = historyInfo
-                                    navModel.currentChoiceSheet = .batch
-                                }
-                            }
-                        }
-                    }
-                } label: {
-                    VStack(alignment: .leading, spacing: 10) {
-                        Text(cloudTorrent.fileName)
-                            .font(.callout)
-                            .fixedSize(horizontal: false, vertical: true)
-                            .lineLimit(4)
-
-                        HStack {
-                            Text(cloudTorrent.status.capitalizingFirstLetter())
-                            Spacer()
-                            DebridLabelView(cloudLinks: cloudTorrent.links)
-                        }
-                        .font(.caption)
-                    }
-                }
-                .disabledAppearance(navModel.currentChoiceSheet != nil, dimmedOpacity: 0.7, animation: .easeOut(duration: 0.2))
-                .tint(.primary)
-            }
-            .onDelete { offsets in
-                for index in offsets {
-                    if let cloudTorrent = debridManager.allDebridCloudMagnets[safe: index] {
-                        Task {
-                            await debridManager.deleteAdMagnet(magnetId: cloudTorrent.torrentId)
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

Ferrite/Views/ComponentViews/Library/Cloud/CloudDownloadView.swift

@@ -1,40 +1,40 @@
 //
-//  PremiumizeCloudView.swift
+//  CloudDownloadView.swift
 //  Ferrite
 //
-//  Created by Brian Dashore on 1/2/23.
+//  Created by Brian Dashore on 6/6/24.
 //
 
 import SwiftUI
 
-struct PremiumizeCloudView: View {
+struct CloudDownloadView: View {
-    @EnvironmentObject var debridManager: DebridManager
     @EnvironmentObject var navModel: NavigationViewModel
+    @EnvironmentObject var debridManager: DebridManager
     @EnvironmentObject var pluginManager: PluginManager
 
+    @Store var debridSource: DebridSource
+
     @Binding var searchText: String
 
     var body: some View {
-        DisclosureGroup("Items") {
+        DisclosureGroup("Downloads") {
-            ForEach(debridManager.premiumizeCloudItems.filter {
+            ForEach(debridSource.cloudDownloads.filter {
                 searchText.isEmpty ? true : $0.fileName.lowercased().contains(searchText.lowercased())
             }, id: \.self) { cloudDownload in
                 Button(cloudDownload.fileName) {
-                    Task {
+                    navModel.resultFromCloud = true
-                        navModel.resultFromCloud = true
+                    navModel.selectedTitle = cloudDownload.fileName
-                        navModel.selectedTitle = cloudDownload.fileName
+                    var historyEntry = HistoryEntryJson(
+                        name: cloudDownload.fileName,
+                        source: debridSource.id
+                    )
 
-                        await debridManager.fetchDebridDownload(magnet: nil, cloudInfo: cloudDownload.downloadId)
+                    debridManager.currentDebridTask = Task {
+                        await debridManager.fetchDebridDownload(magnet: nil, cloudInfo: cloudDownload.link)
 
                         if !debridManager.downloadUrl.isEmpty {
-                            PersistenceController.shared.createHistory(
+                            historyEntry.url = debridManager.downloadUrl
-                                HistoryEntryJson(
+                            PersistenceController.shared.createHistory(historyEntry, performSave: true)
-                                    name: cloudDownload.fileName,
-                                    url: cloudDownload.link,
-                                    source: DebridType.premiumize.toString()
-                                ),
-                                performSave: true
-                            )
 
                             pluginManager.runDefaultAction(
                                 urlString: debridManager.downloadUrl,
@@ -48,9 +48,9 @@ struct PremiumizeCloudView: View {
             }
             .onDelete { offsets in
                 for index in offsets {
-                    if let cloudDownload = debridManager.premiumizeCloudItems[safe: index] {
+                    if let cloudDownload = debridSource.cloudDownloads[safe: index] {
                         Task {
-                            await debridManager.deletePmItem(id: cloudDownload.downloadId)
+                            await debridManager.deleteCloudDownload(cloudDownload)
                         }
                     }
                 }

Ferrite/Views/ComponentViews/Library/Cloud/CloudMagnetView.swift

@@ -0,0 +1,97 @@
+//
+//  CloudMagnetView.swift
+//  Ferrite
+//
+//  Created by Brian Dashore on 6/6/24.
+//
+
+import SwiftUI
+
+struct CloudMagnetView: View {
+    @EnvironmentObject var navModel: NavigationViewModel
+    @EnvironmentObject var debridManager: DebridManager
+    @EnvironmentObject var pluginManager: PluginManager
+
+    @Store var debridSource: DebridSource
+
+    @Binding var searchText: String
+
+    var body: some View {
+        DisclosureGroup("Magnets") {
+            ForEach(debridSource.cloudMagnets.filter {
+                searchText.isEmpty ? true : $0.fileName.lowercased().contains(searchText.lowercased())
+            }, id: \.self) { cloudMagnet in
+                Button {
+                    if debridSource.cachedStatus.contains(cloudMagnet.status), !cloudMagnet.links.isEmpty {
+                        navModel.resultFromCloud = true
+                        navModel.selectedTitle = cloudMagnet.fileName
+
+                        var historyInfo = HistoryEntryJson(
+                            name: cloudMagnet.fileName,
+                            source: debridSource.id
+                        )
+
+                        Task {
+                            let magnet = Magnet(hash: cloudMagnet.hash, link: nil)
+                            await debridManager.populateDebridIA([magnet])
+                            if debridManager.selectDebridResult(magnet: magnet) {
+                                // Is this a batch?
+
+                                if cloudMagnet.links.count == 1 {
+                                    await debridManager.fetchDebridDownload(magnet: magnet)
+
+                                    // Bump to batch
+                                    if debridManager.requiresUnrestrict {
+                                        navModel.selectedHistoryInfo = historyInfo
+                                        navModel.currentChoiceSheet = .batch
+
+                                        return
+                                    }
+
+                                    if !debridManager.downloadUrl.isEmpty {
+                                        historyInfo.url = debridManager.downloadUrl
+                                        PersistenceController.shared.createHistory(historyInfo, performSave: true)
+
+                                        pluginManager.runDefaultAction(
+                                            urlString: debridManager.downloadUrl,
+                                            navModel: navModel
+                                        )
+                                    }
+                                } else {
+                                    navModel.selectedMagnet = magnet
+                                    navModel.selectedHistoryInfo = historyInfo
+                                    navModel.currentChoiceSheet = .batch
+                                }
+                            }
+                        }
+                    }
+                } label: {
+                    VStack(alignment: .leading, spacing: 10) {
+                        Text(cloudMagnet.fileName)
+                            .font(.callout)
+                            .fixedSize(horizontal: false, vertical: true)
+                            .lineLimit(4)
+
+                        HStack {
+                            Text(cloudMagnet.status.capitalizingFirstLetter())
+                            Spacer()
+                            DebridLabelView(debridSource: debridSource, cloudLinks: cloudMagnet.links)
+                        }
+                        .font(.caption)
+                    }
+                }
+                .disabledAppearance(navModel.currentChoiceSheet != nil, dimmedOpacity: 0.7, animation: .easeOut(duration: 0.2))
+                .tint(.primary)
+            }
+            .onDelete { offsets in
+                for index in offsets {
+                    if let cloudMagnet = debridSource.cloudMagnets[safe: index] {
+                        Task {
+                            await debridManager.deleteUserMagnet(cloudMagnet)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

Ferrite/Views/ComponentViews/Library/Cloud/RealDebridCloudView.swift

@@ -1,127 +0,0 @@
-//
-//  RealDebridCloudView.swift
-//  Ferrite
-//
-//  Created by Brian Dashore on 12/31/22.
-//
-
-import SwiftUI
-
-struct RealDebridCloudView: View {
-    @EnvironmentObject var navModel: NavigationViewModel
-    @EnvironmentObject var debridManager: DebridManager
-    @EnvironmentObject var pluginManager: PluginManager
-
-    @Binding var searchText: String
-
-    var body: some View {
-        Group {
-            DisclosureGroup("Downloads") {
-                ForEach(debridManager.realDebridCloudDownloads.filter {
-                    searchText.isEmpty ? true : $0.fileName.lowercased().contains(searchText.lowercased())
-                }, id: \.self) { cloudDownload in
-                    Button(cloudDownload.fileName) {
-                        navModel.resultFromCloud = true
-                        navModel.selectedTitle = cloudDownload.fileName
-                        debridManager.downloadUrl = cloudDownload.link
-
-                        PersistenceController.shared.createHistory(
-                            HistoryEntryJson(
-                                name: cloudDownload.fileName,
-                                url: cloudDownload.link,
-                                source: DebridType.realDebrid.toString()
-                            ),
-                            performSave: true
-                        )
-
-                        pluginManager.runDefaultAction(
-                            urlString: debridManager.downloadUrl,
-                            navModel: navModel
-                        )
-                    }
-                    .disabledAppearance(navModel.currentChoiceSheet != nil, dimmedOpacity: 0.7, animation: .easeOut(duration: 0.2))
-                    .tint(.primary)
-                }
-                .onDelete { offsets in
-                    for index in offsets {
-                        if let cloudDownload = debridManager.realDebridCloudDownloads[safe: index] {
-                            Task {
-                                await debridManager.deleteRdDownload(downloadID: cloudDownload.downloadId)
-                            }
-                        }
-                    }
-                }
-            }
-
-            DisclosureGroup("Torrents") {
-                ForEach(debridManager.realDebridCloudTorrents.filter {
-                    searchText.isEmpty ? true : $0.fileName.lowercased().contains(searchText.lowercased())
-                }, id: \.self) { cloudTorrent in
-                    Button {
-                        if cloudTorrent.status == "downloaded", !cloudTorrent.links.isEmpty {
-                            navModel.resultFromCloud = true
-                            navModel.selectedTitle = cloudTorrent.fileName
-
-                            var historyInfo = HistoryEntryJson(
-                                name: cloudTorrent.fileName,
-                                source: DebridType.realDebrid.toString()
-                            )
-
-                            Task {
-                                if cloudTorrent.links.count == 1 {
-                                    if let torrentLink = cloudTorrent.links[safe: 0] {
-                                        await debridManager.fetchDebridDownload(magnet: nil, cloudInfo: torrentLink)
-                                        if !debridManager.downloadUrl.isEmpty {
-                                            historyInfo.url = debridManager.downloadUrl
-                                            PersistenceController.shared.createHistory(historyInfo, performSave: true)
-
-                                            pluginManager.runDefaultAction(
-                                                urlString: debridManager.downloadUrl,
-                                                navModel: navModel
-                                            )
-                                        }
-                                    }
-                                } else {
-                                    let magnet = Magnet(hash: cloudTorrent.hash, link: nil)
-
-                                    // Do not clear old IA values
-                                    await debridManager.populateDebridIA([magnet])
-
-                                    if debridManager.selectDebridResult(magnet: magnet) {
-                                        navModel.selectedHistoryInfo = historyInfo
-                                        navModel.currentChoiceSheet = .batch
-                                    }
-                                }
-                            }
-                        }
-                    } label: {
-                        VStack(alignment: .leading, spacing: 10) {
-                            Text(cloudTorrent.fileName)
-                                .font(.callout)
-                                .fixedSize(horizontal: false, vertical: true)
-                                .lineLimit(4)
-
-                            HStack {
-                                Text(cloudTorrent.status.capitalizingFirstLetter())
-                                Spacer()
-                                DebridLabelView(cloudLinks: cloudTorrent.links)
-                            }
-                            .font(.caption)
-                        }
-                    }
-                    .disabledAppearance(navModel.currentChoiceSheet != nil, dimmedOpacity: 0.7, animation: .easeOut(duration: 0.2))
-                    .tint(.primary)
-                }
-                .onDelete { offsets in
-                    for index in offsets {
-                        if let cloudTorrent = debridManager.realDebridCloudTorrents[safe: index] {
-                            Task {
-                                await debridManager.deleteRdTorrent(torrentID: cloudTorrent.torrentId)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

Ferrite/Views/ComponentViews/Library/DebridCloudView.swift

@@ -10,20 +10,14 @@ import SwiftUI
 struct DebridCloudView: View {
     @EnvironmentObject var debridManager: DebridManager
 
+    @Store var debridSource: DebridSource
+
     @Binding var searchText: String
 
     var body: some View {
         List {
-            switch debridManager.selectedDebridType {
+            CloudDownloadView(debridSource: debridSource, searchText: $searchText)
-            case .realDebrid:
+            CloudMagnetView(debridSource: debridSource, searchText: $searchText)
-                RealDebridCloudView(searchText: $searchText)
-            case .premiumize:
-                PremiumizeCloudView(searchText: $searchText)
-            case .allDebrid:
-                AllDebridCloudView(searchText: $searchText)
-            case .none:
-                EmptyView()
-            }
         }
         .listStyle(.plain)
         .task {
@@ -32,7 +26,7 @@ struct DebridCloudView: View {
         .refreshable {
             await debridManager.fetchDebridCloud(bypassTTL: true)
         }
-        .onChange(of: debridManager.selectedDebridType) { newType in
+        .onChange(of: debridManager.selectedDebridSource?.id) { newType in
             if newType != nil {
                 Task {
                     await debridManager.fetchDebridCloud()

Ferrite/Views/ComponentViews/Library/HistoryView.swift

@@ -76,7 +76,7 @@ struct HistorySectionView: View {
 
     var body: some View {
         if compareGroup(historyGroup) > 0 {
-            Section(header: InlineHeader(formatter.string(from: historyGroup[0].date ?? Date()))) {
+            Section(formatter.string(from: historyGroup[0].date ?? Date())) {
                 ForEach(historyGroup, id: \.self) { history in
                     ForEach(history.entryArray.filter { allEntries.contains($0) }, id: \.self) { entry in
                         HistoryButtonView(entry: entry)

Ferrite/Views/ComponentViews/Plugin/Buttons/InstalledPluginButtonView.swift

@@ -1,5 +1,5 @@
 //
-//  InstalledSourceButtonView.swift
+//  InstalledPluginButtonView.swift
 //  Ferrite
 //
 //  Created by Brian Dashore on 8/5/22.

Ferrite/Views/ComponentViews/Plugin/Buttons/PluginCatalogButtonView.swift

@@ -1,5 +1,5 @@
 //
-//  SourceCatalogButtonView.swift
+//  PluginCatalogButtonView.swift
 //  Ferrite
 //
 //  Created by Brian Dashore on 8/5/22.

Ferrite/Views/ComponentViews/Plugin/Info/PluginInfoAboutView.swift

@@ -11,7 +11,7 @@ struct PluginInfoAboutView<P: Plugin>: View {
     @ObservedObject var selectedPlugin: P
 
     var body: some View {
-        Section(header: InlineHeader("Description")) {
+        Section("Description") {
             VStack(alignment: .leading, spacing: 10) {
                 if let pluginAbout = selectedPlugin.about {
                     if pluginAbout.last == "\n" {

Ferrite/Views/ComponentViews/Plugin/Info/PluginInfoMetaView.swift

@@ -16,7 +16,7 @@ struct PluginInfoMetaView<P: Plugin>: View {
     ) var pluginLists: FetchedResults<PluginList>
 
     var body: some View {
-        Section(header: InlineHeader("Metadata")) {
+        Section("Metadata") {
             VStack(alignment: .leading) {
                 VStack(alignment: .leading, spacing: 5) {
                     HStack(spacing: 5) {
@@ -32,8 +32,7 @@ struct PluginInfoMetaView<P: Plugin>: View {
                     Group {
                         Text("ID: \(selectedPlugin.id)")
 
-                        if let pluginList = pluginLists.first(where: { $0.id == selectedPlugin.listId })
+                        if let pluginList = pluginLists.first(where: { $0.id == selectedPlugin.listId }) {
-                        {
                             Text("List: \(pluginList.name)")
                             Text("List ID: \(pluginList.id.uuidString)")
                         } else {

Ferrite/Views/ComponentViews/Plugin/PluginAggregateView.swift

@@ -39,7 +39,7 @@ struct PluginAggregateView<P: Plugin, PJ: PluginJson>: View {
                 searchText: searchText
             )
             if !filteredUpdatedPlugins.isEmpty {
-                Section(header: InlineHeader("Updates")) {
+                Section("Updates") {
                     ForEach(filteredUpdatedPlugins, id: \.self) { (updatedPlugin: PJ) in
                         PluginCatalogButtonView(availablePlugin: updatedPlugin, needsUpdate: true)
                     }
@@ -47,7 +47,7 @@ struct PluginAggregateView<P: Plugin, PJ: PluginJson>: View {
             }
 
             if !installedPlugins.isEmpty {
-                Section(header: InlineHeader("Installed")) {
+                Section("Installed") {
                     ForEach(installedPlugins, id: \.self) { installedPlugin in
                         InstalledPluginButtonView(
                             installedPlugin: installedPlugin,
@@ -64,7 +64,7 @@ struct PluginAggregateView<P: Plugin, PJ: PluginJson>: View {
                 searchText: searchText
             )
             if !filteredAvailablePlugins.isEmpty {
-                Section(header: InlineHeader("Catalog")) {
+                Section("Catalog") {
                     ForEach(filteredAvailablePlugins, id: \.self) { availablePlugin in
                         PluginCatalogButtonView(availablePlugin: availablePlugin, needsUpdate: false)
                     }

Ferrite/Views/ComponentViews/Plugin/PluginInfoView.swift

@@ -13,7 +13,7 @@ struct PluginInfoView<P: Plugin>: View {
     @Binding var selectedPlugin: P?
 
     var body: some View {
-        NavView {
+        NavigationStack {
             List {
                 if let selectedPlugin {
                     PluginInfoMetaView(selectedPlugin: selectedPlugin)

Ferrite/Views/ComponentViews/Plugin/PluginTagsView.swift

@@ -1,5 +1,5 @@
 //
-//  PluginTagView.swift
+//  PluginTagsView.swift
 //  Ferrite
 //
 //  Created by Brian Dashore on 2/7/23.

Ferrite/Views/ComponentViews/Plugin/Source/SourceSettingsApiView.swift

@@ -19,7 +19,7 @@ struct SourceSettingsApiView: View {
 
     var body: some View {
         Section(
-            header: InlineHeader("API credentials"),
+            header: Text("API credentials"),
             footer: Text("Grab the required API credentials from the website. A client secret can be an API token.")
         ) {
             if let clientId = selectedSourceApi.clientId, clientId.dynamic {

Ferrite/Views/ComponentViews/Plugin/Source/SourceSettingsBaseUrlView.swift

@@ -13,7 +13,7 @@ struct SourceSettingsBaseUrlView: View {
     @State private var tempSite: String = ""
     var body: some View {
         Section(
-            header: InlineHeader("Base URL"),
+            header: Text("Base URL"),
             footer: Text("Enter the base URL of your server.")
         ) {
             TextField("https://...", text: $tempSite, onEditingChanged: { isFocused in

Ferrite/Views/ComponentViews/Plugin/Source/SourceSettingsMethodView.swift

@@ -11,7 +11,7 @@ struct SourceSettingsMethodView: View {
     @ObservedObject var selectedSource: Source
 
     var body: some View {
-        Section(header: InlineHeader("Fetch method")) {
+        Section("Fetch method") {
             Picker("", selection: $selectedSource.preferredParser) {
                 if selectedSource.jsonParser != nil {
                     Text("Website API").tag(SourcePreferredParser.siteApi.rawValue)

Ferrite/Views/ComponentViews/SearchResult/SearchFilterHeaderView.swift

@@ -53,7 +53,7 @@ struct SearchFilterHeaderView: View {
 
                 SelectedDebridFilterView {
                     FilterLabelView(
-                        name: debridManager.selectedDebridType?.toString(),
+                        name: debridManager.selectedDebridSource?.id,
                         fallbackName: "Debrid"
                     )
                 }

Ferrite/Views/ComponentViews/SearchResult/SearchResultButtonView.swift

@@ -28,50 +28,26 @@ struct SearchResultButtonView: View {
                 navModel.selectedTitle = result.title ?? ""
                 navModel.resultFromCloud = false
 
+                var historyEntry = HistoryEntryJson(
+                    name: result.title,
+                    source: result.source
+                )
+
                 switch debridIAStatus ?? debridManager.matchMagnetHash(result.magnet) {
                 case .full:
                     if debridManager.selectDebridResult(magnet: result.magnet) {
                         debridManager.currentDebridTask = Task {
-                            await debridManager.fetchDebridDownload(magnet: result.magnet)
+                            await downloadToDebrid()
-
-                            if !debridManager.downloadUrl.isEmpty {
-                                PersistenceController.shared.createHistory(
-                                    HistoryEntryJson(
-                                        name: result.title,
-                                        url: debridManager.downloadUrl,
-                                        source: result.source
-                                    ),
-                                    performSave: true
-                                )
-
-                                pluginManager.runDefaultAction(
-                                    urlString: debridManager.downloadUrl,
-                                    navModel: navModel
-                                )
-
-                                if navModel.currentChoiceSheet != .action {
-                                    debridManager.downloadUrl = ""
-                                }
-                            }
                         }
                     }
                 case .partial:
                     if debridManager.selectDebridResult(magnet: result.magnet) {
-                        navModel.selectedHistoryInfo = HistoryEntryJson(
+                        navModel.selectedHistoryInfo = historyEntry
-                            name: result.title,
-                            source: result.source
-                        )
                         navModel.currentChoiceSheet = .batch
                     }
                 case .none:
-                    PersistenceController.shared.createHistory(
+                    historyEntry.url = result.magnet.link
-                        HistoryEntryJson(
+                    PersistenceController.shared.createHistory(historyEntry, performSave: true)
-                            name: result.title,
-                            url: result.magnet.link,
-                            source: result.source
-                        ),
-                        performSave: true
-                    )
 
                     pluginManager.runDefaultAction(
                         urlString: result.magnet.link,
@@ -92,7 +68,7 @@ struct SearchResultButtonView: View {
         }
         .disableInteraction(navModel.currentChoiceSheet != nil)
         .tint(.primary)
-        .conditionalContextMenu(id: existingBookmark) {
+        .contextMenu {
             ZStack {
                 if let bookmark = existingBookmark {
                     Button {
@@ -123,18 +99,46 @@ struct SearchResultButtonView: View {
                     }
                 }
             }
+
+            Button {
+                if debridManager.currentDebridTask == nil {
+                    let foundIAResult = debridManager.selectDebridResult(magnet: result.magnet)
+
+                    // Add a fake IA because we don't know if the magnet is cached at this point
+                    if !foundIAResult {
+                        debridManager.selectedDebridItem = DebridIA(
+                            magnet: result.magnet,
+                            expiryTimeStamp: Date().timeIntervalSince1970,
+                            files: []
+                        )
+                    }
+
+                    debridManager.currentDebridTask = Task {
+                        await downloadToDebrid()
+
+                        // Re-populate the IA cache if a result wasn't initially found
+                        if !foundIAResult {
+                            await debridManager.populateDebridIA([result.magnet])
+                        }
+                    }
+                }
+            } label: {
+                Text("Download to Debrid")
+                Image(systemName: "arrow.down.circle")
+            }
         }
         .alert("Caching file", isPresented: $debridManager.showDeleteAlert) {
             Button("Yes", role: .destructive) {
                 Task {
-                    await debridManager.deleteRdTorrent()
+                    try? await debridManager.selectedDebridSource?.deleteUserMagnet(cloudMagnetId: nil)
                 }
             }
             Button("Cancel", role: .cancel) {}
         } message: {
             Text(
-                "RealDebrid is currently caching this file. Would you like to delete it? \n\n" +
+                "\(debridManager.selectedDebridSource?.id ?? "Unknown Debrid") is currently caching this file. " +
-                    "Progress can be checked on the RealDebrid website."
+                    "Would you like to delete it? \n\n" +
+                    "Progress can be checked on the \(debridManager.selectedDebridSource?.id ?? "Unknown Debrid") website."
             )
         }
         .onReceive(NotificationCenter.default.publisher(for: .didDeleteBookmark)) { notification in
@@ -167,4 +171,35 @@ struct SearchResultButtonView: View {
             }
         }
     }
+
+    // Common function to download
+    func downloadToDebrid() async {
+        var historyEntry = HistoryEntryJson(
+            name: result.title,
+            source: result.source
+        )
+
+        await debridManager.fetchDebridDownload(magnet: result.magnet)
+        navModel.selectedTitle = result.title ?? ""
+
+        if debridManager.requiresUnrestrict {
+            navModel.currentChoiceSheet = .batch
+
+            return
+        }
+
+        if !debridManager.downloadUrl.isEmpty {
+            historyEntry.url = debridManager.downloadUrl
+            PersistenceController.shared.createHistory(historyEntry, performSave: true)
+
+            pluginManager.runDefaultAction(
+                urlString: debridManager.downloadUrl,
+                navModel: navModel
+            )
+
+            if navModel.currentChoiceSheet != .action {
+                debridManager.downloadUrl = ""
+            }
+        }
+    }
 }

Ferrite/Views/ComponentViews/SearchResult/SearchResultInfoView.swift

@@ -1,5 +1,5 @@
 //
-//  SearchResultRDView.swift
+//  SearchResultInfoView.swift
 //  Ferrite
 //
 //  Created by Brian Dashore on 7/26/22.
@@ -30,7 +30,9 @@ struct SearchResultInfoView: View {
                 Text(size)
             }
 
-            DebridLabelView(magnet: result.magnet)
+            if let debridSource = debridManager.selectedDebridSource {
+                DebridLabelView(debridSource: debridSource, magnet: result.magnet)
+            }
         }
         .font(.caption)
     }

Ferrite/Views/ComponentViews/Settings/DefaultActionPickerView.swift

@@ -1,5 +1,5 @@
 //
-//  DefaultActionsPickerViews.swift
+//  DefaultActionPickerView.swift
 //  Ferrite
 //
 //  Created by Brian Dashore on 8/11/22.

Ferrite/Views/ComponentViews/Settings/Kodi/KodiEditorView.swift

@@ -25,11 +25,11 @@ struct KodiEditorView: View {
     @State private var errorAlertText: String = ""
 
     var body: some View {
-        NavView {
+        NavigationStack {
             Form {
                 Group {
                     Section(
-                        header: InlineHeader("URL"),
+                        header: Text("URL"),
                         footer: Text("Must follow the format http(s)://<ip>:<port>")
                     ) {
                         TextField("Enter URL", text: $serverUrl)
@@ -37,14 +37,14 @@ struct KodiEditorView: View {
                     }
 
                     Section(
-                        header: InlineHeader("Friendly name"),
+                        header: Text("Friendly name"),
                         footer: Text("Defaults to the URL if not provided")
                     ) {
                         TextField("Friendly name", text: $friendlyName)
                     }
 
                     Section(
-                        header: InlineHeader("Credentials"),
+                        header: Text("Credentials"),
                         footer: Text("Only use for clients with authentication")
                     ) {
                         TextField("Username", text: $username)

Ferrite/Views/ComponentViews/Settings/Kodi/SettingsKodiView.swift

@@ -18,7 +18,7 @@ struct SettingsKodiView: View {
 
     var body: some View {
         List {
-            Section(header: InlineHeader("Description")) {
+            Section("Description") {
                 VStack(alignment: .leading, spacing: 10) {
                     Text("Kodi is an external application that is used to manage a local media library and playback.")
 
@@ -27,7 +27,7 @@ struct SettingsKodiView: View {
             }
 
             Section(
-                header: InlineHeader("Servers"),
+                header: Text("Servers"),
                 footer: Text("Edit a server by holding it and accessing the context menu")
             ) {
                 if kodiServers.isEmpty {

Ferrite/Views/ComponentViews/Settings/PluginList/PluginListEditorView.swift

@@ -1,5 +1,5 @@
 //
-//  SourceListEditorView.swift
+//  PluginListEditorView.swift
 //  Ferrite
 //
 //  Created by Brian Dashore on 7/25/22.
@@ -25,7 +25,7 @@ struct PluginListEditorView: View {
     @State private var loadedSelectedList = false
 
     var body: some View {
-        NavView {
+        NavigationStack {
             Form {
                 TextField("Enter URL", text: $pluginListUrl)
                     .disableAutocorrection(true)

Ferrite/Views/ComponentViews/Settings/PluginList/SettingsPluginListView.swift

@@ -1,5 +1,5 @@
 //
-//  SettingsSourceListView.swift
+//  SettingsPluginListView.swift
 //  Ferrite
 //
 //  Created by Brian Dashore on 7/25/22.
@@ -69,12 +69,8 @@ struct SettingsPluginListView: View {
             }
         }
         .sheet(isPresented: $presentEditSheet) {
-            if #available(iOS 16, *) {
+            PluginListEditorView()
-                PluginListEditorView()
+                .presentationDetents([.medium])
-                    .presentationDetents([.medium])
-            } else {
-                PluginListEditorView()
-            }
         }
         .navigationTitle("Plugin Lists")
         .navigationBarTitleDisplayMode(.inline)

Ferrite/Views/ComponentViews/Settings/SettingsAppVersionView.swift

@@ -20,7 +20,7 @@ struct SettingsAppVersionView: View {
                 ProgressView()
             } else if !releases.isEmpty {
                 List {
-                    Section(header: InlineHeader("GitHub links")) {
+                    Section("GitHub links") {
                         ForEach(releases, id: \.self) { release in
                             ListRowLinkView(text: release.tagName, link: release.htmlUrl)
                         }

Ferrite/Views/ComponentViews/Settings/SettingsDebridInfoView.swift

@@ -1,5 +1,5 @@
 //
-//  DebridInfoView.swift
+//  SettingsDebridInfoView.swift
 //  Ferrite
 //
 //  Created by Brian Dashore on 3/5/23.
@@ -10,46 +10,55 @@ import SwiftUI
 struct SettingsDebridInfoView: View {
     @EnvironmentObject var debridManager: DebridManager
 
-    let debridType: DebridType
+    @Store var debridSource: DebridSource
 
     @State private var apiKeyTempText: String = ""
 
     var body: some View {
         List {
-            Section(header: InlineHeader("Description")) {
+            Section("Description") {
                 VStack(alignment: .leading, spacing: 10) {
-                    Text("\(debridType.toString()) is a debrid service that is used for unrestricting downloads and media playback. You must pay to access the service.")
+                    Text(debridSource.description ??
+                        "\(debridSource.id) is a debrid service that is used for downloads and media playback. You must pay to access the service."
+                    )
 
-                    Link("Website", destination: URL(string: debridType.website()) ?? URL(string: "https://kingbri.dev/ferrite")!)
+                    Link("Website", destination: URL(string: debridSource.website) ?? URL(string: "https://kingbri.dev/ferrite")!)
                 }
             }
 
             Section(
-                header: InlineHeader("Login status"),
+                header: Text("Login status"),
                 footer: Text("A WebView will show up to prompt you for credentials")
             ) {
                 Button {
                     Task {
-                        if debridManager.enabledDebrids.contains(debridType) {
+                        if debridSource.isLoggedIn {
-                            await debridManager.logoutDebrid(debridType: debridType)
+                            await debridManager.logout(debridSource)
-                        } else if !debridManager.authProcessing(debridType) {
+                        } else if !debridSource.authProcessing {
-                            await debridManager.authenticateDebrid(debridType: debridType, apiKey: nil)
+                            await debridManager.authenticateDebrid(debridSource, apiKey: nil)
                         }
 
-                        apiKeyTempText = await debridManager.getManualAuthKey(debridType) ?? ""
+                        apiKeyTempText = await debridManager.getManualAuthKey(debridSource) ?? ""
                     }
                 } label: {
                     Text(
-                        debridManager.enabledDebrids.contains(debridType)
+                        debridSource.isLoggedIn
                             ? "Logout"
-                            : (debridManager.authProcessing(debridType) ? "Processing" : "Login")
+                            : (debridSource.authProcessing ? "Processing" : "Login")
+                    )
+                    .foregroundColor(debridSource.isLoggedIn ? .red : .blue)
+                }
+                .alert("Invalid web login", isPresented: $debridManager.showWebLoginAlert) {
+                    Button("OK", role: .cancel) {}
+                } message: {
+                    Text(
+                        "\(debridSource.id) does not have a login portal. Please use an API key to login."
                     )
-                    .foregroundColor(debridManager.enabledDebrids.contains(debridType) ? .red : .blue)
                 }
             }
 
             Section(
-                header: InlineHeader("API key"),
+                header: Text("API key"),
                 footer: Text("Add a permanent API key here. Only use this if web authentication does not work!")
             ) {
                 HybridSecureField(
@@ -57,22 +66,22 @@ struct SettingsDebridInfoView: View {
                     onCommit: {
                         Task {
                             if !apiKeyTempText.isEmpty {
-                                await debridManager.authenticateDebrid(debridType: debridType, apiKey: apiKeyTempText)
+                                await debridManager.authenticateDebrid(debridSource, apiKey: apiKeyTempText)
-                                apiKeyTempText = await debridManager.getManualAuthKey(debridType) ?? ""
+                                apiKeyTempText = await debridManager.getManualAuthKey(debridSource) ?? ""
                             }
                         }
                     }
                 )
-                .fieldDisabled(debridManager.enabledDebrids.contains(debridType))
+                .fieldDisabled(debridSource.isLoggedIn)
             }
             .onAppear {
                 Task {
-                    apiKeyTempText = await debridManager.getManualAuthKey(debridType) ?? ""
+                    apiKeyTempText = await debridManager.getManualAuthKey(debridSource) ?? ""
                 }
             }
         }
         .listStyle(.insetGrouped)
-        .navigationTitle(debridType.toString())
+        .navigationTitle(debridSource.id)
         .navigationBarTitleDisplayMode(.inline)
     }
 }

Ferrite/Views/ComponentViews/Settings/SettingsDebridLinkView.swift

@@ -0,0 +1,31 @@
+//
+//  SettingsDebridLinkView.swift
+//  Ferrite
+//
+//  Created by Brian Dashore on 11/27/24.
+//
+
+import SwiftUI
+
+struct SettingsDebridLinkView: View {
+    var debridSource: DebridSource
+
+    // TODO: Use a roundabout state for now
+    @State private var isLoggedIn = false
+
+    var body: some View {
+        NavigationLink {
+            SettingsDebridInfoView(debridSource: debridSource)
+        } label: {
+            HStack {
+                Text(debridSource.id)
+                Spacer()
+                Text(isLoggedIn ? "Enabled" : "Disabled")
+                    .foregroundColor(.secondary)
+            }
+        }
+        .onAppear {
+            isLoggedIn = debridSource.isLoggedIn
+        }
+    }
+}

Ferrite/Views/ContentView.swift

@@ -27,7 +27,7 @@ struct ContentView: View {
     @State private var dismissAction: () -> Void = {}
 
     var body: some View {
-        NavView {
+        NavigationStack {
             List {
                 SearchResultsView(searchText: $searchText)
             }

Ferrite/Views/LibraryView.swift

@@ -30,7 +30,7 @@ struct LibraryView: View {
     @State private var searchText: String = ""
 
     var body: some View {
-        NavView {
+        NavigationStack {
             ZStack {
                 switch navModel.libraryPickerSelection {
                 case .bookmarks:
@@ -38,7 +38,13 @@ struct LibraryView: View {
                 case .history:
                     HistoryView(allHistoryEntries: allHistoryEntries, searchText: $searchText)
                 case .debridCloud:
-                    DebridCloudView(searchText: $searchText)
+                    if let selectedDebridSource = debridManager.selectedDebridSource {
+                        DebridCloudView(debridSource: selectedDebridSource, searchText: $searchText)
+                    } else {
+                        // Placeholder view that takes up the entire parent view
+                        Color.clear
+                            .frame(maxWidth: .infinity)
+                    }
                 }
             }
             .overlay {
@@ -53,7 +59,7 @@ struct LibraryView: View {
                             EmptyInstructionView(title: "No History", message: "Start watching to build history")
                         }
                     case .debridCloud:
-                        if debridManager.selectedDebridType == nil {
+                        if debridManager.selectedDebridSource == nil {
                             EmptyInstructionView(title: "Cloud Unavailable", message: "Listing is not available for this service")
                         }
                     }
@@ -69,7 +75,7 @@ struct LibraryView: View {
                         switch navModel.libraryPickerSelection {
                         case .bookmarks, .debridCloud:
                             SelectedDebridFilterView {
-                                Text(debridManager.selectedDebridType?.toString(abbreviated: true) ?? "Debrid")
+                                Text(debridManager.selectedDebridSource?.abbreviation ?? "Debrid")
                             }
                             .transaction {
                                 $0.animation = .none
@@ -90,6 +96,11 @@ struct LibraryView: View {
             .esAutocapitalization(autocorrectSearch ? .sentences : .none)
             .environment(\.editMode, $editMode)
         }
+        .alert("Not implemented", isPresented: $debridManager.showNotImplementedAlert) {
+            Button("OK", role: .cancel) {}
+        } message: {
+            Text(debridManager.notImplementedMessage)
+        }
         .onChange(of: navModel.libraryPickerSelection) { _ in
             editMode = .inactive
         }

Ferrite/Views/LoginWebView.swift

@@ -12,7 +12,7 @@ struct LoginWebView: View {
     var url: URL
 
     var body: some View {
-        NavView {
+        NavigationStack {
             WebView(url: url)
                 .navigationTitle("Sign in")
                 .navigationBarTitleDisplayMode(.inline)

Ferrite/Views/MainView.swift

@@ -54,12 +54,8 @@ struct MainView: View {
             case .batch:
                 BatchChoiceView()
             case .activity:
-                if #available(iOS 16, *) {
+                ShareSheet(activityItems: navModel.activityItems)
-                    ShareSheet(activityItems: navModel.activityItems)
+                    .presentationDetents([.medium, .large])
-                        .presentationDetents([.medium, .large])
-                } else {
-                    ShareSheet(activityItems: navModel.activityItems)
-                }
             }
         }
         .onAppear {

Ferrite/Views/PluginsView.swift

@@ -30,7 +30,7 @@ struct PluginsView: View {
     @State private var searchText: String = ""
 
     var body: some View {
-        NavView {
+        NavigationStack {
             ZStack {
                 if checkedForPlugins {
                     switch navModel.pluginPickerSelection {

Ferrite/Views/RepresentableViews/ExpandedSearchable.swift

@@ -7,7 +7,7 @@
 
 import SwiftUI
 
-public extension View {
+extension View {
     // A dismissAction must be added in the parent view struct due to lifecycle issues
     func expandedSearchable(text: Binding<String>,
                             isSearching: Binding<Bool>? = nil,
@@ -212,10 +212,7 @@ struct SearchBar<ScopeContent: View>: UIViewControllerRepresentable {
         private func setup() {
             parent?.navigationItem.searchController = searchController
             parent?.navigationItem.hidesSearchBarWhenScrolling = false
-
+            parent?.navigationItem.preferredSearchBarPlacement = .stacked
-            if #available(iOS 16, *) {
-                parent?.navigationItem.preferredSearchBarPlacement = .stacked
-            }
 
             // Makes search bar appear when application starts
             parent?.navigationController?.navigationBar.sizeToFit()

Ferrite/Views/SettingsView.swift

@@ -6,7 +6,6 @@
 //
 
 import BetterSafariView
-import Introspect
 import SwiftUI
 import WebKit
 
@@ -43,24 +42,15 @@ struct SettingsView: View {
     @FocusState private var focusedField: Field?
 
     var body: some View {
-        NavView {
+        NavigationStack {
             Form {
-                Section(header: InlineHeader("Debrid services")) {
+                Section("Debrid services") {
-                    ForEach(DebridType.allCases, id: \.self) { debridType in
+                    ForEach(debridManager.debridSources, id: \.id) { (debridSource: DebridSource) in
-                        NavigationLink {
+                        SettingsDebridLinkView(debridSource: debridSource)
-                            SettingsDebridInfoView(debridType: debridType)
-                        } label: {
-                            HStack {
-                                Text(debridType.toString())
-                                Spacer()
-                                Text(debridManager.enabledDebrids.contains(debridType) ? "Enabled" : "Disabled")
-                                    .foregroundColor(.secondary)
-                            }
-                        }
                     }
                 }
 
-                Section(header: InlineHeader("Playback services")) {
+                Section("Playback services") {
                     NavigationLink {
                         SettingsKodiView(kodiServers: kodiServers)
                     } label: {
@@ -74,7 +64,7 @@ struct SettingsView: View {
                 }
 
                 Section(
-                    header: InlineHeader("Behavior"),
+                    header: Text("Behavior"),
                     footer: VStack(alignment: .leading, spacing: 8) {
                         Text("Temporarily disable ephemeral auth if you cannot log into a service")
                         Text("Only disable search timeout if results are slow to fetch")
@@ -121,14 +111,14 @@ struct SettingsView: View {
                     }
                 }
 
-                Section(header: InlineHeader("Plugin management")) {
+                Section("Plugin management") {
                     NavigationLink("Plugin lists") {
                         SettingsPluginListView()
                     }
                 }
 
-                Section(header: InlineHeader("Default actions")) {
+                Section("Default actions") {
-                    if debridManager.enabledDebrids.count > 0 {
+                    if !debridManager.enabledDebrids.isEmpty {
                         NavigationLink {
                             DefaultActionPickerView(
                                 actionRequirement: .debrid,
@@ -185,13 +175,13 @@ struct SettingsView: View {
                     }
                 }
 
-                Section(header: InlineHeader("Backups")) {
+                Section("Backups") {
                     NavigationLink("Backups") {
                         BackupsView()
                     }
                 }
 
-                Section(header: InlineHeader("Updates")) {
+                Section("Updates") {
                     Toggle(isOn: $autoUpdateNotifs) {
                         Text("Show update alerts")
                     }
@@ -201,7 +191,7 @@ struct SettingsView: View {
                     }
                 }
 
-                Section(header: InlineHeader("Information")) {
+                Section("Information") {
                     ListRowLinkView(text: "Donate", link: "https://ko-fi.com/kingbri")
                     ListRowLinkView(text: "Report issues", link: "https://github.com/bdashore3/Ferrite/issues")
 
@@ -210,7 +200,7 @@ struct SettingsView: View {
                     }
                 }
 
-                Section(header: InlineHeader("Debug")) {
+                Section("Debug") {
                     NavigationLink("Logs") {
                         SettingsLogView()
                     }
@@ -227,7 +217,7 @@ struct SettingsView: View {
                     callbackURLScheme: "ferrite"
                 ) { callbackURL, error in
                     Task {
-                        await debridManager.handleCallback(url: callbackURL, error: error)
+                        await debridManager.handleAuthCallback(url: callbackURL, error: error)
                     }
                 }
                 .prefersEphemeralWebBrowserSession(useEphemeralAuth)

Ferrite/Views/SheetViews/ActionChoiceView.swift

@@ -1,5 +1,5 @@
 //
-//  MagnetChoiceView.swift
+//  ActionChoiceView.swift
 //  Ferrite
 //
 //  Created by Brian Dashore on 7/20/22.
@@ -29,9 +29,9 @@ struct ActionChoiceView: View {
     @State private var showMagnetCopyAlert = false
 
     var body: some View {
-        NavView {
+        NavigationStack {
             Form {
-                Section(header: InlineHeader("Now Playing")) {
+                Section("Now Playing") {
                     VStack(alignment: .leading, spacing: 5) {
                         Text(navModel.selectedTitle)
                             .font(.callout)
@@ -46,7 +46,7 @@ struct ActionChoiceView: View {
                 }
 
                 if !debridManager.downloadUrl.isEmpty {
-                    Section(header: InlineHeader("Debrid options")) {
+                    Section("Debrid options") {
                         ForEach(actions, id: \.id) { action in
                             if action.requires.contains(ActionRequirement.debrid.rawValue) {
                                 ListRowButtonView(action.name, systemImage: "arrow.up.forward.app.fill") {
@@ -91,7 +91,7 @@ struct ActionChoiceView: View {
                 }
 
                 if !navModel.resultFromCloud {
-                    Section(header: InlineHeader("Magnet options")) {
+                    Section("Magnet options") {
                         ForEach(actions, id: \.id) { action in
                             if action.requires.contains(ActionRequirement.magnet.rawValue) {
                                 ListRowButtonView(action.name, systemImage: "arrow.up.forward.app.fill") {
@@ -123,13 +123,8 @@ struct ActionChoiceView: View {
             }
             .tint(.primary)
             .sheet(isPresented: $navModel.showLocalActivitySheet) {
-                // TODO: Fix share sheet
+                ShareSheet(activityItems: navModel.activityItems)
-                if #available(iOS 16, *) {
+                    .presentationDetents([.medium, .large])
-                    ShareSheet(activityItems: navModel.activityItems)
-                        .presentationDetents([.medium, .large])
-                } else {
-                    ShareSheet(activityItems: navModel.activityItems)
-                }
             }
             .alert("Action successful", isPresented: $pluginManager.showActionSuccessAlert) {
                 Button("OK", role: .cancel) {}
@@ -143,6 +138,8 @@ struct ActionChoiceView: View {
             }
             .onDisappear {
                 debridManager.downloadUrl = ""
+                debridManager.clearSelectedDebridItems()
+                debridManager.requiresUnrestrict = false
                 navModel.selectedTitle = ""
                 navModel.selectedBatchTitle = ""
                 navModel.resultFromCloud = false
@@ -153,8 +150,11 @@ struct ActionChoiceView: View {
                 ToolbarItem(placement: .navigationBarTrailing) {
                     Button("Done") {
                         debridManager.downloadUrl = ""
+                        debridManager.clearSelectedDebridItems()
+                        debridManager.requiresUnrestrict = false
                         navModel.selectedTitle = ""
                         navModel.selectedBatchTitle = ""
+                        navModel.resultFromCloud = false
 
                         dismiss()
                     }

Ferrite/Views/SheetViews/BatchChoiceView.swift

@@ -19,43 +19,17 @@ struct BatchChoiceView: View {
 
     @State private var searchText: String = ""
 
-    // TODO: Make this generic for an IA protocol
     var body: some View {
-        NavView {
+        NavigationStack {
             List {
-                switch debridManager.selectedDebridType {
+                ForEach(debridManager.selectedDebridItem?.files ?? [], id: \.self) { file in
-                case .realDebrid:
+                    if file.name.lowercased().contains(searchText.lowercased()) || searchText.isEmpty {
-                    ForEach(debridManager.selectedRealDebridItem?.files ?? [], id: \.self) { file in
+                        Button(file.name) {
-                        if file.name.lowercased().contains(searchText.lowercased()) || searchText.isEmpty {
+                            debridManager.selectedDebridFile = file
-                            Button(file.name) {
-                                debridManager.selectedRealDebridFile = file
 
-                                queueCommonDownload(fileName: file.name)
+                            queueCommonDownload(fileName: file.name)
-                            }
                         }
                     }
-                case .allDebrid:
-                    ForEach(debridManager.selectedAllDebridItem?.files ?? [], id: \.self) { file in
-                        if file.name.lowercased().contains(searchText.lowercased()) || searchText.isEmpty {
-                            Button(file.name) {
-                                debridManager.selectedAllDebridFile = file
-
-                                queueCommonDownload(fileName: file.name)
-                            }
-                        }
-                    }
-                case .premiumize:
-                    ForEach(debridManager.selectedPremiumizeItem?.files ?? [], id: \.self) { file in
-                        if file.name.lowercased().contains(searchText.lowercased()) || searchText.isEmpty {
-                            Button(file.name) {
-                                debridManager.selectedPremiumizeFile = file
-
-                                queueCommonDownload(fileName: file.name)
-                            }
-                        }
-                    }
-                case .none:
-                    EmptyView()
                 }
             }
             .tint(.primary)
@@ -64,6 +38,10 @@ struct BatchChoiceView: View {
             .searchable(text: $searchText, placement: .navigationBarDrawer(displayMode: .always))
             .autocorrectionDisabled(!autocorrectSearch)
             .textInputAutocapitalization(autocorrectSearch ? .sentences : .never)
+            .onDisappear {
+                debridManager.clearSelectedDebridItems()
+                debridManager.requiresUnrestrict = false
+            }
             .navigationTitle("Select a file")
             .navigationBarTitleDisplayMode(.inline)
             .toolbar {
@@ -75,6 +53,7 @@ struct BatchChoiceView: View {
                             try? await Task.sleep(seconds: 1)
 
                             debridManager.clearSelectedDebridItems()
+                            debridManager.requiresUnrestrict = false
                         }
                     }
                 }
@@ -85,7 +64,11 @@ struct BatchChoiceView: View {
     // Common function to communicate betwen VMs and queue/display a download
     func queueCommonDownload(fileName: String) {
         debridManager.currentDebridTask = Task {
-            await debridManager.fetchDebridDownload(magnet: navModel.resultFromCloud ? nil : navModel.selectedMagnet)
+            if debridManager.requiresUnrestrict {
+                await debridManager.unrestrictDownload()
+            } else {
+                await debridManager.fetchDebridDownload(magnet: navModel.selectedMagnet)
+            }
 
             if !debridManager.downloadUrl.isEmpty {
                 try? await Task.sleep(seconds: 1)