Complete rebranding from jellypig to jellyflood including:
- Renamed all jellypig references to jellyflood
- Updated store implementations (jellypigstore -> jellyfloodstore)
- Moved jellypig tvOS to Swiftfin tvOS structure
- Updated service configurations and defaults
- Preserved all Xtream plugin support and EPG functionality
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
- Add .channel to BaseItemKind.supportedCases for proper filtering
- Implement channel API routing in ItemLibraryViewModel
- Add comprehensive debug logging to track API calls and filtering
- Support channels in MediaViewModel library views
- Fix channel items not appearing in media libraries
This enables Xtream plugin channels (VOD/Series) to display correctly
in jellypig tvOS. Channels now use proper /Channels API endpoints
instead of falling back to regular /Items API.
Related to ongoing fix for Xtream content media display.
* off recursive
* pr feedback
* Cleanup
Instantiate the collectionType in the `if let` since failure to cast `as? BaseItemDto` should count as false as well. Only set `parameters.isRecursive` once in if/else opposed to if -> override.
* wip
* fix recursive and item kinds
* rename, fix folders
---------
Co-authored-by: Quang <quang.ha@a2:3c:68:56:26:8d.home>
Co-authored-by: Joe <jpkribs@outlook.com>
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
Co-authored-by: Quang <quang.ha@QrM3P.local>
* WIP
* Remove Divider
* self deprecation message
* `OrderedDictionary<BaseItemKind, [BaseItemDto]>`
* Localization fun
* cleanup
* Remove play button items & order by BaseItemKind.
* Fix AttributesHStack on iPad and make sure they align to the correct side. Looks jarring on Collections since Collections are often more limited on AttributesHStack items.
* Localization fix
* cleanup
* cleanup
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* first string
* add a bunch of localization
* more hardcode to localization
* small changes for two strings
* fix space formatting
* Update Localizable.strings
Put the localizations back in. Don't know why this changes anything but 🤷♂️
* Fix encoding
Why???
Also, missing ;
* implement requested changes
---------
Co-authored-by: Joe Kribs <jpkribs@outlook.com>
* Move permissions to centralized spot
* Move `identifiableTypes` to `BaseItemKind`. Use `showEditMenu`
* Cleanup showMenu options for iOS and tvOS. Metadata allows Subtitle, Lyrics, and Collection edits as well.
* Comment out Lyrics and Subtitles with a TODO for when they are available.
* Update BaseItemKind.swift
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Review Revisions
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Very Very WIP
* Details page.
TODOs:
- Duplicate ViewModels are initialized.
- Routing Cleanup
- Localizations for fields
- Get Played Item Details (See ActiveSessionDetails)
- Move all details to ActivityDetailsViewModel for Users & Items
- Localizations for enums
- Enum the types if possible
* Details View complete. TODO:
- Filters
- Default with No Filters
* Ready
* Fix localization
* cleanup
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Buildable!
* Update file names.
* Default sort to sort name NOT name.
* SessionInfoDto vs SessionInfo
* Targetting
* Fix many invalid `ItemSortBy` existing. Will need to revisit later to see which can still be used!
* ExtraTypes Patch.
* Move from Binding to OnChange. Tested and Working.
* Update README.md
Update README to use 10.10.6. Bumped up from 10.8.13
* Update to Main on https://github.com/jellyfin/jellyfin-sdk-swift.git
* Now using https://github.com/jellyfin/jellyfin-sdk-swift.git again!
* Paths.getUserViews() userId moved to parameters
* Fix ViewModels where -Dto suffixes were removed by https://github.com/jellyfin/Swiftfin/pull/1465 auto-merge.
* SupportedCaseIterable
* tvOS supportedCases fixes for build issue.
* cleanup
* update API to 0.5.1 and correct VideoRangeTypes.
* Remove deviceProfile.responseProfiles = videoPlayer.responseProfiles
* Second to last adjustment:
Resolved: // TODO: 10.10 - Filter to only valid SortBy's for each BaseItemKind.
Last outstanding item: // TODO: 10.10 - What should authenticationProviderID & passwordResetProviderID be?
* Trailers itemID must precede userID
* Force User Policy to exist.
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* `VideoRangeType` "Extension" for now it's an enum until 10.10. Otherwise, done.
* Limit lines to 1 and variable width as needed.
* CodeFactor issue resolution
* AttributeViewModifier -> AttributeBadge
* change API
* `WrappingHStack`
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Move ItemType to Filter
* Init but normally...
* filter on people?
* Default to easiest / least change solution.
* Reset `.collectionFolder`, `.folder`, and `.BaseItemPerson` in `PagingLibraryView` to have the default filters. This was originally in place. This Commit just ensures that iOS and tvOS have the same implementation.
* wip
* Update ItemLibraryViewModel.swift
* Update ItemLibraryViewModel.swift
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Good start but some missing items:
- Upload image isn't working
- Only a single image is shown per section. Need to make this the HCollection of all images for the group
* Upload still failing but now update and set are 2 different processes because I think that's better. Spacing on the add screen is still all wrong but we're getting closer
* ~70% Complete
TODO:
- Spacing for remote portrait images is wrong & cramped
- Upload image from file browser never works & produces 400 error
- Show all images for an item.imageType opposed to just the first
- Setting image works but produces a 400 error
- Error alert looks bad
* Merge with Main
* URL Changes
* Updating logic and confirmation screen
* Lots of changes:
Selecting a Remote image is now working without error and works consistently!
Upload a local file is still broken
Item types with multiple images is working as intended now!
Overriding an image on index doesn't seem to work but it doesn't work for Web either so........
UI is way more jank but the hard parts are getting solved!
* Breaking this even more with the hopes of a better tomorrow.
* Getting better?
* Refreshing is working but I might need to make this work mroe effiently...
* 90% There!
* Ability to cancel the update
* Still no luck uploading images?
* Stop reordering on deletion/addition
* 2025 disclaimers
* Uploading finally works!
* Functional but messy.
TODO:
- Figure out better resizing if too big?
- Upload from Photos
- Move upload logic to imageViewModel and make RemtoeImageViewModel PagingLibraryViewModel conformant
- Create a ImageInfoView for Selection & Deletion.
* Now conforms to PagingLIbraryViewModel but everything else is a mess
* Close!
* First no all appears
* Fix double pop/routerdismiss
* Uploading from Photos is (Finally) Ready!
* wip
* Reuse PhotoPicker and Crop code.
* 4/6 of the codefactor changes
* Pass around the URL NOT the UIImage
* Clean up ItemImageDetails types.
* Make sure the ImageView mirrors the real shape of the image. Posters should be uniform but this is the selection for the image so the dimensions are important to demonstrate.
* Rating Type label.
* Delete confirmation dialog.
* Remove double sizing. Remove Unused ViewModel. Change PhotoPicker to a checkmark instead a 1. Since there is only ever one picture selected, no need to count the images.
* Get the image URL as needed. No more Truples. Localize ImageTypes.
* Remove attempt at ImageInfo Poster Comformance.
* Even more cleanup
* Delete vs Save flip
* Hide delete button
* Even more cleanup
* Fix tvOS build issues.
* Reduce delay & remove unused comment. Should finally be ready again.
* wip
* Update ItemImagesView.swift
* Event Only on upload failures.
* Remove unnecessary ViewModel's from tvOS.
* Add dismiss action to RemoteSearchResultView. While I am doing this here, fix it there.
* Move From Coordinator -> .Sheet. This fixes the popping issue / delay requirement!
* wip
* wip
* wip
* wip
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Make user profile more generic. Still need to make it work for the reset image / other stuff like delete & username.
* Username Changing and PFP deletion.
* Functional, refreshing, and good to go!
* Clean up localizations
* Migrate [UserDto] -> IdentifiedArrayOf<UserDto>
* Solve "Username should probably be at the top of this section."
* allow notification filter
* WIP:
Created `UserProfileHeroImage` but I haven't used it anywhere.
* Centralize UserProfileHeroImages
* Rename UserProfileImages
* Fix Merge Issue?
* Move to UserProfileImage
* Merge with Main
* Fix Merge?
* Clear the cache on update.
* Delete duplicate `UserProfileImage`
* wip
* wip
* Update ImagePipeline.swift
* fix tvOS build issue and update comment to be more accurate
* clean up
* fix string
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Cleanup / Genre & Tag Management
* Move searching to a backgroundState. Fix the font Color when bulk editing tags / genres should be secondary when editing & not selected
* Cleanup
* Now that cancelling is handled better this should prevent the issue where the suggestions fails to update on a letter entry
* Change from using an event for searchResults to using a published searchResults var
* Moved all logic to a local list where all genres/tags are populated on refresh then filterd locally instead of calling the server for changes.
* Inheritance
* Split metadata from components then alphabetize. Also, fix but where you can't add a people
* People & Permissions
* Functional but dirty. TODO: Cleanup + Trie? Trei?
* nil coalescing operator is only evaluated if the lhs is nil, coalescing operator with nil as rhs is redundant
* TODO: Search improvements & Delay search on name change
* Cleanup & reordering
* Debouncing
* Trie implementation
* Permissions Cleanup Squeezing in: https://github.com/jellyfin/jellyfin-web/issues/6361
* enhance Trie
* cleanup
* cleanup
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Playback Quality - Learn More
* TODO: Fix leading not working on second line.
* Remove layoutDirection.
* Implement for tvOS. Slightly different spacing.
* VStack
* WIP - tvOS Implementaiton. SUBJECT TO CHANGE / ELIMINATION.
* Background Icon & formatting
* wip
* Review Changes. Remove unused Strings, clean up comments.
* Remove duplicate items used for testing
* Remove tvOS scrollIfLargerThanContainer for now.
* Edit Text-based Metadata
* ViewModel Cleanup
* use binding extensions
* Huge overhaul:
- Fix the notification when metadata was updated to work with 100% consistency
- Flip the locking to be true -> lock like server
- Redo the whole itemEditorViewModel to be more in-line with other viewModels | also fixes iPad weirdness
- Use itemViewModel for the edit view so I can just reuse those existing notifications instead of recreating the wheel
- More human dates for people - Date of death instead of "End date" (yikes)
* String fixes & overview size
* Fix build issues & String cleanup
* fix overview sizing, cleanup
* itemMetadataWasEdited -> temMetadataDidChange
* Creation of the NavigationBarMenuButtonModifier for an "ellipsis.circle" menu object in the toolbar. Makes it easier to ensure that this format looks the same throughout.
* Custom vs Official Rating + Menu Button Label change
* Menu button spacing and groundwork for other menu items (canDownload) since we already have the bool available. Currently disabled.
* Linting
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* WIP
* WIP
* Localization and better planning. Remove the Username as this will end up in another section. Updated planning here: https://github.com/jellyfin/Swiftfin/discussions/1283 | 5 more views required!
* Initializing an optional variable with nil is redundant line
* Remove Live TV since that will go in another section
* Cleanup Coordinator / Merge with Main
* Remove all 'Allows' from strings
* Fix Merge Issues
* Use CaseIterablePicker, Binding.map
* BackgroundState == updating, change all of the buttons to visible when custom by process of elimination opposed to the default custom value. Make all of the input fields use temp values to make it less jarring.
* Update SessionsSection.swift
* Learn more!
* Validate > 0, don't allow inputs to be less than 1 and reset tempValues when the enum is updated.
* use new binding extensions
* String fixes
* Don't test against adminDefault for users or userDefault for admins.
* Linting indentation
* Default vs UserDefault + no more reason to have temporary variables.
* cleanup
* format
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Add compiler flag for long type checking warning
* duplicate file references.
* Reduce expression complexity
* Replace deprecated SwiftLint rule
* Bump SwiftFormat version
* Bump Swift version of SwiftLint
* Partially resolve color todo
* Update localizations for quick connect steps. use bulleted list
* Same change for tvos
* Remove padding2 modifier
* Localisation
* All Working. TODO: Figure out why TimeInterval crashes Swiftfin if I select 'Cancel'
* Cleanup. Kind of a typeAlias but not really? Fixed the minute crash, I was make a recursive calc. All good now. Make sure temp values default to existing value at startup
* Manual Run action from Edit View
* Issues resolved.
* Labels / soft merge with Main
* Utilize events to print a success/failure message for when there is an attempted change with a TaskTrigger.
* Fix label wrong value & remove TODO for completed item.
* Fix all the merge issues.
* wip
* wip
* localize
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Split out Devices Logic - Ready to go!
* Review Items + Reworking the deleteDevices logic to all use the same deleteDevice core + deleteDevices. Delete All Devices now just uses the more generic deleteDevices
* Allow Filtering on UserID for later usage on UserDetailView.
* Fully remove DeleteAll action in favor of Delete Devices. Change view to pass in the viewModel.devices as a 'Delete All' function
* DeviceDetailsView
* Section Split out, Localization, and cleanup.
* I guess I missed there on first upload.
* Initial Select All / Delete Devices logic. Checkbox options on the list. Hopefully this is good.
* Initial Review Item!
* Custom Device Name is now a field. Change DevicesViewModel to Eventful to capture updates
* Revised Device Interaction Buttons
* Remove unused Label.
* Make DeviceRow mirror UserRow. UpdateDevicesView to have DeleteButton when in EditMode. Also, it's EDITMODE not SELECTMODE... Finally, make sure the SelectedDevice and SelectedDevices are both empty if the user tries to delete themselves and fails. Change how the single device delete works to confirm deleting from an array still works as needed.
* wip
* Review Changes: 61b3716239
* Merge issues + testing again to make sure. Checks out.
* wip
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Add Device images & Reference using the Enum as a filler if the NowPlayingItem is Nil
* Localize DeviceTypes.DisplayTitles
* Review changes. Last potential TODO: Image: ImageResource might not be the correct format
* DeviceType is needed to build tvOS
* Mirror Jellyfin-Blue-Blob for SVG configuration. Use ImageResource for the Device/Client Images
* Merge missing }
* Don't recreate the ImageResource since it's already generated.
* New webOS logo! Fix tvOS not having the new logos
* use if let, implicit self
* use secondary system fill for other
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Rename ExperimentalSettingsView.swift to PlaybackQualitySettingsView.swift
Fix Merge
* Rename MaximumBitrateSettingsView.swift to PlaybackQualitySettingsView.swift
fix merge
* Re-implement on Main. Should now have all the Main changed. Added a new change to use the Device Profile as a Transcoding Profile.
* Part 1 -> Making VideoPlayerType into a struct (I Hope) correctly
* Part 1.1 -> Making VideoPlayerType into a struct (I Hope) correctly
* Remove unneeded Files
* Missing file + CustomDeviceProfileSelection -> CustomDeviceProfileAction Rename
* Change + to Appending
* Attempt to add StorageValues+User. Not sure if this is correct?
* Move the Array unwrapping to funcitons. Not required but this should help prevent accidently doing this wrong. Add subtitles back into the custom profiles since that somehow got dropped. Added a PlaybackCompatibility enum. This might need to work for more than just video
* Complete rewrite to allow multiple profiles, compatibility mode, and directplay.
* Hardward -> Hardware
* Update CustomDeviceProfileSettingsView.swift
Double Licensing
* It was actually really easy to implement iOS... Trash cans still look weird and small.
* Swipe to Delete instead of the edit button
* wip
* wip
* Linting
* tvOS Implementation
* wip
* wip
* cleanup
* Create Package.resolved
---------
Co-authored-by: Joseph Kribs <joseph@kribs.net>
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Creation of bitrate selections that mirror Jellyfin-Web. The goal is to eventually allow for these same selections to be available for usage in the Player itself to set the max bitrate per playback session. This App-Wide setting is for things like preserving data (Mobile) or for areas that have perpetually have low bandwidth (AppleTV). These settings currently default to 'Auto' which is the current limit of 360,000,000 bps / 360 mpbs. I have added a spot in BaseItemDTO+VideoPlayerViewModel to get the smaller amount between 360 Mpbs and the App Maximum Setting. This exists so I can go back and update this to get the Minumum between the Player Session max bitrate and the App Setting max bitrate.
Test on iPhone 10S, AppleTV 3rd Gen, and the iPhone 15 Pro via enumulator.
* Fix Bitrate naming (360p vs 480p) and remove the setting nested in a second section.
* Creation of a Maximum setting with 360mbps and an auto that gets the bitrate at playback.
* Remove comments for code where I want to eventually put it for better clarify
* Linting fixes
* Change the Playback Bitrate to an Int from a String since the Bitrate is valuable but the string isn't. Run the SwiftFormat on the maxBitrate function.
* Migrate the settings to their own menu with both the bitrate and the optional test size when auto is used.
* Creation of an enum filterValues function for Bitrate. This way, the selection on the Player Overlay (eventually) can be filtered to only include bitrates that are less than or equal to the App Setting for Maximum Bitrate. This should help prevent confusion / remove bandwidth conflicts.
The eventual Player Overlay setting should never conflict with the App-Wide Setting and should only offer options that are less than the App-Wide Setting.
* Change the videoPlayerViewModel to take parameters instead of defaults. Move the defaults up one level to be called there. Split the bitrate test from the getMaxBitrate to better guard against dividing against 0 and also split out the logic to be easier to read.
Change the PlaybackBitrate filter to always include Auto and, when auto, include ALL bitrates. This filter is not currently used.
* Remove the PlaybackBitrate FilterValues since this is not needed and will be created ad-hoc.
* Update the bitrateTestDuration verbage to better reflect that you're changing the size of the bitrate test and not just increasing the duration. Re-use the existing largest to smallest labels since there isn't a ton of benefit using "Longest to Shortest" so this should re-use existing localization. Comment the Labels.
No functional changes. Only an update to labels.
* Delete the Bitrate.json file but retain the Resources folder.
* Remove Resource Folder.
---------
Co-authored-by: Joe Kribs <joseph@kribs.net>
Ashik K
Joe Kribs
Quang
lostb1t
Ethan Pippin
Rasko
Sam
Daniel Chick
Meng-Huan Yu
Julian Hays