Allow video scrapers/NFO files/library import to add any artwork type… #12612

rmrector · 2017-08-02T19:09:53Z

… for items

Description

Scrapers (along with friends NFO files and library importing from single file XML export) can set any type of artwork (clearlogo, landscape, etc) for items in the video library.

This is such a simple loop change that doesn't disturb the beast that is scrapers, I so very much wish I had found it a couple of years ago when I first went looking for it.

Motivation and Context

The video library has long supported freely named artwork for items in most other places, now scrapers can set this artwork from the beginning.

How Has This Been Tested?

By hand, I modified the new demo Python scrapers and a classic scraper to set some extra artwork, and modified a couple of NFO files to match, then ensuring the results are what I expect. I also refreshed a few items with a regular scraper and ensured they still set their expected artwork.

Types of change

Bug fix (non-breaking change which fixes an issue)
Improvement (non-breaking change which improves existing functionality)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

My code follows the Code guidelines of this project
My change requires a change to the documentation, either Doxygen or wiki
I have updated the documentation accordingly
I have read the CONTRIBUTING document
I have added tests to cover my change
All new and existing tests passed

rmrector · 2017-08-03T00:21:53Z

The build failure for Win-64 looks like it was caused by something else.

hudokkow · 2017-08-03T09:59:11Z

Sorry, this is not my territory.
jenkins failure indeed seems unrelated. How the hell do I remove my name from review request list?

EDIT: Silly me. Removed myself from reviewers.

rmrector · 2017-08-16T21:19:16Z

Anyone have any thoughts on this? This is kind of important, a lot of folks like extended artwork and this has been a big hole in artwork support for awhile now (relying on an add-on seems unnecessary, scrapers can add some artwork so they should be able to add all of it).

One hole is left, Kodi doesn't import extended artwork from image files next to media. I've got Python code that identifies these images just fine, but for some reason I just cannot translate it to Kodi core (C++ noob, gah!).

zag2me · 2017-08-17T10:36:45Z

@DaveTBlake was looking at imports and exports recently

DaveTBlake · 2017-08-17T11:24:13Z

For music, scraping of video is different, but I am interested in how we can handle art better in core rather than leave it to addons. There is also #11755, which could be of interest.

rmrector · 2017-09-04T17:31:12Z

@phate89 You've been hard at work on bigger parts of the scrapers, what do you think of this? This code sits up a level higher, as a filter on the data from the scraper before it makes it into the database, and is still useful to your open PR #12661.

@MartijnKaijser With all your work on Artwork Downloader, what do you think of scrapers being able to add more artwork?

xbmc/video/VideoInfoScanner.cpp

@@ -1397,6 +1378,18 @@ namespace VIDEO
        art.insert(std::make_pair("fanart", fanart));
    }

+    // add online art
+    std::vector<CScraperUrl::SUrlEntry>& scraperArt = pItem->GetVideoInfoTag()->m_strPictureURL.m_url;
+    for (auto i = scraperArt.begin(); i != scraperArt.end(); ++i)


phate89 · 2017-09-05T09:28:07Z

I'm not an expert of artwork code but it seems fine and also simpler. Why did you move the loop after fanart gathering?

rmrector · 2017-09-06T02:03:52Z

I moved the loop because it can also provide a "fanart" image, but the original fanart section still offers an extra feature, the rarely-used fanart colors for skins, so they should take priority.

I just added a bit that covers what the original art.empty() check did for XML scrapers: it considers artwork with an empty aspect to be "thumb", which is a reasonable assumption and matches scraper behavior for episodes, or "poster" for music videos, which is a quick hack to support the XML music video scrapers that share scraper bits with music album scrapers.

zag2me · 2017-09-06T07:48:28Z

Does this work for music scrapers also?

phate89 · 2017-09-06T20:51:17Z

@rmrector I really don't know anything but I always tought that fanart was only in m_fanart..
We explicitely drop it from arTypes here https://github.com/rmrector/xbmc/blob/f489c22bd92aa374c17b0de62ccaef946c57236f/xbmc/video/VideoInfoScanner.cpp#L1338
But I think it make sense to be able to provide all artwork from one place.. maybe @xhaggi know better
@zag2me these are only video changes. No idea if the same could be done in music part

rmrector · 2017-09-07T01:27:45Z

@zag2me The music library doesn't support the same wide selection of artwork as the video library in the first place, so it can't be extended this simply and is outside the scope of this PR.

@phate89 This new code doesn't use artTypes when processing scraper artwork (artTypes is what held back the original code), but accepts the first image of each art type/"aspect" the scraper provides, so if the scraper sets an image aspect to "fanart" in addAvailableThumb then it will show up here. I agree that all artwork should work the same, so I didn't want to add an exception to ignore "fanart" here, and I don't want to disturb XML scrapers, so I kept the existing m_fanart as well. If it weren't for that rarely-used feature of fanart, the colors (I like the idea, but I think they should be attached to the TV show and occasionally season rather than each fanart), I'd say Python scrapers shouldn't even have a setAvailableFanart. The only web service that has that info is TheTVDB, and their new v2 API (v1 will disappear soon) doesn't seem to provide the color anymore (nor their beta website), so maybe it should even go away anyway?

I've also push another change to handle season artwork, which is in another section of code. One thing about season artwork is that it doesn't work from Python scrapers in master (with notspiff's initial Python scraper), but does look to be addressed in your PR. I haven't given it a test yet, but I intend to soon; the scraper process has some goofiness with artwork, and I think the Python scraper interface can smooth some of it out.

Edit: And the WIN64 build failure looks unrelated, the rest compiled fine.

notspiff

fix the very minors and i will merge this. sorry for the long wait!

xbmc/video/VideoInfoScanner.cpp

    {
-      thumb = CScraperUrl::GetThumbURL(pItem->GetVideoInfoTag()->m_strPictureURL.GetFirstThumb(type));
-      if (!thumb.empty())
+      if (thumb.find("http://") == std::string::npos &&


… for items

rmrector · 2018-01-10T02:52:27Z

@notspiff ping.

notspiff · 2018-01-10T08:09:37Z

jenkins build this please

notspiff · 2018-01-10T08:56:16Z

@xhaggi i will do a follow up with the cosmetics, let's get this in now.

olympia · 2018-01-10T09:57:12Z

Cool!
Would someone explain to me (who is unable to read the code) what to change / how to use this in the scrapers?

notspiff · 2018-01-10T10:02:22Z

you have an 'aspect' tag on the entry that can be "poster", "thumb", etc.

Small adjustment to xbmc#12612 to keep backward-compatibility with NFOs exported from Kodi 11 Eden scrapers.

mkortstiege requested review from xhaggi and hudokkow August 3, 2017 07:27

hudokkow removed their request for review August 3, 2017 09:59

rmrector mentioned this pull request Aug 17, 2017

python music scrapers - art #11755

Closed

phate89 reviewed Sep 5, 2017

View reviewed changes

rmrector force-pushed the the_art_of_scrape branch from 14a9e71 to f489c22 Compare September 6, 2017 01:57

rmrector force-pushed the the_art_of_scrape branch from f489c22 to 2f12f40 Compare September 7, 2017 01:20

jenkins4kodi added the Rebase needed PR that does not apply/merge cleanly to current base branch label Dec 20, 2017

rmrector force-pushed the the_art_of_scrape branch from d53c176 to 902eb79 Compare December 20, 2017 19:41

jenkins4kodi removed the Rebase needed PR that does not apply/merge cleanly to current base branch label Dec 20, 2017

notspiff requested changes Dec 21, 2017

View reviewed changes

Allow video scrapers/NFO files/library import to add any artwork type…

a61e3e5

… for items

rmrector force-pushed the the_art_of_scrape branch from 902eb79 to a61e3e5 Compare December 22, 2017 19:09

notspiff approved these changes Jan 10, 2018

View reviewed changes

notspiff merged commit f444a90 into xbmc:master Jan 10, 2018

Rechi added Type: Improvement non-breaking change which improves existing functionality Component: Video v18 Leia labels Jan 10, 2018

Rechi added this to the L 18.0-alpha1 milestone Jan 10, 2018

rmrector deleted the the_art_of_scrape branch February 20, 2018 00:51

rmrector added a commit to rmrector/xbmc that referenced this pull request Feb 22, 2019

Set NFO thumb without aspect as poster

e0142d4

Small adjustment to xbmc#12612 to keep backward-compatibility with NFOs exported from Kodi 11 Eden scrapers.

rmrector added a commit to rmrector/xbmc that referenced this pull request Feb 24, 2019

Set NFO thumb without aspect as poster

fca08ca

Small adjustment to xbmc#12612 to keep backward-compatibility with NFOs exported from Kodi 11 Eden scrapers.

rmrector mentioned this pull request Feb 24, 2019

Assign video library NFO thumb without aspect as poster #15598

Merged

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow video scrapers/NFO files/library import to add any artwork type… #12612

Allow video scrapers/NFO files/library import to add any artwork type… #12612

rmrector commented Aug 2, 2017

rmrector commented Aug 3, 2017

hudokkow commented Aug 3, 2017 •

edited

rmrector commented Aug 16, 2017

zag2me commented Aug 17, 2017

DaveTBlake commented Aug 17, 2017

rmrector commented Sep 4, 2017

This comment was marked as spam.

phate89 commented Sep 5, 2017

rmrector commented Sep 6, 2017

zag2me commented Sep 6, 2017

phate89 commented Sep 6, 2017

rmrector commented Sep 7, 2017 •

edited

notspiff left a comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

rmrector commented Jan 10, 2018

notspiff commented Jan 10, 2018

notspiff commented Jan 10, 2018

olympia commented Jan 10, 2018

notspiff commented Jan 10, 2018

Allow video scrapers/NFO files/library import to add any artwork type… #12612

Allow video scrapers/NFO files/library import to add any artwork type… #12612

Conversation

rmrector commented Aug 2, 2017

Description

Motivation and Context

How Has This Been Tested?

Types of change

Checklist:

rmrector commented Aug 3, 2017

hudokkow commented Aug 3, 2017 • edited

rmrector commented Aug 16, 2017

zag2me commented Aug 17, 2017

DaveTBlake commented Aug 17, 2017

rmrector commented Sep 4, 2017

This comment was marked as spam.

phate89 commented Sep 5, 2017

rmrector commented Sep 6, 2017

zag2me commented Sep 6, 2017

phate89 commented Sep 6, 2017

rmrector commented Sep 7, 2017 • edited

notspiff left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

rmrector commented Jan 10, 2018

notspiff commented Jan 10, 2018

notspiff commented Jan 10, 2018

olympia commented Jan 10, 2018

notspiff commented Jan 10, 2018

hudokkow commented Aug 3, 2017 •

edited

rmrector commented Sep 7, 2017 •

edited