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

Updates project structure to Kodi v17 #62

Merged
merged 2 commits into from
Sep 4, 2019
Merged

Updates project structure to Kodi v17 #62

merged 2 commits into from
Sep 4, 2019

Conversation

graybush
Copy link
Contributor

@graybush graybush commented Sep 1, 2019

Moves pngs from the root to the resources directory and updates references to said pngs in the source code.

I was unsure about kodi_icon.png. The only reference I could find is possibly in line 316:

def post_capabilities(self, server):
LOG.info("--[ post capabilities/%s ]", server['auth/server-id'])
server['api'].post_capabilities({
'PlayableMediaTypes': "Audio,Video",
'SupportsMediaControl': True,
'SupportedCommands': (
"MoveUp,MoveDown,MoveLeft,MoveRight,Select,"
"Back,ToggleContextMenu,ToggleFullscreen,ToggleOsdMenu,"
"GoHome,PageUp,NextLetter,GoToSearch,"
"GoToSettings,PageDown,PreviousLetter,TakeScreenshot,"
"VolumeUp,VolumeDown,ToggleMute,SendString,DisplayMessage,"
"SetAudioStreamIndex,SetSubtitleStreamIndex,"
"SetRepeatMode,"
"Mute,Unmute,SetVolume,"
"Play,Playstate,PlayNext,PlayMediaSource"
),
'IconUrl': "https://raw.githubusercontent.com/jellyfin/jellyfin-kodi/master/kodi_icon.png",
})

Copy link
Member

@mcarlton00 mcarlton00 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Judging by the code and results in the server, it looks like kodi_icon.png is used when posting client metadata to the server. If you look at "Devices" in the Jellyfin admin panel, the icon is used there to identify what kind of client it is. I'm of the opinion that we should keep it and move it with the rest of the images for consistency.

resources/lib/monitor.py shoud be updated with the new location to prevent errors.

Outside of that, the plugin installs and appears to work fine on a fresh Kodi 18.3 environment.

@dkanada
Copy link
Member

dkanada commented Sep 2, 2019

Actually, I recently deprecated the icon URL as part of my effort to remove any reliance on remote content. The icons were only used for the web client so I added new icons to the web source, which will pull them straight off the web server like any other file, so that specific line can be removed.

@graybush
Copy link
Contributor Author

graybush commented Sep 2, 2019

Actually, I recently deprecated the icon URL as part of my effort to remove any reliance on remote content. The icons were only used for the web client so I added new icons to the web source, which will pull them straight off the web server like any other file, so that specific line can be removed.

Remove the line from the file and the file itself from the repo or just the line?

@mcarlton00
Copy link
Member

mcarlton00 commented Sep 2, 2019

Remove the IconUrl line and the image file. It might get reimplemented here in the jellyfin-web repo later.

@mcarlton00 mcarlton00 merged commit a4cf84d into jellyfin:master Sep 4, 2019
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.

None yet

3 participants