Jellyfin audiobook download

BookPlayer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "a666f382d5a4884d3a9212a8e4b32eb8280bc2409cc22962bfa19e19731621ac",
+  "originHash" : "ac51a28f8927f1f439722175648f4ad5fe8f47b1036af26dc1d79fc70f1b86e0",
   "pins" : [
     {
       "identity" : "devicekit",
@@ -19,6 +19,15 @@
         "version" : "2.7.3"
       }
     },
+    {
+      "identity" : "get",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kean/Get",
+      "state" : {
+        "revision" : "31249885da1052872e0ac91a2943f62567c0d96d",
+        "version" : "2.2.1"
+      }
+    },
     {
       "identity" : "idzswiftcommoncrypto",
       "kind" : "remoteSourceControl",
@@ -28,6 +37,15 @@
         "version" : "0.16.1"
       }
     },
+    {
+      "identity" : "jellyfin-sdk-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/jellyfin/jellyfin-sdk-swift.git",
+      "state" : {
+        "revision" : "a0e848a7aaec55991610818de6128b15cfcec725",
+        "version" : "0.4.0"
+      }
+    },
     {
       "identity" : "kingfisher",
       "kind" : "remoteSourceControl",
@@ -91,6 +109,15 @@
         "version" : "1.1.0"
       }
     },
+    {
+      "identity" : "urlqueryencoder",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/CreateAPI/URLQueryEncoder",
+      "state" : {
+        "revision" : "4ce950479707ea109f229d7230ec074a133b15d7",
+        "version" : "0.2.1"
+      }
+    },
     {
       "identity" : "ziparchive",
       "kind" : "remoteSourceControl",

BookPlayer/AppDelegate.swift

@@ -135,13 +135,17 @@ class AppDelegate: UIResponder, UIApplicationDelegate, BPLogger {
         playbackService: playbackService,
         playerManager: playerManager
       )
+      let singleFileDownloadService = SingleFileDownloadService(
+        networkClient: NetworkClient()
+      )
       let coreServices = CoreServices(
         dataManager: dataManager,
         accountService: accountService,
         syncService: syncService,
         libraryService: libraryService,
         playbackService: playbackService,
         playerManager: playerManager,
+        singleFileDownloadService: singleFileDownloadService,
         playerLoaderService: playerLoaderService,
         watchService: watchService
       )

BookPlayer/Base.lproj/Localizable.strings

@@ -228,6 +228,7 @@
 "cancel_download_title" = "Cancel download";
 "remove_downloaded_file_title" = "Remove from device";
 "download_from_url_title" = "Download from URL";
+"download_from_jellyfin_title" = "Download from Jellyfin";
 "done_title" = "Done";
 "select_title" = "Select";
 "sort_button_title" = "Sort";
@@ -319,3 +320,15 @@ We're working hard on providing a seamless experience, if possible, please conta
 "Rewind ${interval}" = "Rewind ${interval}";
 "settings_lock_orientation_title" = "Orientation Locked";
 "more_title" = "More";
+"jellyfin_connection_title" = "Jellyfin";
+"jellyfin_connect_button" = "Connect";
+"jellyfin_login_button" = "Log in";
+"jellyfin_section_server_url" = "Server URL";
+"jellyfin_server_url_placeholder" = "http://jellyfin.example.com:8096";
+"jellyfin_section_server_url_footer" = "Connect to your Jellyfin server";
+"jellyfin_section_server" = "Server";
+"jellyfin_server_name_label" = "Name";
+"jellyfin_server_url_label" = "URL";
+"jellyfin_section_login" = "Log in";
+"jellyfin_username_placeholder" = "Username";
+"jellyfin_password_placeholder" = "Password";

BookPlayer/Coordinators/FolderListCoordinator.swift

@@ -16,6 +16,7 @@ class FolderListCoordinator: ItemListCoordinator {
     flow: BPCoordinatorPresentationFlow,
     folderRelativePath: String,
     playerManager: PlayerManagerProtocol,
+    singleFileDownloadService: SingleFileDownloadService,
     libraryService: LibraryServiceProtocol,
     playbackService: PlaybackServiceProtocol,
     syncService: SyncServiceProtocol,
@@ -27,6 +28,7 @@ class FolderListCoordinator: ItemListCoordinator {
     super.init(
       flow: flow,
       playerManager: playerManager,
+      singleFileDownloadService: singleFileDownloadService,
       libraryService: libraryService,
       playbackService: playbackService,
       syncService: syncService, 
@@ -40,7 +42,7 @@ class FolderListCoordinator: ItemListCoordinator {
     let viewModel = ItemListViewModel(
       folderRelativePath: self.folderRelativePath,
       playerManager: self.playerManager,
-      networkClient: NetworkClient(),
+      singleFileDownloadService: self.singleFileDownloadService,
       libraryService: self.libraryService,
       playbackService: self.playbackService,
       syncService: self.syncService, 
@@ -56,6 +58,8 @@ class FolderListCoordinator: ItemListCoordinator {
         self.loadPlayer(relativePath)
       case .showDocumentPicker:
         self.showDocumentPicker()
+      case .showJellyfinDownloader:
+        self.showJellyfinDownloader()
       case .showSearchList(let relativePath, let placeholderTitle):
         self.showSearchList(at: relativePath, placeholderTitle: placeholderTitle)
       case .showItemDetails(let item):

BookPlayer/Coordinators/ItemListCoordinator.swift

@@ -13,6 +13,7 @@ import UniformTypeIdentifiers
 
 class ItemListCoordinator: NSObject, Coordinator, AlertPresenter, BPLogger {
   let playerManager: PlayerManagerProtocol
+  let singleFileDownloadService: SingleFileDownloadService
   let libraryService: LibraryServiceProtocol
   let playbackService: PlaybackServiceProtocol
   let syncService: SyncServiceProtocol
@@ -22,9 +23,17 @@ class ItemListCoordinator: NSObject, Coordinator, AlertPresenter, BPLogger {
 
   weak var documentPickerDelegate: UIDocumentPickerDelegate?
 
+  lazy var jellyfinCoordinator: JellyfinCoordinator = {
+    JellyfinCoordinator(
+      flow: .modalFlow(presentingController: flow.navigationController),
+      singleFileDownloadService: singleFileDownloadService
+    )
+  }()
+
   init(
     flow: BPCoordinatorPresentationFlow,
     playerManager: PlayerManagerProtocol,
+    singleFileDownloadService: SingleFileDownloadService,
     libraryService: LibraryServiceProtocol,
     playbackService: PlaybackServiceProtocol,
     syncService: SyncServiceProtocol,
@@ -33,6 +42,7 @@ class ItemListCoordinator: NSObject, Coordinator, AlertPresenter, BPLogger {
   ) {
     self.flow = flow
     self.playerManager = playerManager
+    self.singleFileDownloadService = singleFileDownloadService
     self.libraryService = libraryService
     self.playbackService = playbackService
     self.syncService = syncService
@@ -54,6 +64,7 @@ class ItemListCoordinator: NSObject, Coordinator, AlertPresenter, BPLogger {
       flow: .pushFlow(navigationController: flow.navigationController),
       folderRelativePath: relativePath,
       playerManager: playerManager,
+      singleFileDownloadService: singleFileDownloadService,
       libraryService: libraryService,
       playbackService: playbackService,
       syncService: syncService,
@@ -160,6 +171,10 @@ extension ItemListCoordinator {
     flow.navigationController.present(providerList, animated: true, completion: nil)
   }
 
+  func showJellyfinDownloader() {
+    jellyfinCoordinator.start()
+  }
+
   func showExportController(for items: [SimpleLibraryItem]) {
     let providers = items.map { BookActivityItemProvider($0) }
 

BookPlayer/Coordinators/LibraryListCoordinator.swift

@@ -28,6 +28,7 @@ class LibraryListCoordinator: ItemListCoordinator, UINavigationControllerDelegat
   init(
     flow: BPCoordinatorPresentationFlow,
     playerManager: PlayerManagerProtocol,
+    singleFileDownloadService: SingleFileDownloadService,
     libraryService: LibraryServiceProtocol,
     playbackService: PlaybackServiceProtocol,
     syncService: SyncServiceProtocol,
@@ -40,6 +41,7 @@ class LibraryListCoordinator: ItemListCoordinator, UINavigationControllerDelegat
     super.init(
       flow: flow,
       playerManager: playerManager,
+      singleFileDownloadService: singleFileDownloadService,
       libraryService: libraryService,
       playbackService: playbackService,
       syncService: syncService,
@@ -54,7 +56,7 @@ class LibraryListCoordinator: ItemListCoordinator, UINavigationControllerDelegat
     let viewModel = ItemListViewModel(
       folderRelativePath: nil,
       playerManager: self.playerManager,
-      networkClient: NetworkClient(),
+      singleFileDownloadService: self.singleFileDownloadService,
       libraryService: self.libraryService,
       playbackService: self.playbackService,
       syncService: self.syncService,
@@ -70,6 +72,8 @@ class LibraryListCoordinator: ItemListCoordinator, UINavigationControllerDelegat
         self.loadPlayer(relativePath)
       case .showDocumentPicker:
         self.showDocumentPicker()
+      case .showJellyfinDownloader:
+        self.showJellyfinDownloader()
       case .showSearchList(let relativePath, let placeholderTitle):
         self.showSearchList(at: relativePath, placeholderTitle: placeholderTitle)
       case .showItemDetails(let item):
@@ -311,15 +315,6 @@ class LibraryListCoordinator: ItemListCoordinator, UINavigationControllerDelegat
     lastItemListViewController.viewModel.viewDidAppear()
   }
 
-  func handleDownloadAction(url: URL) {
-    guard
-      let libraryListViewController = flow.navigationController.viewControllers.first as? ItemListViewController
-    else { return }
-
-    libraryListViewController.setEditing(false, animated: false)
-    libraryListViewController.viewModel.handleDownload(url)
-  }
-
   override func syncList() {
     /// Process any deferred progress calculations for folders
     if playbackService.processFoldersStaleProgress() {

BookPlayer/Coordinators/MainCoordinator.swift

@@ -16,6 +16,7 @@ class MainCoordinator: NSObject {
   var tabBarController: AppTabBarController?
 
   let playerManager: PlayerManagerProtocol
+  let singleFileDownloadService: SingleFileDownloadService
   let libraryService: LibraryServiceProtocol
   let playbackService: PlaybackServiceProtocol
   let accountService: AccountServiceProtocol
@@ -36,6 +37,7 @@ class MainCoordinator: NSObject {
     self.syncService = coreServices.syncService
     self.playbackService = coreServices.playbackService
     self.playerManager = coreServices.playerManager
+    self.singleFileDownloadService = coreServices.singleFileDownloadService
     self.watchConnectivityService = coreServices.watchService
 
     ThemeManager.shared.libraryService = libraryService
@@ -84,6 +86,7 @@ class MainCoordinator: NSObject {
     let libraryCoordinator = LibraryListCoordinator(
       flow: .pushFlow(navigationController: AppNavigationController.instantiate(from: .Main)),
       playerManager: self.playerManager,
+      singleFileDownloadService: self.singleFileDownloadService,
       libraryService: self.libraryService,
       playbackService: self.playbackService,
       syncService: syncService,

BookPlayer/Jellyfin/Connection Screen/JellyfinConnectionFormViewModel.swift

@@ -0,0 +1,16 @@
+//
+//  JellyfinConnectionFormViewModel.swift
+//  BookPlayer
+//
+//  Created by Lysann Tranvouez on 2024-10-25.
+//  Copyright © 2024 Tortuga Power. All rights reserved.
+//
+
+import Foundation
+
+class JellyfinConnectionFormViewModel: ObservableObject {
+  @Published var serverUrl: String = ""
+  @Published var serverName: String?
+  @Published var username: String = ""
+  @Published var password: String = ""
+}

BookPlayer/Jellyfin/Connection Screen/JellyfinConnectionView.swift

@@ -0,0 +1,106 @@
+//
+//  JellyfinConnectionView.swift
+//  BookPlayer
+//
+//  Created by Lysann Tranvouez on 2024-10-25.
+//  Copyright © 2024 Tortuga Power. All rights reserved.
+//
+
+import SwiftUI
+
+struct JellyfinConnectionView: View {
+  /// View model for the form
+  @ObservedObject var viewModel: JellyfinConnectionViewModel
+  /// Theme view model to update colors
+  @StateObject var themeViewModel = ThemeViewModel()
+
+  struct DisconnectedView: View {
+    var serverUrl: Binding<String>
+    @EnvironmentObject var themeViewModel: ThemeViewModel
+
+    var body: some View {
+      Section {
+        ClearableTextField("jellyfin_server_url_placeholder".localized, text: serverUrl) {
+          $0.keyboardType = .URL
+          $0.textContentType = .URL
+          $0.autocapitalization = .none
+        }
+      } header: {
+        Text("jellyfin_section_server_url".localized)
+          .foregroundColor(themeViewModel.secondaryColor)
+      } footer: {
+        Text("jellyfin_section_server_url_footer".localized)
+          .foregroundColor(themeViewModel.secondaryColor)
+      }
+    }
+  }
+
+  struct FoundServerView: View {
+    var serverUrl: String
+    var serverName: String
+    var username: Binding<String>
+    var password: Binding<String>
+    @EnvironmentObject var themeViewModel: ThemeViewModel
+
+    var body: some View {
+      Section {
+        HStack {
+          Text("jellyfin_server_name_label".localized)
+            .foregroundColor(themeViewModel.secondaryColor)
+          Spacer()
+          Text(serverName)
+        }
+        HStack {
+          Text("jellyfin_server_url_label".localized)
+            .foregroundColor(themeViewModel.secondaryColor)
+          Spacer()
+          Text(serverUrl)
+        }
+      } header: {
+        Text("jellyfin_section_server".localized)
+      }
+      Section {
+        ClearableTextField("jellyfin_username_placeholder".localized, text: username) {
+          $0.textContentType = .name
+          $0.autocapitalization = .none
+        }
+        ClearableTextField("jellyfin_password_placeholder".localized, text: password) {
+          $0.textContentType = .password
+          $0.autocapitalization = .none
+        }
+      } header: {
+        Text("jellyfin_section_login".localized)
+      }
+    }
+  }
+
+  struct ConnectedView: View {
+    var body: some View {
+      EmptyView()
+    }
+  }
+
+  var body: some View {
+    Form {
+      switch viewModel.connectionState {
+      case .disconnected:
+        DisconnectedView(serverUrl: $viewModel.form.serverUrl)
+      case .foundServer:
+        FoundServerView(
+          serverUrl: viewModel.form.serverUrl,
+          serverName: viewModel.form.serverName ?? "",
+          username: $viewModel.form.username,
+          password: $viewModel.form.password
+        )
+      case .connected:
+        ConnectedView()
+      }
+    }
+    .environmentObject(themeViewModel)
+  }
+}
+
+#Preview {
+  var viewModel = JellyfinConnectionViewModel()
+  JellyfinConnectionView(viewModel: viewModel)
+}