summaryrefslogtreecommitdiff
path: root/Jel
diff options
context:
space:
mode:
Diffstat (limited to 'Jel')
-rw-r--r--Jel/Controllers/JellyfinClientController.swift10
-rw-r--r--Jel/JelApp.swift2
-rw-r--r--Jel/Models/BlurHashDecode.swift146
-rw-r--r--Jel/Views/ContentView.swift2
-rw-r--r--Jel/Views/Dashboard/DashboardView.swift (renamed from Jel/Views/Dashboard/DashBoardView.swift)9
-rw-r--r--Jel/Views/Dashboard/Library/LibraryIconView.swift22
-rw-r--r--Jel/Views/Dashboard/Library/LibraryView.swift44
-rw-r--r--Jel/Views/Utility/AsyncImageView.swift50
8 files changed, 131 insertions, 154 deletions
diff --git a/Jel/Controllers/JellyfinClientController.swift b/Jel/Controllers/JellyfinClientController.swift
index 11389c9..08b74d0 100644
--- a/Jel/Controllers/JellyfinClientController.swift
+++ b/Jel/Controllers/JellyfinClientController.swift
@@ -40,10 +40,13 @@ class JellyfinClientController: ObservableObject {
self.api = APIClient(baseURL: serverUrl)
self.setUrl(url: serverUrl)
+
+ self.setToken(token: self.authState.authToken ?? "")
}
func setToken(token: String) {
self.authHeaders.Token = token
+ self.setUrl(url: self.authState.serverUrl)
}
func setUrl(url: URL?) {
@@ -62,6 +65,10 @@ class JellyfinClientController: ObservableObject {
})
}
+ func getUrl() -> URL? {
+ return self.api.configuration.baseURL
+ }
+
@discardableResult func send<T>(
_ request: Request<T>,
delegate: URLSessionDataDelegate? = nil,
@@ -101,7 +108,10 @@ extension JellyfinClientController {
DispatchQueue.main.async {
self.authState.loggedIn = true
self.authState.authToken = res.value.accessToken
+ self.authState.userId = res.value.user?.id
self.authState.save()
+
+ self.setToken(token: self.authState.authToken ?? "")
}
}
}
diff --git a/Jel/JelApp.swift b/Jel/JelApp.swift
index 3040b5c..ab7a74d 100644
--- a/Jel/JelApp.swift
+++ b/Jel/JelApp.swift
@@ -26,6 +26,8 @@ struct JelApp: App {
.task {
AuthStateController.shared.load()
SettingsController.shared.load()
+ jellyfinClientController.setUrl(url: AuthStateController.shared.serverUrl)
+ jellyfinClientController.setToken(token: AuthStateController.shared.authToken ?? "")
}
}
}
diff --git a/Jel/Models/BlurHashDecode.swift b/Jel/Models/BlurHashDecode.swift
deleted file mode 100644
index 7fe3b39..0000000
--- a/Jel/Models/BlurHashDecode.swift
+++ /dev/null
@@ -1,146 +0,0 @@
-import UIKit
-
-extension UIImage {
- public convenience init?(blurHash: String, size: CGSize, punch: Float = 1) {
- guard blurHash.count >= 6 else { return nil }
-
- let sizeFlag = String(blurHash[0]).decode83()
- let numY = (sizeFlag / 9) + 1
- let numX = (sizeFlag % 9) + 1
-
- let quantisedMaximumValue = String(blurHash[1]).decode83()
- let maximumValue = Float(quantisedMaximumValue + 1) / 166
-
- guard blurHash.count == 4 + 2 * numX * numY else { return nil }
-
- let colours: [(Float, Float, Float)] = (0 ..< numX * numY).map { i in
- if i == 0 {
- let value = String(blurHash[2 ..< 6]).decode83()
- return decodeDC(value)
- } else {
- let value = String(blurHash[4 + i * 2 ..< 4 + i * 2 + 2]).decode83()
- return decodeAC(value, maximumValue: maximumValue * punch)
- }
- }
-
- let width = Int(size.width)
- let height = Int(size.height)
- let bytesPerRow = width * 3
- guard let data = CFDataCreateMutable(kCFAllocatorDefault, bytesPerRow * height) else { return nil }
- CFDataSetLength(data, bytesPerRow * height)
- guard let pixels = CFDataGetMutableBytePtr(data) else { return nil }
-
- for y in 0 ..< height {
- for x in 0 ..< width {
- var r: Float = 0
- var g: Float = 0
- var b: Float = 0
-
- for j in 0 ..< numY {
- for i in 0 ..< numX {
- let basis = cos(Float.pi * Float(x) * Float(i) / Float(width)) * cos(Float.pi * Float(y) * Float(j) / Float(height))
- let colour = colours[i + j * numX]
- r += colour.0 * basis
- g += colour.1 * basis
- b += colour.2 * basis
- }
- }
-
- let intR = UInt8(linearTosRGB(r))
- let intG = UInt8(linearTosRGB(g))
- let intB = UInt8(linearTosRGB(b))
-
- pixels[3 * x + 0 + y * bytesPerRow] = intR
- pixels[3 * x + 1 + y * bytesPerRow] = intG
- pixels[3 * x + 2 + y * bytesPerRow] = intB
- }
- }
-
- let bitmapInfo = CGBitmapInfo(rawValue: CGImageAlphaInfo.none.rawValue)
-
- guard let provider = CGDataProvider(data: data) else { return nil }
- guard let cgImage = CGImage(width: width, height: height, bitsPerComponent: 8, bitsPerPixel: 24, bytesPerRow: bytesPerRow,
- space: CGColorSpaceCreateDeviceRGB(), bitmapInfo: bitmapInfo, provider: provider, decode: nil, shouldInterpolate: true, intent: .defaultIntent) else { return nil }
-
- self.init(cgImage: cgImage)
- }
-}
-
-private func decodeDC(_ value: Int) -> (Float, Float, Float) {
- let intR = value >> 16
- let intG = (value >> 8) & 255
- let intB = value & 255
- return (sRGBToLinear(intR), sRGBToLinear(intG), sRGBToLinear(intB))
-}
-
-private func decodeAC(_ value: Int, maximumValue: Float) -> (Float, Float, Float) {
- let quantR = value / (19 * 19)
- let quantG = (value / 19) % 19
- let quantB = value % 19
-
- let rgb = (
- signPow((Float(quantR) - 9) / 9, 2) * maximumValue,
- signPow((Float(quantG) - 9) / 9, 2) * maximumValue,
- signPow((Float(quantB) - 9) / 9, 2) * maximumValue
- )
-
- return rgb
-}
-
-private func signPow(_ value: Float, _ exp: Float) -> Float {
- return copysign(pow(abs(value), exp), value)
-}
-
-private func linearTosRGB(_ value: Float) -> Int {
- let v = max(0, min(1, value))
- if v <= 0.0031308 { return Int(v * 12.92 * 255 + 0.5) }
- else { return Int((1.055 * pow(v, 1 / 2.4) - 0.055) * 255 + 0.5) }
-}
-
-private func sRGBToLinear<Type: BinaryInteger>(_ value: Type) -> Float {
- let v = Float(Int64(value)) / 255
- if v <= 0.04045 { return v / 12.92 }
- else { return pow((v + 0.055) / 1.055, 2.4) }
-}
-
-private let encodeCharacters: [String] = {
- return "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz#$%*+,-.:;=?@[]^_{|}~".map { String($0) }
-}()
-
-private let decodeCharacters: [String: Int] = {
- var dict: [String: Int] = [:]
- for (index, character) in encodeCharacters.enumerated() {
- dict[character] = index
- }
- return dict
-}()
-
-extension String {
- func decode83() -> Int {
- var value: Int = 0
- for character in self {
- if let digit = decodeCharacters[String(character)] {
- value = value * 83 + digit
- }
- }
- return value
- }
-}
-
-private extension String {
- subscript (offset: Int) -> Character {
- return self[index(startIndex, offsetBy: offset)]
- }
-
- subscript (bounds: CountableClosedRange<Int>) -> Substring {
- let start = index(startIndex, offsetBy: bounds.lowerBound)
- let end = index(startIndex, offsetBy: bounds.upperBound)
- return self[start...end]
- }
-
- subscript (bounds: CountableRange<Int>) -> Substring {
- let start = index(startIndex, offsetBy: bounds.lowerBound)
- let end = index(startIndex, offsetBy: bounds.upperBound)
- return self[start..<end]
- }
-}
diff --git a/Jel/Views/ContentView.swift b/Jel/Views/ContentView.swift
index 11a8277..76a01dd 100644
--- a/Jel/Views/ContentView.swift
+++ b/Jel/Views/ContentView.swift
@@ -21,7 +21,7 @@ struct ContentView: View {
SignInView()
} else {
NavigationStack {
- DashBoardView()
+ DashboardView()
}
}
}
diff --git a/Jel/Views/Dashboard/DashBoardView.swift b/Jel/Views/Dashboard/DashboardView.swift
index ea2003c..2658180 100644
--- a/Jel/Views/Dashboard/DashBoardView.swift
+++ b/Jel/Views/Dashboard/DashboardView.swift
@@ -1,19 +1,20 @@
//
-// DashBoardView.swift
+// DashboardView.swift
// Jel
//
// Created by zerocool on 12/12/23.
//
import SwiftUI
+import JellyfinKit
-struct DashBoardView: View {
+struct DashboardView: View {
@State var showingSettingsSheet: Bool = false
var body: some View {
NavigationStack {
VStack {
-
+ LibraryView()
}
.toolbar {
ToolbarItem {
@@ -32,5 +33,5 @@ struct DashBoardView: View {
}
#Preview {
- DashBoardView()
+ DashboardView()
}
diff --git a/Jel/Views/Dashboard/Library/LibraryIconView.swift b/Jel/Views/Dashboard/Library/LibraryIconView.swift
index 4f6c711..c4dbde0 100644
--- a/Jel/Views/Dashboard/Library/LibraryIconView.swift
+++ b/Jel/Views/Dashboard/Library/LibraryIconView.swift
@@ -6,13 +6,29 @@
//
import SwiftUI
+import JellyfinKit
+import BlurHashKit
struct LibraryIconView: View {
- var body: some View {
- Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
+ @EnvironmentObject var jellyfinClient: JellyfinClientController
+
+ @State var library: BaseItemDto
+ @State var loadingImage: Bool = true
+
+ @State var loadedImageBinaryData: Data?
+
+ var body: some View {
+ VStack {
+ AsyncImageView(imageId: library.id ?? "",
+ blurhash: library.imageBlurHashes?.primary?[library.imageTags?["Primary"] ?? ""] ?? "",
+ imageType: "Primary")
+
+ Text(library.name ?? "Unknown")
+ .font(.subheadline)
}
+ }
}
#Preview {
- LibraryIconView()
+ LibraryIconView(library: BaseItemDto())
}
diff --git a/Jel/Views/Dashboard/Library/LibraryView.swift b/Jel/Views/Dashboard/Library/LibraryView.swift
new file mode 100644
index 0000000..39ca6ba
--- /dev/null
+++ b/Jel/Views/Dashboard/Library/LibraryView.swift
@@ -0,0 +1,44 @@
+//
+// LibraryView.swift
+// Jel
+//
+// Created by zerocool on 12/15/23.
+//
+
+import SwiftUI
+import JellyfinKit
+
+struct LibraryView: View {
+ @EnvironmentObject var jellyfinClient: JellyfinClientController
+
+ @StateObject var authState: AuthStateController = AuthStateController.shared
+
+ @State var libraries: [BaseItemDto] = []
+ var body: some View {
+ ScrollView(.horizontal, showsIndicators: false) {
+ LazyHStack {
+ ForEach(libraries) {library in
+ if library.collectionType == "movies" || library.collectionType == "tvshows" {
+ LibraryIconView(library: library)
+ }
+ }
+ }
+ }
+ .onAppear {
+ Task {
+ do {
+ let request = Paths.getUserViews(userID: authState.userId ?? "")
+ if let results = try await jellyfinClient.send(request).value.items {
+ libraries = results
+ }
+ } catch {
+ print(error)
+ }
+ }
+ }
+ }
+}
+
+//#Preview {
+// LibraryView()
+//}
diff --git a/Jel/Views/Utility/AsyncImageView.swift b/Jel/Views/Utility/AsyncImageView.swift
new file mode 100644
index 0000000..bed5687
--- /dev/null
+++ b/Jel/Views/Utility/AsyncImageView.swift
@@ -0,0 +1,50 @@
+//
+// AsyncImageView.swift
+// Jel
+//
+// Created by zerocool on 12/19/23.
+//
+
+import SwiftUI
+import BlurHashKit
+import JellyfinKit
+
+struct AsyncImageView: View {
+ @EnvironmentObject var jellyfinClient: JellyfinClientController
+
+ @State var imageId: String
+ @State var blurhash: String
+ @State var imageType: String
+
+ @State var loading = true
+ @State var uiImage: UIImage = UIImage()
+
+ var body: some View {
+ VStack {
+ if loading {
+ BlurHashView(blurHash: blurhash)
+ } else {
+ Image(uiImage: uiImage)
+ }
+ }
+ .onAppear {
+ Task {
+ let request = Paths.getItemImage(itemID: imageId, imageType: imageType)
+ do {
+ let res = try await jellyfinClient.send(request)
+ if let image = UIImage(data: res.value) {
+ uiImage = image
+ loading = false
+ } else {
+
+ }
+ }
+ }
+
+ }
+ }
+}
+
+//#Preview {
+// AsyncImageView(imageId: "", blurhash: "", imageType: "")
+//}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-13 19:16:37 +0000