Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combine Emby and Jellyfin #520

Merged
merged 5 commits into from
Sep 22, 2024
Merged

Combine Emby and Jellyfin #520

merged 5 commits into from
Sep 22, 2024

Conversation

bpwhelan
Copy link
Contributor

@bpwhelan bpwhelan commented Sep 21, 2024

Having two different pages is problematic without ripping apart the page detection logic, since they both default to :8096. I should have done this when I added Emby in the first place, but I was a bit lazy and didn't feel like standing up a JF instance to test.

These two use basically the same exact stuff. The only difference is line 43, which is nicely taken care of with ??. Also apikey is not needed to retrieve the subtitle stream it seems, which makes sense really.

Evidence of both working locally using the same page code. Both of these are running on :8096 on different servers.

image_1

image

@bpwhelan
Copy link
Contributor Author

Looping @shekhirin in since he added the Jellyfin code.

TL;DR, Having them as two seperate pages was breaking things. Emby and Jellyfin only differ on like, one line, so just merged the two.

@killergerbah
Copy link
Owner

Awesome thanks

@killergerbah killergerbah merged commit 3013bed into killergerbah:main Sep 22, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants