From c14106381ab0b92c66f40f296d47aa23527a272f Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Sat, 8 Jan 2022 17:13:58 -0700 Subject: [PATCH 1/5] fix logging outputs --- Shared/Singleton/LogManager.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Shared/Singleton/LogManager.swift b/Shared/Singleton/LogManager.swift index 8fbde19e..601ea4f1 100644 --- a/Shared/Singleton/LogManager.swift +++ b/Shared/Singleton/LogManager.swift @@ -15,13 +15,13 @@ class LogManager { let log = Puppy() init() { - let console = ConsoleLogger("me.vigue.jellyfin.ConsoleLogger") + let console = ConsoleLogger("com.swiftfin.ConsoleLogger") let fileURL = self.getDocumentsDirectory().appendingPathComponent("logs.txt") let FM = FileManager() _ = try? FM.removeItem(at: fileURL) do { - let file = try FileLogger("me.vigue.jellyfin", fileURL: fileURL) + let file = try FileLogger("com.swiftfin", fileURL: fileURL) file.format = LogFormatter() log.add(file, withLevel: .debug) } catch let err { From 622548e572db39f0b16ac9a64d1310ddb415c3ab Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Sat, 8 Jan 2022 17:14:09 -0700 Subject: [PATCH 2/5] fix workspace --- Swiftfin.xcworkspace/contents.xcworkspacedata | 3 --- 1 file changed, 3 deletions(-) diff --git a/Swiftfin.xcworkspace/contents.xcworkspacedata b/Swiftfin.xcworkspace/contents.xcworkspacedata index a4438826..fe2f5a72 100644 --- a/Swiftfin.xcworkspace/contents.xcworkspacedata +++ b/Swiftfin.xcworkspace/contents.xcworkspacedata @@ -7,7 +7,4 @@ - - From c81306fd474ff5c2f172f2a844d426117d02e84f Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Sat, 8 Jan 2022 17:20:16 -0700 Subject: [PATCH 3/5] remove bad cached image package --- Shared/Views/ImageView.swift | 8 +------- Shared/Views/ParallaxHeader.swift | 2 +- .../xcshareddata/swiftpm/Package.resolved | 9 --------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/Shared/Views/ImageView.swift b/Shared/Views/ImageView.swift index 460e77a5..636d9900 100644 --- a/Shared/Views/ImageView.swift +++ b/Shared/Views/ImageView.swift @@ -7,7 +7,6 @@ * Copyright 2021 Aiden Vigue & Jellyfin Contributors */ -import CachedAsyncImage import SwiftUI struct ImageView: View { @@ -41,7 +40,7 @@ struct ImageView: View { } var body: some View { - CachedAsyncImage(url: source, urlCache: .imageCache, transaction: Transaction(animation: .easeInOut)) { phase in + AsyncImage(url: source, transaction: Transaction(animation: .easeInOut)) { phase in switch phase { case .success(let image): image @@ -69,8 +68,3 @@ struct ImageView: View { } } } - -extension URLCache { - - static let imageCache = URLCache(memoryCapacity: 512*1000*1000, diskCapacity: 10*1000*1000*1000) -} diff --git a/Shared/Views/ParallaxHeader.swift b/Shared/Views/ParallaxHeader.swift index d5624f74..d16fccea 100644 --- a/Shared/Views/ParallaxHeader.swift +++ b/Shared/Views/ParallaxHeader.swift @@ -28,7 +28,7 @@ struct ParallaxHeaderScrollView 0 ? -proxy.frame(in: .global).minY : 0 header diff --git a/Swiftfin.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Swiftfin.xcworkspace/xcshareddata/swiftpm/Package.resolved index cf80eed4..3ed0ea18 100644 --- a/Swiftfin.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Swiftfin.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -100,15 +100,6 @@ "version": "1.4.2" } }, - { - "package": "CachedAsyncImage", - "repositoryURL": "https://github.com/lorenzofiamingo/SwiftUI-CachedAsyncImage", - "state": { - "branch": "main", - "revision": "eb489a699be1f6e6c1a19fecdd6bfdc556474fd6", - "version": null - } - }, { "package": "Introspect", "repositoryURL": "https://github.com/siteline/SwiftUI-Introspect", From 59a19054c17ebd1d99ab972b5ec93130137ace26 Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Sat, 8 Jan 2022 17:20:37 -0700 Subject: [PATCH 4/5] remove bad cached image --- Swiftfin.xcodeproj/project.pbxproj | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/Swiftfin.xcodeproj/project.pbxproj b/Swiftfin.xcodeproj/project.pbxproj index ed41be2f..f4edbe4e 100644 --- a/Swiftfin.xcodeproj/project.pbxproj +++ b/Swiftfin.xcodeproj/project.pbxproj @@ -408,8 +408,6 @@ E1E00A35278628A40022235B /* DoubleExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1E00A34278628A40022235B /* DoubleExtensions.swift */; }; E1E00A36278628A40022235B /* DoubleExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1E00A34278628A40022235B /* DoubleExtensions.swift */; }; E1E00A37278628A40022235B /* DoubleExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1E00A34278628A40022235B /* DoubleExtensions.swift */; }; - E1E0F4D8278911680084F701 /* CachedAsyncImage in Frameworks */ = {isa = PBXBuildFile; productRef = E1E0F4D7278911680084F701 /* CachedAsyncImage */; }; - E1E0F4DA278911A30084F701 /* CachedAsyncImage in Frameworks */ = {isa = PBXBuildFile; productRef = E1E0F4D9278911A30084F701 /* CachedAsyncImage */; }; E1E48CC9271E6D410021A2F9 /* RefreshHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1E48CC8271E6D410021A2F9 /* RefreshHelper.swift */; }; E1E5D5372783A52C00692DFE /* CinematicEpisodeItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1E5D5362783A52C00692DFE /* CinematicEpisodeItemView.swift */; }; E1E5D5392783A56B00692DFE /* EpisodesRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1E5D5382783A56B00692DFE /* EpisodesRowView.swift */; }; @@ -759,7 +757,6 @@ 53ABFDDC267972BF00886593 /* TVServices.framework in Frameworks */, E1A9999B271A343C008E78C0 /* SwiftUICollection in Frameworks */, E13DD3CD27164CA7009D4DAF /* CoreStore in Frameworks */, - E1E0F4DA278911A30084F701 /* CachedAsyncImage in Frameworks */, E1AE8E7E2789136D00FBDDAA /* Nuke in Frameworks */, E178857D278037FD0094FBCF /* JellyfinAPI in Frameworks */, E12186DE2718F1C50010884C /* Defaults in Frameworks */, @@ -780,7 +777,6 @@ E1B6DCEA271A23880015B715 /* SwiftyJSON in Frameworks */, 53352571265EA0A0006CCA86 /* Introspect in Frameworks */, E13DD3C62716499E009D4DAF /* CoreStore in Frameworks */, - E1E0F4D8278911680084F701 /* CachedAsyncImage in Frameworks */, E1AE8E7C2789135A00FBDDAA /* Nuke in Frameworks */, 625CB57A2678C4A400530A6E /* ActivityIndicator in Frameworks */, E1B6DCE8271A23780015B715 /* CombineExt in Frameworks */, @@ -1644,7 +1640,6 @@ E1218C9D271A2CD600EA0737 /* CombineExt */, E1A9999A271A343C008E78C0 /* SwiftUICollection */, E178857C278037FD0094FBCF /* JellyfinAPI */, - E1E0F4D9278911A30084F701 /* CachedAsyncImage */, E1AE8E7D2789136D00FBDDAA /* Nuke */, ); productName = "JellyfinPlayer tvOS"; @@ -1683,7 +1678,6 @@ E1A99998271A3429008E78C0 /* SwiftUICollection */, E10EAA44277BB646000269ED /* JellyfinAPI */, E10EAA4C277BB716000269ED /* Sliders */, - E1E0F4D7278911680084F701 /* CachedAsyncImage */, E1AE8E7B2789135A00FBDDAA /* Nuke */, ); productName = JellyfinPlayer; @@ -1776,7 +1770,6 @@ C4BFD4E327167B63007739E3 /* XCRemoteSwiftPackageReference "SwiftUICollection" */, E10EAA43277BB646000269ED /* XCRemoteSwiftPackageReference "jellyfin-sdk-swift" */, E10EAA4B277BB716000269ED /* XCRemoteSwiftPackageReference "swiftui-sliders" */, - E1E0F4D6278911680084F701 /* XCRemoteSwiftPackageReference "SwiftUI-CachedAsyncImage" */, E1AE8E7A2789135A00FBDDAA /* XCRemoteSwiftPackageReference "Nuke" */, ); productRefGroup = 5377CBF2263B596A003A4E83 /* Products */; @@ -2973,14 +2966,6 @@ minimumVersion = 5.0.0; }; }; - E1E0F4D6278911680084F701 /* XCRemoteSwiftPackageReference "SwiftUI-CachedAsyncImage" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/lorenzofiamingo/SwiftUI-CachedAsyncImage"; - requirement = { - branch = main; - kind = branch; - }; - }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ @@ -3129,16 +3114,6 @@ package = E1AE8E7A2789135A00FBDDAA /* XCRemoteSwiftPackageReference "Nuke" */; productName = Nuke; }; - E1E0F4D7278911680084F701 /* CachedAsyncImage */ = { - isa = XCSwiftPackageProductDependency; - package = E1E0F4D6278911680084F701 /* XCRemoteSwiftPackageReference "SwiftUI-CachedAsyncImage" */; - productName = CachedAsyncImage; - }; - E1E0F4D9278911A30084F701 /* CachedAsyncImage */ = { - isa = XCSwiftPackageProductDependency; - package = E1E0F4D6278911680084F701 /* XCRemoteSwiftPackageReference "SwiftUI-CachedAsyncImage" */; - productName = CachedAsyncImage; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 5377CBE9263B596A003A4E83 /* Project object */; From f18b132b15be2fd0e3e5032baeeb7cb256c615c7 Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Sat, 8 Jan 2022 17:29:55 -0700 Subject: [PATCH 5/5] forgotten auto http populate for tvos --- Swiftfin tvOS/Views/ConnectToServerView.swift | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Swiftfin tvOS/Views/ConnectToServerView.swift b/Swiftfin tvOS/Views/ConnectToServerView.swift index f47ff0b5..74aec005 100644 --- a/Swiftfin tvOS/Views/ConnectToServerView.swift +++ b/Swiftfin tvOS/Views/ConnectToServerView.swift @@ -6,13 +6,16 @@ * Copyright 2021 Aiden Vigue & Jellyfin Contributors */ +import Defaults import SwiftUI import Stinsen struct ConnectToServerView: View { - @StateObject var viewModel = ConnectToServerViewModel() + @StateObject var viewModel: ConnectToServerViewModel @State var uri = "" + + @Default(.defaultHTTPScheme) var defaultHTTPScheme var body: some View { List { @@ -21,6 +24,12 @@ struct ConnectToServerView: View { .disableAutocorrection(true) .autocapitalization(.none) .keyboardType(.URL) + .onAppear { + if uri == "" { + uri = "\(defaultHTTPScheme.rawValue)://" + } + } + Button { viewModel.connectToServer(uri: uri) } label: {