WIP - Media importing and library integration (UPnP, Emby, Plex, ...)

WIP Media importing and library integration (UPnP, Emby, Plex, ...) - Printable Version

+- Kodi Community Forum (https://forum.kodi.tv)
+-- Forum: Development (https://forum.kodi.tv/forumdisplay.php?fid=32)
+--- Forum: Kodi Application (https://forum.kodi.tv/forumdisplay.php?fid=93)
+--- Thread: WIP Media importing and library integration (UPnP, Emby, Plex, ...) (/showthread.php?tid=224794)

Pages: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96

RE: Media importing and library integration (UPnP, Emby, Plex, ...) - flubshi - 2021-02-05

(2021-02-05, 18:24)LongMan Wrote: Is it ok for me to add these links to the Wiki?

No, the online storage does not have enough bandwidth. We need to mirror it somewhere else. And we should check the build before. It seems that the Media Sources settings menu entry is missing.

(2021-02-05, 18:24)LongMan Wrote: Could you share how to get from vanilla to MediaImport

Sure. Just adjust the variables 'PKG_VERSION', 'PKG_SHA256' and 'PKG_URL' in 'packages/mediacenter/kodi/package.mk'. Mine looks like this:

cpp:


# SPDX-License-Identifier: GPL-2.0-or-later

# Copyright © 2009-2016 Stephan Raue ([email protected])

# Copyright © 2017-present Team LibreELEC (https://libreelec.tv)



PKG_NAME="kodi"

#PKG_VERSION="bb88e5e1db54844bc27befc7014c8118ae5ca275"

#PKG_SHA256="b00e0c2152f52207959fad087ed0ed5fd2ac1afda95ae56f83e406d1ec028ad9"

PKG_VERSION="3c57403e3c4519e2553874f193ecc1a7830e3844" #beta2

PKG_SHA256="44023b5203f1a7e244edcd5f5dd2fdabc94cd19654a74a94c6c78378aa1f3a93"



PKG_LICENSE="GPL"

PKG_SITE="http://www.kodi.tv"

#PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz"

PKG_URL="https://github.com/Montellese/xbmc/archive/${PKG_VERSION}.tar.gz"

[...]

RE: Media importing and library integration (UPnP, Emby, Plex, ...) - LongMan - 2021-02-05

Thanks. Trying it now

RE: Media importing and library integration (UPnP, Emby, Plex, ...) - LongMan - 2021-02-05

Quote:PKG_VERSION="3c57403e3c4519e2553874f193ecc1a7830e3844" #beta2 PKG_SHA256="44023b5203f1a7e244edcd5f5dd2fdabc94cd19654a74a94c6c78378aa1f3a93"

Ok. It is running now. Just have to wait on the result. Thanks

PKG_VERSION I can see that is the from Github. However, how do I obtain PKG_VERSION?

RE: Media importing and library integration (UPnP, Emby, Plex, ...) - flubshi - 2021-02-05

(2021-02-05, 20:16)LongMan Wrote: PKG_VERSION I can see that is the from Github. However, how do I obtain PKG_VERSION?

RE: Media importing and library integration (UPnP, Emby, Plex, ...) - LongMan - 2021-02-05

Sorry I meant PKG_SHA256. I was able to figure out PKG_VERSION

RE: Media importing and library integration (UPnP, Emby, Plex, ...) - flubshi - 2021-02-05

I downloaded the file and used "sha256sum <file>" (linux). Not sure if there is an easier way.

We still need to figure out why the settings menu is missing inestuary skin Sad

Any ideas?

RE: Media importing and library integration (UPnP, Emby, Plex, ...) - LongMan - 2021-02-05

https://github.com/Montellese/xbmc/commit/8e1b54d98039913475223f47a34707a993d40475
https://github.com/Montellese/xbmc/commit/29d0358e738588d3e196b921215aa3d63164f48a
https://github.com/Montellese/xbmc/commit/c805c72658fb38e0c4c8e3b79c8bc6c7fb0f1c5d

These three commits usually adds it

RE: Media importing and library integration (UPnP, Emby, Plex, ...) - M4tt0 - 2021-02-06

Just for information: Inspired by your success, I'm trying to replicate your attempts to provide Mediaimport test builds for CoreElec, too. Unfortunately it seems more complicated there as they (of course) patch vanilla Kodi. Not sure it is possible without running into major merge conflicts, but I'd like to give it a shot. Will report back how it goes...

RE: Media importing and library integration (UPnP, Emby, Plex, ...) - LongMan - 2021-02-06

Beautiful. Hope it goes well.

RE: Media importing and library integration (UPnP, Emby, Plex, ...) - M4tt0 - 2021-02-07

Thanks. Unfortunately, it didn't. I believe I figured out a way how to do it "in principle", but could not make it work yet. Here what I've tried:

I cloned @Montellese's xbmc repo and "git checked out" the media import branch
I created a patch file vs. his master using "git diff master media_import_branch > media_import.patch"
I cloned the CoreElec repo and added the above patch file to "src/CoreELEC/projects/Amlogic-ng/patches/kodi"

The CE compile broke as the patch didn't apply cleanly. There could be several reasons for that, e.g. that the CE patches for Kodi are not compatible with the MediaImport ones.
However, I then realized that @Montellese's media import branch has fallen behind his master branch in the meantime. I tried to rebase it, but that failed, too, due to merge conflicts.

I believe this is bad timing. We should probably wait until Matrix is final, then hope that @Montellese finds some time to rebase his work on that, and only then try again. It may still fail eventually, but then I at least know where to look for the merge conflicts...

RE: Media importing and library integration (UPnP, Emby, Plex, ...) - LongMan - 2021-02-07

Sorry to hear that. The LibreELEC builds ran ok for me. Well as far as I can see. I was able to get builds for Generic and Raspberry Pi 4.

If I undestand you correctly, CoreELEC is not just using vanilla Kodi the way LibreELEC does. If not, what are they changing in Kodi and why?

RE: Media importing and library integration (UPnP, Emby, Plex, ...) - flubshi - 2021-02-07

(2021-02-07, 21:44)M4tt0 Wrote: Thanks. Unfortunately, it didn't. I believe I figured out a way how to do it "in principle", but could not make it work yet. Here what I've tried:

I cloned @Montellese's xbmc repo and "git checked out" the media import branch

I created a patch file vs. his master using "git diff master media_import_branch > media_import.patch"

I cloned the CoreElec repo and added the above patch file to "src/CoreELEC/projects/Amlogic-ng/patches/kodi"

The CE compile broke as the patch didn't apply cleanly. There could be several reasons for that, e.g. that the CE patches for Kodi are not compatible with the MediaImport ones.
However, I then realized that @Montellese's media import branch has fallen behind his master branch in the meantime. I tried to rebase it, but that failed, too, due to merge conflicts.

I believe this is bad timing. We should probably wait until Matrix is final, then hope that @Montellese finds some time to rebase his work on that, and only then try again. It may still fail eventually, but then I at least know where to look for the merge conflicts...

I am not a rebase/build expert, but I think the cleanest way is to figure out, which Kodi commit is used as reference in your CoreELEC build. Then, you could rebase MediaImport to this Kodi commit, resolve conflicts and create the patch against this Kodi commit. Afterwards, proceed with your step 3. But conflicts with CE patches are still possible...

If CE is using a recent Kodi commit, you could try my rebased version. It is "Montellese/media_import_19.0b2-Matrix_rework" rebased on 1e6f734@xbmc (3 days ago).
https://github.com/flubshi/xbmc/tree/media_importer_2021-02-05

RE: Media importing and library integration (UPnP, Emby, Plex, ...) - M4tt0 - 2021-02-08

Thanks, @LongMan. Yes, you are right. That's the problem. And thanks @flubshi: I agree. I'm just not familiar enough with the Kodi codebase to resolve any significant merge conflicts, and I also believe that a Media Import version of the final Matrix release will encourage more users to test it. I'll wait for the relase and @Montellese to (hopefully) rebase against it again and will try it again.

Still very curious to learn whether everything works for you on vanilla Kodi / LE of course... :-)

RE: Media importing and library integration (UPnP, Emby, Plex, ...) - LongMan - 2021-02-09

So far so good. I was able to build Generic and Raspberry Pi 4. The experience has been great with Generic on small Zotac celeron. Sync is slow compared to Emby for Kodi but I have synced one video type at a time and that has been good. I am even watching a movie while music videos are syncing and there is notable lag in the GUI.

For me the experience has been good.

The experience with the Pi is not as good but there is heavy dev on the Pi, so, no verdict there. I will run new builds and test again.

Cheers,
LongMan

RE: Media importing and library integration (UPnP, Emby, Plex, ...) - Montellese - 2021-02-11

Here are the latest test builds rebased onto Matrix RC1:

Please remember to delete your previous MyVideos120.db because I had to make changes to the database layout. Also remember to install the latest versions of the Emby / Plex media importers because there has been a breaking change in the add-on interface:

Emby Media Importer: 0.0.10
Plex Media Importer: 0.0.8