Merge pull request xbmc#18030 from ronie/scraper-originaldate

Allow original release date for albums to be scraped
Maven85 · Aug 6, 2020 · c69b346 · c69b346
1 parent 46c7a37
commit c69b346
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/xbmc/addons/Scraper.cpp b/xbmc/addons/Scraper.cpp
@@ -757,10 +757,10 @@ void DetailsFromFileItem<CAlbum>(const CFileItem &item, CAlbum &album)
   album.strReleaseDate = FromString(item, "album.releasedate");
   if (album.strReleaseDate.empty())
     album.strReleaseDate = FromString(item, "album.year");
+  album.strOrigReleaseDate = FromString(item, "album.originaldate");
   album.strLabel = FromString(item, "album.label");
   album.strType = FromString(item, "album.type");
   album.strReleaseStatus = FromString(item, "album.releasestatus");
-  album.SetReleaseType(FromString(item, "album.release_type"));
   album.fRating = item.GetProperty("album.rating").asFloat();
   album.iUserrating = item.GetProperty("album.user_rating").asInteger32();
   album.iVotes = item.GetProperty("album.votes").asInteger32();

diff --git a/xbmc/music/Album.cpp b/xbmc/music/Album.cpp
@@ -291,7 +291,6 @@ void CAlbum::MergeScrapedAlbum(const CAlbum& source, bool override /* = true */)
   //@todo: validate ISO8601 format YYYY, YYYY-MM, or YYYY-MM-DD
   if ((override && !source.strReleaseDate.empty()) || strReleaseDate.empty())
     strReleaseDate = source.strReleaseDate;
-  //@todo: can scraper return original release date??
   if ((override && !source.strOrigReleaseDate.empty()) || strOrigReleaseDate.empty())
     strOrigReleaseDate = source.strOrigReleaseDate;