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

Import code from upstream #249

Closed
cewert opened this issue Apr 3, 2025 · 2 comments
Closed

Import code from upstream #249

cewert opened this issue Apr 3, 2025 · 2 comments

Comments

@cewert
Copy link
Member

cewert commented Apr 3, 2025

The current viv repo was forked from the official client using version 2.1.4

The current version of the official repo (jellyfin-roku-legacy) before it was replaced with viv was 2.3.1

Did we import that code? Did viv import any code at all from upstream after the fork? I don't see it mentioned in a change log or commit but maybe I'm not looking in the right place. A lot of these commits are translations files being updated, dependency updates, and merge commits but there are plenty of code updates too.

This is all the code that was updated in the official client after the viv fork was created. jellyfin-archive/jellyfin-roku-legacy@v2.1.4...v2.3.1

@jimdogx
Copy link
Collaborator

jimdogx commented Apr 3, 2025

We looked in to doing this. The new client (v3.0.0) is a big enough refactor that the amount of merge conflicts made it unfeasible. Unfortunately there will be some features that didn't make it over (and this has been talked about in various places), but it doesn't mean they can't be added back in going forward.

@jimdogx jimdogx closed this as completed Apr 3, 2025
@cewert
Copy link
Member Author

cewert commented Apr 3, 2025

Yea, I totally understand you can't just magically merge everything and I wasn't expecting that. I'm asking if any code at all has been pulled from upstream and based on your answer I'm assuming that's a no. I'm also asking if you guys have any plans for cherry picking specific commits that would be easy to merge. There's almost 8 months of PRs to choose from so I assumed there would be at least a couple PRs you guys liked enough to bring over.

I read the github changelog and the jellyfin blog post and I didn't see any mention of this stuff. All our users lost certain features (granted I'm sure they aren't as cool as all the stuff in viv but features none the less). Our users that contributed code in the last 8 months lost features and must of been very confused and frustrated. All our devs lost a bunch of features. None of that stuff was mentioned anywhere and apparently you guys are just moving on without all that code which also wasn't mentioned anywhere that I read. That being said I have no idea how you would have worded all this and made it sound good so I guess I get it "hey if you wrote a PR for jellyfin-roku in the past 8 months, all your code and features will be removed in the 3.0 update and they will only be added back if you rewrite everything and resubmit a PR. BTW the codebase is very different and we got rid of a bunch of dev tools."

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

No branches or pull requests

2 participants