ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #283 from LePips/refresh-item-on-appear

This commit is contained in:
aiden 3 2022-01-11 13:40:13 -05:00 committed by GitHub
parent 314710d10b cd51031c98
commit 0297367497
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 504 additions and 424 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.swiftformat
View File

@ -45,5 +45,6 @@
redundantType
--exclude Pods
--exclude Shared/Generated/Strings.swift
--header "\nSwiftfin is subject to the terms of the Mozilla Public\nLicense, v2.0. If a copy of the MPL was not distributed with this\nfile, you can obtain one at https://mozilla.org/MPL/2.0/.\n\nCopyright (c) {year} Jellyfin & Jellyfin Contributors\n"

3
Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift
View File

@ -13,6 +13,9 @@ import UIKit
extension BaseItemDto {
func createVideoPlayerViewModel() -> AnyPublisher<VideoPlayerViewModel, Error> {
LogManager.shared.log.debug("Creating video player view model for item: \(id ?? "")")
let builder = DeviceProfileBuilder()
// TODO: fix bitrate settings
builder.setMaxBitrate(bitrate: 60_000_000)

760
Shared/Generated/Strings.swift
View File

@ -1,11 +1,3 @@
//
// Swiftfin is subject to the terms of the Mozilla Public
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2022 Jellyfin & Jellyfin Contributors
//
// swiftlint:disable all
// Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen
@ -18,399 +10,385 @@ import Foundation
// swiftlint:disable explicit_type_interface function_parameter_count identifier_name line_length
// swiftlint:disable nesting type_body_length type_name vertical_whitespace_opening_braces
internal enum L10n {
/// About
internal static let about = L10n.tr("Localizable", "about")
/// Accessibility
internal static let accessibility = L10n.tr("Localizable", "accessibility")
/// Add URL
internal static let addURL = L10n.tr("Localizable", "addURL")
/// All Genres
internal static let allGenres = L10n.tr("Localizable", "allGenres")
/// All Media
internal static let allMedia = L10n.tr("Localizable", "allMedia")
/// Appearance
internal static let appearance = L10n.tr("Localizable", "appearance")
/// Apply
internal static let apply = L10n.tr("Localizable", "apply")
/// Audio
internal static let audio = L10n.tr("Localizable", "audio")
/// Audio & Captions
internal static let audioAndCaptions = L10n.tr("Localizable", "audioAndCaptions")
/// Audio Track
internal static let audioTrack = L10n.tr("Localizable", "audioTrack")
/// Auto Play
internal static let autoPlay = L10n.tr("Localizable", "autoPlay")
/// Back
internal static let back = L10n.tr("Localizable", "back")
/// Cancel
internal static let cancel = L10n.tr("Localizable", "cancel")
/// Cannot connect to host
internal static let cannotConnectToHost = L10n.tr("Localizable", "cannotConnectToHost")
/// CAST
internal static let cast = L10n.tr("Localizable", "cast")
/// Cast & Crew
internal static let castAndCrew = L10n.tr("Localizable", "castAndCrew")
/// Change Server
internal static let changeServer = L10n.tr("Localizable", "changeServer")
/// Channels
internal static let channels = L10n.tr("Localizable", "channels")
/// Cinematic Views
internal static let cinematicViews = L10n.tr("Localizable", "cinematicViews")
/// Closed Captions
internal static let closedCaptions = L10n.tr("Localizable", "closedCaptions")
/// Compact
internal static let compact = L10n.tr("Localizable", "compact")
/// Confirm Close
internal static let confirmClose = L10n.tr("Localizable", "confirmClose")
/// Connect
internal static let connect = L10n.tr("Localizable", "connect")
/// Connect Manually
internal static let connectManually = L10n.tr("Localizable", "connectManually")
/// Connect to Jellyfin
internal static let connectToJellyfin = L10n.tr("Localizable", "connectToJellyfin")
/// Connect to a Jellyfin server
internal static let connectToJellyfinServer = L10n.tr("Localizable", "connectToJellyfinServer")
/// Connect to a Jellyfin server to get started
internal static let connectToJellyfinServerStart = L10n.tr("Localizable", "connectToJellyfinServerStart")
/// Connect to Server
internal static let connectToServer = L10n.tr("Localizable", "connectToServer")
/// Containers
internal static let containers = L10n.tr("Localizable", "containers")
/// Continue
internal static let `continue` = L10n.tr("Localizable", "continue")
/// Continue Watching
internal static let continueWatching = L10n.tr("Localizable", "continueWatching")
/// Dark
internal static let dark = L10n.tr("Localizable", "dark")
/// Default Scheme
internal static let defaultScheme = L10n.tr("Localizable", "defaultScheme")
/// DIRECTOR
internal static let director = L10n.tr("Localizable", "director")
/// Discovered Servers
internal static let discoveredServers = L10n.tr("Localizable", "discoveredServers")
/// Display order
internal static let displayOrder = L10n.tr("Localizable", "displayOrder")
/// Edit Jump Lengths
internal static let editJumpLengths = L10n.tr("Localizable", "editJumpLengths")
/// Empty Next Up
internal static let emptyNextUp = L10n.tr("Localizable", "emptyNextUp")
/// Episodes
internal static let episodes = L10n.tr("Localizable", "episodes")
/// Error
internal static let error = L10n.tr("Localizable", "error")
/// Existing Server
internal static let existingServer = L10n.tr("Localizable", "existingServer")
/// Existing User
internal static let existingUser = L10n.tr("Localizable", "existingUser")
/// Experimental
internal static let experimental = L10n.tr("Localizable", "experimental")
/// Favorites
internal static let favorites = L10n.tr("Localizable", "favorites")
/// Filter Results
internal static let filterResults = L10n.tr("Localizable", "filterResults")
/// Filters
internal static let filters = L10n.tr("Localizable", "filters")
/// Genres
internal static let genres = L10n.tr("Localizable", "genres")
/// Home
internal static let home = L10n.tr("Localizable", "home")
/// Information
internal static let information = L10n.tr("Localizable", "information")
/// Items
internal static let items = L10n.tr("Localizable", "items")
/// Jump Backward Length
internal static let jumpBackwardLength = L10n.tr("Localizable", "jumpBackwardLength")
/// Jump Forward Length
internal static let jumpForwardLength = L10n.tr("Localizable", "jumpForwardLength")
/// Jump Gestures Enabled
internal static let jumpGesturesEnabled = L10n.tr("Localizable", "jumpGesturesEnabled")
/// %s seconds
internal static func jumpLengthSeconds(_ p1: UnsafePointer<CChar>) -> String {
L10n.tr("Localizable", "jumpLengthSeconds", p1)
}
/// Larger
internal static let larger = L10n.tr("Localizable", "larger")
/// Largest
internal static let largest = L10n.tr("Localizable", "largest")
/// Latest %@
internal static func latestWithString(_ p1: Any) -> String {
L10n.tr("Localizable", "latestWithString", String(describing: p1))
}
/// Library
internal static let library = L10n.tr("Localizable", "library")
/// Light
internal static let light = L10n.tr("Localizable", "light")
/// Loading
internal static let loading = L10n.tr("Localizable", "loading")
/// Local Servers
internal static let localServers = L10n.tr("Localizable", "localServers")
/// Login
internal static let login = L10n.tr("Localizable", "login")
/// Login to %@
internal static func loginToWithString(_ p1: Any) -> String {
L10n.tr("Localizable", "loginToWithString", String(describing: p1))
}
/// Media
internal static let media = L10n.tr("Localizable", "media")
/// More Like This
internal static let moreLikeThis = L10n.tr("Localizable", "moreLikeThis")
/// Movies
internal static let movies = L10n.tr("Localizable", "movies")
/// %d users
internal static func multipleUsers(_ p1: Int) -> String {
L10n.tr("Localizable", "multipleUsers", p1)
}
/// Name
internal static let name = L10n.tr("Localizable", "name")
/// Networking
internal static let networking = L10n.tr("Localizable", "networking")
/// Network timed out
internal static let networkTimedOut = L10n.tr("Localizable", "networkTimedOut")
/// Next
internal static let next = L10n.tr("Localizable", "next")
/// Next Up
internal static let nextUp = L10n.tr("Localizable", "nextUp")
/// No Cast devices found..
internal static let noCastdevicesfound = L10n.tr("Localizable", "noCastdevicesfound")
/// No Codec
internal static let noCodec = L10n.tr("Localizable", "noCodec")
/// No episodes available
internal static let noEpisodesAvailable = L10n.tr("Localizable", "noEpisodesAvailable")
/// No local servers found
internal static let noLocalServersFound = L10n.tr("Localizable", "noLocalServersFound")
/// None
internal static let none = L10n.tr("Localizable", "none")
/// No overview available
internal static let noOverviewAvailable = L10n.tr("Localizable", "noOverviewAvailable")
/// No results.
internal static let noResults = L10n.tr("Localizable", "noResults")
/// Normal
internal static let normal = L10n.tr("Localizable", "normal")
/// N/A
internal static let notAvailableSlash = L10n.tr("Localizable", "notAvailableSlash")
/// Type: %@ not implemented yet :(
internal static func notImplementedYetWithType(_ p1: Any) -> String {
L10n.tr("Localizable", "notImplementedYetWithType", String(describing: p1))
}
/// No title
internal static let noTitle = L10n.tr("Localizable", "noTitle")
/// Ok
internal static let ok = L10n.tr("Localizable", "ok")
/// 1 user
internal static let oneUser = L10n.tr("Localizable", "oneUser")
/// Operating System
internal static let operatingSystem = L10n.tr("Localizable", "operatingSystem")
/// Other
internal static let other = L10n.tr("Localizable", "other")
/// Other User
internal static let otherUser = L10n.tr("Localizable", "otherUser")
/// Overlay
internal static let overlay = L10n.tr("Localizable", "overlay")
/// Overlay Type
internal static let overlayType = L10n.tr("Localizable", "overlayType")
/// Overview
internal static let overview = L10n.tr("Localizable", "overview")
/// Page %1$@ of %2$@
internal static func pageOfWithNumbers(_ p1: Any, _ p2: Any) -> String {
L10n.tr("Localizable", "pageOfWithNumbers", String(describing: p1), String(describing: p2))
}
/// Password
internal static let password = L10n.tr("Localizable", "password")
/// Play
internal static let play = L10n.tr("Localizable", "play")
/// Playback settings
internal static let playbackSettings = L10n.tr("Localizable", "playbackSettings")
/// Playback Speed
internal static let playbackSpeed = L10n.tr("Localizable", "playbackSpeed")
/// Play Next
internal static let playNext = L10n.tr("Localizable", "playNext")
/// Play Next Item
internal static let playNextItem = L10n.tr("Localizable", "playNextItem")
/// Play Previous Item
internal static let playPreviousItem = L10n.tr("Localizable", "playPreviousItem")
/// Present
internal static let present = L10n.tr("Localizable", "present")
/// Press Down for Menu
internal static let pressDownForMenu = L10n.tr("Localizable", "pressDownForMenu")
/// Programs
internal static let programs = L10n.tr("Localizable", "programs")
/// Rated
internal static let rated = L10n.tr("Localizable", "rated")
/// Recently Added
internal static let recentlyAdded = L10n.tr("Localizable", "recentlyAdded")
/// Recommended
internal static let recommended = L10n.tr("Localizable", "recommended")
/// Refresh
internal static let refresh = L10n.tr("Localizable", "refresh")
/// Regular
internal static let regular = L10n.tr("Localizable", "regular")
/// Released
internal static let released = L10n.tr("Localizable", "released")
/// Remove
internal static let remove = L10n.tr("Localizable", "remove")
/// Remove All Users
internal static let removeAllUsers = L10n.tr("Localizable", "removeAllUsers")
/// Reset
internal static let reset = L10n.tr("Localizable", "reset")
/// Reset App Settings
internal static let resetAppSettings = L10n.tr("Localizable", "resetAppSettings")
/// Reset User Settings
internal static let resetUserSettings = L10n.tr("Localizable", "resetUserSettings")
/// Resume 5 Second Offset
internal static let resume5SecondOffset = L10n.tr("Localizable", "resume5SecondOffset")
/// Retry
internal static let retry = L10n.tr("Localizable", "retry")
/// Runtime
internal static let runtime = L10n.tr("Localizable", "runtime")
/// Search
internal static let search = L10n.tr("Localizable", "search")
/// Search…
internal static let searchDots = L10n.tr("Localizable", "searchDots")
/// Searching…
internal static let searchingDots = L10n.tr("Localizable", "searchingDots")
/// Season
internal static let season = L10n.tr("Localizable", "season")
/// S%1$@:E%2$@
internal static func seasonAndEpisode(_ p1: Any, _ p2: Any) -> String {
L10n.tr("Localizable", "seasonAndEpisode", String(describing: p1), String(describing: p2))
}
/// Seasons
internal static let seasons = L10n.tr("Localizable", "seasons")
/// See All
internal static let seeAll = L10n.tr("Localizable", "seeAll")
/// See More
internal static let seeMore = L10n.tr("Localizable", "seeMore")
/// Select Cast Destination
internal static let selectCastDestination = L10n.tr("Localizable", "selectCastDestination")
/// Series
internal static let series = L10n.tr("Localizable", "series")
/// Server
internal static let server = L10n.tr("Localizable", "server")
/// Server %s is already connected
internal static func serverAlreadyConnected(_ p1: UnsafePointer<CChar>) -> String {
L10n.tr("Localizable", "serverAlreadyConnected", p1)
}
/// Server %s already exists. Add new URL?
internal static func serverAlreadyExistsPrompt(_ p1: UnsafePointer<CChar>) -> String {
L10n.tr("Localizable", "serverAlreadyExistsPrompt", p1)
}
/// Server Details
internal static let serverDetails = L10n.tr("Localizable", "serverDetails")
/// Server Information
internal static let serverInformation = L10n.tr("Localizable", "serverInformation")
/// Servers
internal static let servers = L10n.tr("Localizable", "servers")
/// Server URL
internal static let serverURL = L10n.tr("Localizable", "serverURL")
/// Settings
internal static let settings = L10n.tr("Localizable", "settings")
/// Show Cast & Crew
internal static let showCastAndCrew = L10n.tr("Localizable", "showCastAndCrew")
/// Show Poster Labels
internal static let showPosterLabels = L10n.tr("Localizable", "showPosterLabels")
/// Signed in as %@
internal static func signedInAsWithString(_ p1: Any) -> String {
L10n.tr("Localizable", "signedInAsWithString", String(describing: p1))
}
/// Sign In
internal static let signIn = L10n.tr("Localizable", "signIn")
/// Sign in to get started
internal static let signInGetStarted = L10n.tr("Localizable", "signInGetStarted")
/// Sign In to %s
internal static func signInToServer(_ p1: UnsafePointer<CChar>) -> String {
L10n.tr("Localizable", "signInToServer", p1)
}
/// Smaller
internal static let smaller = L10n.tr("Localizable", "smaller")
/// Smallest
internal static let smallest = L10n.tr("Localizable", "smallest")
/// Sort by
internal static let sortBy = L10n.tr("Localizable", "sortBy")
/// STUDIO
internal static let studio = L10n.tr("Localizable", "studio")
/// Studios
internal static let studios = L10n.tr("Localizable", "studios")
/// Subtitles
internal static let subtitles = L10n.tr("Localizable", "subtitles")
/// Subtitle Size
internal static let subtitleSize = L10n.tr("Localizable", "subtitleSize")
/// Suggestions
internal static let suggestions = L10n.tr("Localizable", "suggestions")
/// Switch User
internal static let switchUser = L10n.tr("Localizable", "switchUser")
/// System
internal static let system = L10n.tr("Localizable", "system")
/// Tags
internal static let tags = L10n.tr("Localizable", "tags")
/// Try again
internal static let tryAgain = L10n.tr("Localizable", "tryAgain")
/// TV Shows
internal static let tvShows = L10n.tr("Localizable", "tvShows")
/// Unable to connect to server
internal static let unableToConnectServer = L10n.tr("Localizable", "unableToConnectServer")
/// Unauthorized
internal static let unauthorized = L10n.tr("Localizable", "unauthorized")
/// Unauthorized user
internal static let unauthorizedUser = L10n.tr("Localizable", "unauthorizedUser")
/// Unknown
internal static let unknown = L10n.tr("Localizable", "unknown")
/// Unknown Error
internal static let unknownError = L10n.tr("Localizable", "unknownError")
/// URL
internal static let url = L10n.tr("Localizable", "url")
/// User
internal static let user = L10n.tr("Localizable", "user")
/// User %s is already signed in
internal static func userAlreadySignedIn(_ p1: UnsafePointer<CChar>) -> String {
L10n.tr("Localizable", "userAlreadySignedIn", p1)
}
/// Username
internal static let username = L10n.tr("Localizable", "username")
/// Version
internal static let version = L10n.tr("Localizable", "version")
/// Video Player
internal static let videoPlayer = L10n.tr("Localizable", "videoPlayer")
/// Who's watching?
internal static let whosWatching = L10n.tr("Localizable", "WhosWatching")
/// WIP
internal static let wip = L10n.tr("Localizable", "wip")
/// Your Favorites
internal static let yourFavorites = L10n.tr("Localizable", "yourFavorites")
/// About
internal static let about = L10n.tr("Localizable", "about")
/// Accessibility
internal static let accessibility = L10n.tr("Localizable", "accessibility")
/// Add URL
internal static let addURL = L10n.tr("Localizable", "addURL")
/// All Genres
internal static let allGenres = L10n.tr("Localizable", "allGenres")
/// All Media
internal static let allMedia = L10n.tr("Localizable", "allMedia")
/// Appearance
internal static let appearance = L10n.tr("Localizable", "appearance")
/// Apply
internal static let apply = L10n.tr("Localizable", "apply")
/// Audio
internal static let audio = L10n.tr("Localizable", "audio")
/// Audio & Captions
internal static let audioAndCaptions = L10n.tr("Localizable", "audioAndCaptions")
/// Audio Track
internal static let audioTrack = L10n.tr("Localizable", "audioTrack")
/// Auto Play
internal static let autoPlay = L10n.tr("Localizable", "autoPlay")
/// Back
internal static let back = L10n.tr("Localizable", "back")
/// Cancel
internal static let cancel = L10n.tr("Localizable", "cancel")
/// Cannot connect to host
internal static let cannotConnectToHost = L10n.tr("Localizable", "cannotConnectToHost")
/// CAST
internal static let cast = L10n.tr("Localizable", "cast")
/// Cast & Crew
internal static let castAndCrew = L10n.tr("Localizable", "castAndCrew")
/// Change Server
internal static let changeServer = L10n.tr("Localizable", "changeServer")
/// Channels
internal static let channels = L10n.tr("Localizable", "channels")
/// Cinematic Views
internal static let cinematicViews = L10n.tr("Localizable", "cinematicViews")
/// Closed Captions
internal static let closedCaptions = L10n.tr("Localizable", "closedCaptions")
/// Compact
internal static let compact = L10n.tr("Localizable", "compact")
/// Confirm Close
internal static let confirmClose = L10n.tr("Localizable", "confirmClose")
/// Connect
internal static let connect = L10n.tr("Localizable", "connect")
/// Connect Manually
internal static let connectManually = L10n.tr("Localizable", "connectManually")
/// Connect to Jellyfin
internal static let connectToJellyfin = L10n.tr("Localizable", "connectToJellyfin")
/// Connect to a Jellyfin server
internal static let connectToJellyfinServer = L10n.tr("Localizable", "connectToJellyfinServer")
/// Connect to a Jellyfin server to get started
internal static let connectToJellyfinServerStart = L10n.tr("Localizable", "connectToJellyfinServerStart")
/// Connect to Server
internal static let connectToServer = L10n.tr("Localizable", "connectToServer")
/// Containers
internal static let containers = L10n.tr("Localizable", "containers")
/// Continue
internal static let `continue` = L10n.tr("Localizable", "continue")
/// Continue Watching
internal static let continueWatching = L10n.tr("Localizable", "continueWatching")
/// Dark
internal static let dark = L10n.tr("Localizable", "dark")
/// Default Scheme
internal static let defaultScheme = L10n.tr("Localizable", "defaultScheme")
/// DIRECTOR
internal static let director = L10n.tr("Localizable", "director")
/// Discovered Servers
internal static let discoveredServers = L10n.tr("Localizable", "discoveredServers")
/// Display order
internal static let displayOrder = L10n.tr("Localizable", "displayOrder")
/// Edit Jump Lengths
internal static let editJumpLengths = L10n.tr("Localizable", "editJumpLengths")
/// Empty Next Up
internal static let emptyNextUp = L10n.tr("Localizable", "emptyNextUp")
/// Episodes
internal static let episodes = L10n.tr("Localizable", "episodes")
/// Error
internal static let error = L10n.tr("Localizable", "error")
/// Existing Server
internal static let existingServer = L10n.tr("Localizable", "existingServer")
/// Existing User
internal static let existingUser = L10n.tr("Localizable", "existingUser")
/// Experimental
internal static let experimental = L10n.tr("Localizable", "experimental")
/// Favorites
internal static let favorites = L10n.tr("Localizable", "favorites")
/// Filter Results
internal static let filterResults = L10n.tr("Localizable", "filterResults")
/// Filters
internal static let filters = L10n.tr("Localizable", "filters")
/// Genres
internal static let genres = L10n.tr("Localizable", "genres")
/// Home
internal static let home = L10n.tr("Localizable", "home")
/// Information
internal static let information = L10n.tr("Localizable", "information")
/// Items
internal static let items = L10n.tr("Localizable", "items")
/// Jump Backward Length
internal static let jumpBackwardLength = L10n.tr("Localizable", "jumpBackwardLength")
/// Jump Forward Length
internal static let jumpForwardLength = L10n.tr("Localizable", "jumpForwardLength")
/// Jump Gestures Enabled
internal static let jumpGesturesEnabled = L10n.tr("Localizable", "jumpGesturesEnabled")
/// %s seconds
internal static func jumpLengthSeconds(_ p1: UnsafePointer<CChar>) -> String {
return L10n.tr("Localizable", "jumpLengthSeconds", p1)
}
/// Larger
internal static let larger = L10n.tr("Localizable", "larger")
/// Largest
internal static let largest = L10n.tr("Localizable", "largest")
/// Latest %@
internal static func latestWithString(_ p1: Any) -> String {
return L10n.tr("Localizable", "latestWithString", String(describing: p1))
}
/// Library
internal static let library = L10n.tr("Localizable", "library")
/// Light
internal static let light = L10n.tr("Localizable", "light")
/// Loading
internal static let loading = L10n.tr("Localizable", "loading")
/// Local Servers
internal static let localServers = L10n.tr("Localizable", "localServers")
/// Login
internal static let login = L10n.tr("Localizable", "login")
/// Login to %@
internal static func loginToWithString(_ p1: Any) -> String {
return L10n.tr("Localizable", "loginToWithString", String(describing: p1))
}
/// Media
internal static let media = L10n.tr("Localizable", "media")
/// More Like This
internal static let moreLikeThis = L10n.tr("Localizable", "moreLikeThis")
/// Movies
internal static let movies = L10n.tr("Localizable", "movies")
/// %d users
internal static func multipleUsers(_ p1: Int) -> String {
return L10n.tr("Localizable", "multipleUsers", p1)
}
/// Name
internal static let name = L10n.tr("Localizable", "name")
/// Networking
internal static let networking = L10n.tr("Localizable", "networking")
/// Network timed out
internal static let networkTimedOut = L10n.tr("Localizable", "networkTimedOut")
/// Next
internal static let next = L10n.tr("Localizable", "next")
/// Next Up
internal static let nextUp = L10n.tr("Localizable", "nextUp")
/// No Cast devices found..
internal static let noCastdevicesfound = L10n.tr("Localizable", "noCastdevicesfound")
/// No Codec
internal static let noCodec = L10n.tr("Localizable", "noCodec")
/// No episodes available
internal static let noEpisodesAvailable = L10n.tr("Localizable", "noEpisodesAvailable")
/// No local servers found
internal static let noLocalServersFound = L10n.tr("Localizable", "noLocalServersFound")
/// None
internal static let `none` = L10n.tr("Localizable", "none")
/// No overview available
internal static let noOverviewAvailable = L10n.tr("Localizable", "noOverviewAvailable")
/// No results.
internal static let noResults = L10n.tr("Localizable", "noResults")
/// Normal
internal static let normal = L10n.tr("Localizable", "normal")
/// N/A
internal static let notAvailableSlash = L10n.tr("Localizable", "notAvailableSlash")
/// Type: %@ not implemented yet :(
internal static func notImplementedYetWithType(_ p1: Any) -> String {
return L10n.tr("Localizable", "notImplementedYetWithType", String(describing: p1))
}
/// No title
internal static let noTitle = L10n.tr("Localizable", "noTitle")
/// Ok
internal static let ok = L10n.tr("Localizable", "ok")
/// 1 user
internal static let oneUser = L10n.tr("Localizable", "oneUser")
/// Operating System
internal static let operatingSystem = L10n.tr("Localizable", "operatingSystem")
/// Other
internal static let other = L10n.tr("Localizable", "other")
/// Other User
internal static let otherUser = L10n.tr("Localizable", "otherUser")
/// Overlay
internal static let overlay = L10n.tr("Localizable", "overlay")
/// Overlay Type
internal static let overlayType = L10n.tr("Localizable", "overlayType")
/// Overview
internal static let overview = L10n.tr("Localizable", "overview")
/// Page %1$@ of %2$@
internal static func pageOfWithNumbers(_ p1: Any, _ p2: Any) -> String {
return L10n.tr("Localizable", "pageOfWithNumbers", String(describing: p1), String(describing: p2))
}
/// Password
internal static let password = L10n.tr("Localizable", "password")
/// Play
internal static let play = L10n.tr("Localizable", "play")
/// Playback settings
internal static let playbackSettings = L10n.tr("Localizable", "playbackSettings")
/// Playback Speed
internal static let playbackSpeed = L10n.tr("Localizable", "playbackSpeed")
/// Play Next
internal static let playNext = L10n.tr("Localizable", "playNext")
/// Play Next Item
internal static let playNextItem = L10n.tr("Localizable", "playNextItem")
/// Play Previous Item
internal static let playPreviousItem = L10n.tr("Localizable", "playPreviousItem")
/// Present
internal static let present = L10n.tr("Localizable", "present")
/// Press Down for Menu
internal static let pressDownForMenu = L10n.tr("Localizable", "pressDownForMenu")
/// Programs
internal static let programs = L10n.tr("Localizable", "programs")
/// Rated
internal static let rated = L10n.tr("Localizable", "rated")
/// Recently Added
internal static let recentlyAdded = L10n.tr("Localizable", "recentlyAdded")
/// Recommended
internal static let recommended = L10n.tr("Localizable", "recommended")
/// Refresh
internal static let refresh = L10n.tr("Localizable", "refresh")
/// Regular
internal static let regular = L10n.tr("Localizable", "regular")
/// Released
internal static let released = L10n.tr("Localizable", "released")
/// Remove
internal static let remove = L10n.tr("Localizable", "remove")
/// Remove All Users
internal static let removeAllUsers = L10n.tr("Localizable", "removeAllUsers")
/// Reset
internal static let reset = L10n.tr("Localizable", "reset")
/// Reset App Settings
internal static let resetAppSettings = L10n.tr("Localizable", "resetAppSettings")
/// Reset User Settings
internal static let resetUserSettings = L10n.tr("Localizable", "resetUserSettings")
/// Resume 5 Second Offset
internal static let resume5SecondOffset = L10n.tr("Localizable", "resume5SecondOffset")
/// Retry
internal static let retry = L10n.tr("Localizable", "retry")
/// Runtime
internal static let runtime = L10n.tr("Localizable", "runtime")
/// Search
internal static let search = L10n.tr("Localizable", "search")
/// Search…
internal static let searchDots = L10n.tr("Localizable", "searchDots")
/// Searching…
internal static let searchingDots = L10n.tr("Localizable", "searchingDots")
/// Season
internal static let season = L10n.tr("Localizable", "season")
/// S%1$@:E%2$@
internal static func seasonAndEpisode(_ p1: Any, _ p2: Any) -> String {
return L10n.tr("Localizable", "seasonAndEpisode", String(describing: p1), String(describing: p2))
}
/// Seasons
internal static let seasons = L10n.tr("Localizable", "seasons")
/// See All
internal static let seeAll = L10n.tr("Localizable", "seeAll")
/// See More
internal static let seeMore = L10n.tr("Localizable", "seeMore")
/// Select Cast Destination
internal static let selectCastDestination = L10n.tr("Localizable", "selectCastDestination")
/// Series
internal static let series = L10n.tr("Localizable", "series")
/// Server
internal static let server = L10n.tr("Localizable", "server")
/// Server %s is already connected
internal static func serverAlreadyConnected(_ p1: UnsafePointer<CChar>) -> String {
return L10n.tr("Localizable", "serverAlreadyConnected", p1)
}
/// Server %s already exists. Add new URL?
internal static func serverAlreadyExistsPrompt(_ p1: UnsafePointer<CChar>) -> String {
return L10n.tr("Localizable", "serverAlreadyExistsPrompt", p1)
}
/// Server Details
internal static let serverDetails = L10n.tr("Localizable", "serverDetails")
/// Server Information
internal static let serverInformation = L10n.tr("Localizable", "serverInformation")
/// Servers
internal static let servers = L10n.tr("Localizable", "servers")
/// Server URL
internal static let serverURL = L10n.tr("Localizable", "serverURL")
/// Settings
internal static let settings = L10n.tr("Localizable", "settings")
/// Show Cast & Crew
internal static let showCastAndCrew = L10n.tr("Localizable", "showCastAndCrew")
/// Show Poster Labels
internal static let showPosterLabels = L10n.tr("Localizable", "showPosterLabels")
/// Signed in as %@
internal static func signedInAsWithString(_ p1: Any) -> String {
return L10n.tr("Localizable", "signedInAsWithString", String(describing: p1))
}
/// Sign In
internal static let signIn = L10n.tr("Localizable", "signIn")
/// Sign in to get started
internal static let signInGetStarted = L10n.tr("Localizable", "signInGetStarted")
/// Sign In to %s
internal static func signInToServer(_ p1: UnsafePointer<CChar>) -> String {
return L10n.tr("Localizable", "signInToServer", p1)
}
/// Smaller
internal static let smaller = L10n.tr("Localizable", "smaller")
/// Smallest
internal static let smallest = L10n.tr("Localizable", "smallest")
/// Sort by
internal static let sortBy = L10n.tr("Localizable", "sortBy")
/// STUDIO
internal static let studio = L10n.tr("Localizable", "studio")
/// Studios
internal static let studios = L10n.tr("Localizable", "studios")
/// Subtitles
internal static let subtitles = L10n.tr("Localizable", "subtitles")
/// Subtitle Size
internal static let subtitleSize = L10n.tr("Localizable", "subtitleSize")
/// Suggestions
internal static let suggestions = L10n.tr("Localizable", "suggestions")
/// Switch User
internal static let switchUser = L10n.tr("Localizable", "switchUser")
/// System
internal static let system = L10n.tr("Localizable", "system")
/// Tags
internal static let tags = L10n.tr("Localizable", "tags")
/// Try again
internal static let tryAgain = L10n.tr("Localizable", "tryAgain")
/// TV Shows
internal static let tvShows = L10n.tr("Localizable", "tvShows")
/// Unable to connect to server
internal static let unableToConnectServer = L10n.tr("Localizable", "unableToConnectServer")
/// Unauthorized
internal static let unauthorized = L10n.tr("Localizable", "unauthorized")
/// Unauthorized user
internal static let unauthorizedUser = L10n.tr("Localizable", "unauthorizedUser")
/// Unknown
internal static let unknown = L10n.tr("Localizable", "unknown")
/// Unknown Error
internal static let unknownError = L10n.tr("Localizable", "unknownError")
/// URL
internal static let url = L10n.tr("Localizable", "url")
/// User
internal static let user = L10n.tr("Localizable", "user")
/// User %s is already signed in
internal static func userAlreadySignedIn(_ p1: UnsafePointer<CChar>) -> String {
return L10n.tr("Localizable", "userAlreadySignedIn", p1)
}
/// Username
internal static let username = L10n.tr("Localizable", "username")
/// Version
internal static let version = L10n.tr("Localizable", "version")
/// Video Player
internal static let videoPlayer = L10n.tr("Localizable", "videoPlayer")
/// Who's watching?
internal static let whosWatching = L10n.tr("Localizable", "WhosWatching")
/// WIP
internal static let wip = L10n.tr("Localizable", "wip")
/// Your Favorites
internal static let yourFavorites = L10n.tr("Localizable", "yourFavorites")
}
// swiftlint:enable explicit_type_interface function_parameter_count identifier_name line_length
// swiftlint:enable nesting type_body_length type_name vertical_whitespace_opening_braces
// MARK: - Implementation Details
extension L10n {
private static func tr(_ table: String, _ key: String, _ args: CVarArg...) -> String {
let format = BundleToken.bundle.localizedString(forKey: key, value: nil, table: table)
return String(format: format, locale: Locale.current, arguments: args)
}
private static func tr(_ table: String, _ key: String, _ args: CVarArg...) -> String {
let format = BundleToken.bundle.localizedString(forKey: key, value: nil, table: table)
return String(format: format, locale: Locale.current, arguments: args)
}
}
// swiftlint:disable convenience_type
private final class BundleToken {
static let bundle: Bundle = {
#if SWIFT_PACKAGE
return Bundle.module
#else
return Bundle(for: BundleToken.self)
#endif
}()
static let bundle: Bundle = {
#if SWIFT_PACKAGE
return Bundle.module
#else
return Bundle(for: BundleToken.self)
#endif
}()
}
// swiftlint:enable convenience_type

3
Shared/Singleton/SwiftfinNotificationCenter.swift
View File

@ -20,5 +20,8 @@ enum SwiftfinNotificationCenter {
static let processDeepLink = Notification.Name("processDeepLink")
static let didPurge = Notification.Name("didPurge")
static let didChangeServerCurrentURI = Notification.Name("didChangeCurrentLoginURI")
// Send with an item id to check if current item for item views
static let didSendStopReport = Notification.Name("didSendStopReport")
}
}

29
Shared/ViewModels/ItemViewModel/EpisodeItemViewModel.swift
View File

@ -29,10 +29,6 @@ final class EpisodeItemViewModel: ItemViewModel {
return "\(episodeLocator)\n\(item.name ?? "")"
}
override func shouldDisplayRuntime() -> Bool {
false
}
func getEpisodeSeries() {
guard let id = item.seriesId else { return }
UserLibraryAPI.getItem(userId: SessionManager.main.currentLogin.user.id, itemId: id)
@ -44,4 +40,29 @@ final class EpisodeItemViewModel: ItemViewModel {
})
.store(in: &cancellables)
}
override func updateItem() {
ItemsAPI.getItems(userId: SessionManager.main.currentLogin.user.id,
limit: 1,
fields: [
.primaryImageAspectRatio,
.seriesPrimaryImage,
.seasonUserData,
.overview,
.genres,
.people,
.chapters,
],
enableUserData: true,
ids: [item.id ?? ""])
.sink { completion in
self.handleAPIRequestError(completion: completion)
} receiveValue: { response in
if let item = response.items?.first {
self.item = item
self.playButtonItem = item
}
}
.store(in: &cancellables)
}
}

21
Shared/ViewModels/ItemViewModel/ItemViewModel.swift
View File

@ -54,9 +54,27 @@ class ItemViewModel: ViewModel {
getSimilarItems()
SwiftfinNotificationCenter.main.addObserver(self,
selector: #selector(receivedStopReport(_:)),
name: SwiftfinNotificationCenter.Keys.didSendStopReport,
object: nil)
refreshItemVideoPlayerViewModel(for: item)
}
@objc
private func receivedStopReport(_ notification: NSNotification) {
guard let itemID = notification.object as? String else { return }
if itemID == item.id {
updateItem()
} else {
// Remove if necessary. Note that this cannot be in deinit as
// holding as an observer won't allow the object to be deinit-ed
SwiftfinNotificationCenter.main.removeObserver(self)
}
}
func refreshItemVideoPlayerViewModel(for item: BaseItemDto) {
item.createVideoPlayerViewModel()
.sink { completion in
@ -139,4 +157,7 @@ class ItemViewModel: ViewModel {
.store(in: &cancellables)
}
}
// Overridden by subclasses
func updateItem() {}
}

28
Shared/ViewModels/ItemViewModel/MovieItemViewModel.swift
View File

@ -10,4 +10,30 @@ import Combine
import Foundation
import JellyfinAPI
final class MovieItemViewModel: ItemViewModel {}
final class MovieItemViewModel: ItemViewModel {
override func updateItem() {
ItemsAPI.getItems(userId: SessionManager.main.currentLogin.user.id,
limit: 1,
fields: [
.primaryImageAspectRatio,
.seriesPrimaryImage,
.seasonUserData,
.overview,
.genres,
.people,
.chapters,
],
enableUserData: true,
ids: [item.id ?? ""])
.sink { completion in
self.handleAPIRequestError(completion: completion)
} receiveValue: { response in
if let item = response.items?.first {
self.item = item
self.playButtonItem = item
}
}
.store(in: &cancellables)
}
}

14
Shared/ViewModels/VideoPlayerViewModel/VideoPlayerViewModel.swift
View File

@ -247,7 +247,7 @@ extension VideoPlayerViewModel {
adjacentTo: item.id,
limit: 3)
.sink(receiveCompletion: { completion in
print(completion)
self.handleAPIRequestError(completion: completion)
}, receiveValue: { response in
// 4 possible states:
@ -510,6 +510,8 @@ extension VideoPlayerViewModel {
self.handleAPIRequestError(completion: completion)
} receiveValue: { _ in
LogManager.shared.log.debug("Stop report sent for item: \(self.item.id ?? "No ID")")
SwiftfinNotificationCenter.main.post(name: SwiftfinNotificationCenter.Keys.didSendStopReport,
object: self.item.id)
}
.store(in: &cancellables)
}
@ -536,3 +538,13 @@ extension VideoPlayerViewModel {
return newURL.url!
}
}
// MARK: Equatable
extension VideoPlayerViewModel: Equatable {
static func == (lhs: VideoPlayerViewModel, rhs: VideoPlayerViewModel) -> Bool {
lhs.item.id == rhs.item.id &&
lhs.item.userData?.playbackPositionTicks == rhs.item.userData?.playbackPositionTicks
}
}

10
Swiftfin tvOS/Views/ItemView/CinematicItemView/CinematicItemViewTopRow.swift
View File

@ -24,6 +24,8 @@ struct CinematicItemViewTopRow: View {
var title: String
@State
var subtitle: String?
@State
private var playButtonText: String = ""
let showDetails: Bool
init(viewModel: ItemViewModel,
@ -67,7 +69,7 @@ struct CinematicItemViewTopRow: View {
Image(systemName: "play.fill")
.foregroundColor(viewModel.playButtonItem == nil ? Color(UIColor.secondaryLabel) : Color.black)
.font(.title3)
Text(viewModel.playButtonText())
Text(playButtonText)
.foregroundColor(viewModel.playButtonItem == nil ? Color(UIColor.secondaryLabel) : Color.black)
.fontWeight(.semibold)
}
@ -134,6 +136,12 @@ struct CinematicItemViewTopRow: View {
.padding(.bottom, 50)
}
}
.onAppear {
playButtonText = viewModel.playButtonText()
}
.onChange(of: viewModel.item, perform: { _ in
playButtonText = viewModel.playButtonText()
})
.onChange(of: envFocused) { envFocus in
if envFocus == true {
wrappedScrollView?.scrollToTop()

18
Swiftfin.xcodeproj/project.pbxproj
View File

@ -1814,7 +1814,7 @@
536D3D82267BEA550004248C /* XCRemoteSwiftPackageReference "ParallaxView" */,
53649AAB269CFAEA00A2D8B7 /* XCRemoteSwiftPackageReference "Puppy" */,
62C29E9A26D0FE4100C1D2E7 /* XCRemoteSwiftPackageReference "stinsen" */,
E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore.git" */,
E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore" */,
E13DD3D127168E65009D4DAF /* XCRemoteSwiftPackageReference "Defaults" */,
E1267D42271A212C003C492E /* XCRemoteSwiftPackageReference "CombineExt" */,
E1C16B89271A2180009A5D25 /* XCRemoteSwiftPackageReference "SwiftyJSON" */,
@ -2773,7 +2773,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 66;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = TY84JMYEFE;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
ENABLE_PREVIEWS = YES;
EXCLUDED_ARCHS = "";
@ -2810,7 +2810,7 @@
CURRENT_PROJECT_VERSION = 66;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = TY84JMYEFE;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
ENABLE_PREVIEWS = YES;
EXCLUDED_ARCHS = "";
@ -2841,7 +2841,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 66;
DEVELOPMENT_TEAM = TY84JMYEFE;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = WidgetExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
@ -2868,7 +2868,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 66;
DEVELOPMENT_TEAM = TY84JMYEFE;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = WidgetExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
@ -3000,7 +3000,7 @@
minimumVersion = 1.0.0;
};
};
E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore.git" */ = {
E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/JohnEstropia/CoreStore.git";
requirement = {
@ -3117,17 +3117,17 @@
};
E13DD3C52716499E009D4DAF /* CoreStore */ = {
isa = XCSwiftPackageProductDependency;
package = E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore.git" */;
package = E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore" */;
productName = CoreStore;
};
E13DD3CC27164CA7009D4DAF /* CoreStore */ = {
isa = XCSwiftPackageProductDependency;
package = E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore.git" */;
package = E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore" */;
productName = CoreStore;
};
E13DD3CE27164E1F009D4DAF /* CoreStore */ = {
isa = XCSwiftPackageProductDependency;
package = E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore.git" */;
package = E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore" */;
productName = CoreStore;
};
E13DD3D227168E65009D4DAF /* Defaults */ = {

19
Swiftfin/Views/ItemView/ItemViewBody.swift
View File

@ -54,8 +54,7 @@ struct ItemViewBody: View {
topBarView: {
L10n.seasons.text
.fontWeight(.semibold)
.padding(.bottom)
.padding(.horizontal)
.padding()
}, selectedAction: { season in
itemRouter.route(to: \.item, season)
})
@ -63,12 +62,14 @@ struct ItemViewBody: View {
// MARK: Genres
PillHStackView(title: L10n.genres,
items: viewModel.item.genreItems ?? [],
selectedAction: { genre in
itemRouter.route(to: \.library, (viewModel: .init(genre: genre), title: genre.title))
})
.padding(.bottom)
if let genres = viewModel.item.genreItems {
PillHStackView(title: L10n.genres,
items: genres,
selectedAction: { genre in
itemRouter.route(to: \.library, (viewModel: .init(genre: genre), title: genre.title))
})
.padding(.bottom)
}
// MARK: Studios
@ -118,7 +119,7 @@ struct ItemViewBody: View {
// MARK: Cast & Crew
if showCastAndCrew {
if let castAndCrew = viewModel.item.people {
if let castAndCrew = viewModel.item.people, !castAndCrew.isEmpty {
PortraitImageHStackView(items: castAndCrew.filter { BaseItemPerson.DisplayedType.allCasesRaw.contains($0.type ?? "") },
topBarView: {
L10n.castAndCrew.text

5
Swiftfin/Views/ItemView/Landscape/ItemLandscapeMainView.swift
View File

@ -14,6 +14,8 @@ struct ItemLandscapeMainView: View {
var itemRouter: ItemCoordinator.Router
@EnvironmentObject
private var viewModel: ItemViewModel
@State
private var playButtonText: String = ""
// MARK: innerBody
@ -72,6 +74,9 @@ struct ItemLandscapeMainView: View {
}
}
}
.onAppear {
playButtonText = viewModel.playButtonText()
}
}
// MARK: body

17
Swiftfin/Views/ItemView/Portrait/ItemPortraitHeaderOverlayView.swift
View File

@ -15,6 +15,8 @@ struct PortraitHeaderOverlayView: View {
var itemRouter: ItemCoordinator.Router
@EnvironmentObject
private var viewModel: ItemViewModel
@State
private var playButtonText: String = ""
var body: some View {
VStack(alignment: .leading) {
@ -37,9 +39,9 @@ struct PortraitHeaderOverlayView: View {
.fixedSize(horizontal: false, vertical: true)
.padding(.bottom, 10)
if viewModel.item.itemType.showDetails {
// MARK: Runtime
// MARK: Details
HStack {
if viewModel.shouldDisplayRuntime() {
if let runtime = viewModel.item.getItemRuntime() {
Text(runtime)
@ -49,11 +51,7 @@ struct PortraitHeaderOverlayView: View {
.lineLimit(1)
}
}
}
// MARK: Details
HStack {
if let productionYear = viewModel.item.productionYear {
Text(String(productionYear))
.font(.subheadline)
@ -88,7 +86,7 @@ struct PortraitHeaderOverlayView: View {
Image(systemName: "play.fill")
.foregroundColor(viewModel.playButtonItem == nil ? Color(UIColor.secondaryLabel) : Color.white)
.font(.system(size: 20))
Text(viewModel.playButtonText())
Text(playButtonText)
.foregroundColor(viewModel.playButtonItem == nil ? Color(UIColor.secondaryLabel) : Color.white)
.font(.callout)
.fontWeight(.semibold)
@ -137,7 +135,10 @@ struct PortraitHeaderOverlayView: View {
}
}.padding(.top, 8)
}
.padding(.horizontal, 16)
.onAppear {
playButtonText = viewModel.playButtonText()
}
.padding(.horizontal)
.padding(.bottom, UIDevice.current.userInterfaceIdiom == .pad ? -189 : -64)
}
}