From b58ab954a7e87f78ccfd2e2a3264cc960cfcf608 Mon Sep 17 00:00:00 2001 From: Ryan Rector Date: Sat, 11 Feb 2023 11:09:42 -0700 Subject: [PATCH] remove extra artwork settings from AS.xml --- system/settings/settings.xml | 12 ---- xbmc/settings/AdvancedSettings.cpp | 112 ----------------------------- xbmc/settings/AdvancedSettings.h | 9 --- xbmc/settings/Settings.h | 3 - 4 files changed, 136 deletions(-) diff --git a/system/settings/settings.xml b/system/settings/settings.xml index 672e20f2fb762..358225b8d1279 100755 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -1111,12 +1111,6 @@ - - - 4 - false - - 1 0 @@ -1305,12 +1299,6 @@ - - - 4 - false - - 1 0 diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp index 7fde2f16867f6..b321df0776ae2 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -297,8 +297,6 @@ void CAdvancedSettings::Initialize() m_bShoutcastArt = true; m_musicThumbs = "folder.jpg|Folder.jpg|folder.JPG|Folder.JPG|cover.jpg|Cover.jpg|cover.jpeg|thumb.jpg|Thumb.jpg|thumb.JPG|Thumb.JPG"; - m_musicArtistExtraArt = {}; - m_musicAlbumExtraArt = {}; m_bMusicLibraryAllItemsOnBottom = false; m_bMusicLibraryCleanOnUpdate = false; @@ -319,13 +317,6 @@ void CAdvancedSettings::Initialize() m_bVideoScannerIgnoreErrors = false; m_iVideoLibraryDateAdded = 1; // prefer mtime over ctime and current time - m_videoEpisodeExtraArt = {}; - m_videoTvShowExtraArt = {}; - m_videoTvSeasonExtraArt = {}; - m_videoMovieExtraArt = {}; - m_videoMovieSetExtraArt = {}; - m_videoMusicVideoExtraArt = {}; - m_iEpgUpdateCheckInterval = 300; /* Check every X seconds, if EPG data need to be updated. This does not mean that every X seconds an EPG update is actually triggered, it's just the interval how often to check whether an update should be triggered. If this value is greater @@ -810,9 +801,6 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) separator = separator->NextSibling("separator"); } } - - SetExtraArtwork(pElement->FirstChildElement("artistextraart"), m_musicArtistExtraArt); - SetExtraArtwork(pElement->FirstChildElement("albumextraart"), m_musicAlbumExtraArt); } pElement = pRootElement->FirstChildElement("videolibrary"); @@ -826,13 +814,6 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) XMLUtils::GetBoolean(pElement, "importwatchedstate", m_bVideoLibraryImportWatchedState); XMLUtils::GetBoolean(pElement, "importresumepoint", m_bVideoLibraryImportResumePoint); XMLUtils::GetInt(pElement, "dateadded", m_iVideoLibraryDateAdded); - - SetExtraArtwork(pElement->FirstChildElement("episodeextraart"), m_videoEpisodeExtraArt); - SetExtraArtwork(pElement->FirstChildElement("tvshowextraart"), m_videoTvShowExtraArt); - SetExtraArtwork(pElement->FirstChildElement("tvseasonextraart"), m_videoTvSeasonExtraArt); - SetExtraArtwork(pElement->FirstChildElement("movieextraart"), m_videoMovieExtraArt); - SetExtraArtwork(pElement->FirstChildElement("moviesetextraart"), m_videoMovieSetExtraArt); - SetExtraArtwork(pElement->FirstChildElement("musicvideoextraart"), m_videoMusicVideoExtraArt); } pElement = pRootElement->FirstChildElement("videoscanner"); @@ -1259,9 +1240,6 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) // load in the settings overrides CServiceBroker::GetSettingsComponent()->GetSettings()->LoadHidden(pRootElement); - - // Migration of old style art options from advanced setting to GUI setting - MigrateOldArtSettings(); } void CAdvancedSettings::Clear() @@ -1467,93 +1445,3 @@ void ConvertToWhitelist(const std::vector& oldlist, std::vector settings = CServiceBroker::GetSettingsComponent()->GetSettings(); - if (!settings->GetBool(CSettings::SETTING_MUSICLIBRARY_ARTSETTINGS_UPDATED)) - { - CLog::Log(LOGINFO, "Migrating old music library artwork settings to new GUI settings"); - // Convert numeric art type variants into simple art type family entry - // e.g. {"banner", "fanart1", "fanart2", "fanart3"... } into { "banner", "fanart"} - if (!m_musicArtistExtraArt.empty()) - { - std::vector whitelist; - ConvertToWhitelist(m_musicArtistExtraArt, whitelist); - settings->SetList(CSettings::SETTING_MUSICLIBRARY_ARTISTART_WHITELIST, whitelist); - } - if (!m_musicAlbumExtraArt.empty()) - { - std::vector whitelist; - ConvertToWhitelist(m_musicAlbumExtraArt, whitelist); - settings->SetList(CSettings::SETTING_MUSICLIBRARY_ALBUMART_WHITELIST, whitelist); - } - - // Convert value like "folder.jpg|Folder.jpg|folder.JPG|Folder.JPG|cover.jpg|Cover.jpg| - // cover.jpeg|thumb.jpg|Thumb.jpg|thumb.JPG|Thumb.JPG" into case-insensitive unique elements - // e.g. {"folder.jpg", "cover.jpg", "cover.jpeg", "thumb.jpg"} - if (!m_musicThumbs.empty()) - { - std::vector thumbs1 = StringUtils::Split(m_musicThumbs, "|"); - std::vector thumbs2; - for (auto& it : thumbs1) - { - StringUtils::ToLower(it); - if (std::find(thumbs2.begin(), thumbs2.end(), it) == thumbs2.end()) - thumbs2.emplace_back(it); - } - std::vector thumbs; - thumbs.reserve(thumbs2.size()); - for (const auto& it : thumbs2) - thumbs.emplace_back(it); - settings->SetList(CSettings::SETTING_MUSICLIBRARY_MUSICTHUMBS, thumbs); - } - - // Whitelists configured, set artwork level to custom - if (!m_musicAlbumExtraArt.empty() || !m_musicArtistExtraArt.empty()) - settings->SetInt(CSettings::SETTING_MUSICLIBRARY_ARTWORKLEVEL, 2); - - // Flag migration of settings so not done again - settings->SetBool(CSettings::SETTING_MUSICLIBRARY_ARTSETTINGS_UPDATED, true); - } - - if (!settings->GetBool(CSettings::SETTING_VIDEOLIBRARY_ARTSETTINGS_UPDATED)) - { - CLog::Log(LOGINFO, "Migrating old video library artwork settings to new GUI settings"); - // Convert numeric art type variants into simple art type family entry - // e.g. {"banner", "fanart1", "fanart2", "fanart3"... } into { "banner", "fanart"} - if (!m_videoEpisodeExtraArt.empty()) - { - std::vector whitelist; - ConvertToWhitelist(m_videoEpisodeExtraArt, whitelist); - settings->SetList(CSettings::SETTING_VIDEOLIBRARY_EPISODEART_WHITELIST, whitelist); - } - if (!m_videoTvShowExtraArt.empty()) - { - std::vector whitelist; - ConvertToWhitelist(m_videoTvShowExtraArt, whitelist); - settings->SetList(CSettings::SETTING_VIDEOLIBRARY_TVSHOWART_WHITELIST, whitelist); - } - if (!m_videoMovieExtraArt.empty()) - { - std::vector whitelist; - ConvertToWhitelist(m_videoMovieExtraArt, whitelist); - settings->SetList(CSettings::SETTING_VIDEOLIBRARY_MOVIEART_WHITELIST, whitelist); - } - if (!m_videoMusicVideoExtraArt.empty()) - { - std::vector whitelist; - ConvertToWhitelist(m_videoMusicVideoExtraArt, whitelist); - settings->SetList(CSettings::SETTING_VIDEOLIBRARY_MUSICVIDEOART_WHITELIST, whitelist); - } - - // Whitelists configured, set artwork level to custom - if (!m_videoEpisodeExtraArt.empty() || !m_videoTvShowExtraArt.empty() - || !m_videoMovieExtraArt.empty() || !m_videoMusicVideoExtraArt.empty()) - settings->SetInt(CSettings::SETTING_VIDEOLIBRARY_ARTWORK_LEVEL, - CSettings::MUSICLIBRARY_ARTWORK_LEVEL_CUSTOM); - - // Flag migration of settings so not done again - settings->SetBool(CSettings::SETTING_VIDEOLIBRARY_ARTSETTINGS_UPDATED, true); - } -} diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h index 4ba4e7e8b075e..fc92f1e3c4d87 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h @@ -242,8 +242,6 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler bool m_bShoutcastArt; std::string m_musicThumbs; - std::vector m_musicArtistExtraArt; - std::vector m_musicAlbumExtraArt; int m_iMusicLibraryRecentlyAddedItems; int m_iMusicLibraryDateAdded; @@ -264,12 +262,6 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler bool m_bVideoLibraryUseFastHash; bool m_bVideoLibraryImportWatchedState{true}; bool m_bVideoLibraryImportResumePoint{true}; - std::vector m_videoEpisodeExtraArt; - std::vector m_videoTvShowExtraArt; - std::vector m_videoTvSeasonExtraArt; - std::vector m_videoMovieExtraArt; - std::vector m_videoMovieSetExtraArt; - std::vector m_videoMusicVideoExtraArt; bool m_bVideoScannerIgnoreErrors; int m_iVideoLibraryDateAdded; @@ -387,5 +379,4 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler void Initialize(); void Clear(); void SetExtraArtwork(const TiXmlElement* arttypes, std::vector& artworkMap); - void MigrateOldArtSettings(); }; diff --git a/xbmc/settings/Settings.h b/xbmc/settings/Settings.h index 9adab18eacf3c..9794bc88d7452 100644 --- a/xbmc/settings/Settings.h +++ b/xbmc/settings/Settings.h @@ -94,8 +94,6 @@ class CSettings : public CSettingsBase, public CSettingCreator, public CSettingC "videolibrary.episodeartwhitelist"; static constexpr auto SETTING_VIDEOLIBRARY_MUSICVIDEOART_WHITELIST = "videolibrary.musicvideoartwhitelist"; - static constexpr auto SETTING_VIDEOLIBRARY_ARTSETTINGS_UPDATED = - "videolibrary.artsettingsupdated"; static constexpr auto SETTING_VIDEOLIBRARY_SHOWPERFORMERS = "videolibrary.musicvideosallperformers"; static constexpr auto SETTING_LOCALE_AUDIOLANGUAGE = "locale.audiolanguage"; @@ -253,7 +251,6 @@ class CSettings : public CSettingsBase, public CSettingCreator, public CSettingC "musiclibrary.artistartwhitelist"; static constexpr auto SETTING_MUSICLIBRARY_ALBUMART_WHITELIST = "musiclibrary.albumartwhitelist"; static constexpr auto SETTING_MUSICLIBRARY_MUSICTHUMBS = "musiclibrary.musicthumbs"; - static constexpr auto SETTING_MUSICLIBRARY_ARTSETTINGS_UPDATED = "musiclibrary.artsettings"; static constexpr auto SETTING_MUSICLIBRARY_ALBUMSSCRAPER = "musiclibrary.albumsscraper"; static constexpr auto SETTING_MUSICLIBRARY_ARTISTSSCRAPER = "musiclibrary.artistsscraper"; static constexpr auto SETTING_MUSICLIBRARY_OVERRIDETAGS = "musiclibrary.overridetags";