From 85c4f21fa6b6a83d54c1459fb19cde647dd589f5 Mon Sep 17 00:00:00 2001 From: KJ-Cox Date: Fri, 10 May 2024 15:25:16 +0000 Subject: [PATCH 1/5] Fanart Handler 4.0.5.374 / Release --- scripts/fanarthandler.xml | 248 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 248 insertions(+) diff --git a/scripts/fanarthandler.xml b/scripts/fanarthandler.xml index c5a6f61..5f386c7 100644 --- a/scripts/fanarthandler.xml +++ b/scripts/fanarthandler.xml @@ -1215,6 +1215,254 @@ Normalizing property names, restructure Template The file used to configure the extension. If have .exe extension the will be executed + If have .dll extension used like MP plugin configuration + + + https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot01.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot02.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot03.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot04.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot05.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot06.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot07.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot08.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot09.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot10.jpg + String + Online stored screenshot urls separated by ; + + + YES + Bool + Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer. + + + + + + + + + + + false + + + 2.0 + + + + Default + true + Default + + + + + + Images + true + Images + + + + + + Language + true + Language + + + + + + Skin images + true + Skin images + + + + + + Awards + true + Awards + + + + + + Genres + true + Genres + + + + + + Studios + true + Studios + + + + + + Libraries + true + Libraries + + + + + + Scripts + true + Scripts + + + + + + Holidays + true + Holidays + + + + + + Weather + true + Weather + + + + + + + + + + + + + MediaPortal + + + * + * + * + * + + + * + * + * + * + + false + + MediaPortal + None + + + Skin + + + 1 + 4 + 0 + 0 + + + 1 + 4 + 0 + 0 + + true + Requires Skin version 1.4.0.0 to 1.4.0.0. + Skin + None + + + Installer + + + 1 + 24 + 100 + 0 + + + 1 + 999 + 999 + 999 + + false + This version of FanartHandler requires MediaPortal 1.25 Pre + Installer + None + + + + + + + + + + 1.1.6.27644 + 1.1.6.27644 + + + + + + + + + + + Fanart Handler + 814a6918-0183-4323-a3b4-c00fac11b4f6 + ajs (maintained by yoavain, original by cul8er) + https://github.com/andrewjswan/mediaportal-fanart-handler + https://forum.team-mediaportal.com/fanart-handler-535/ + https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/scripts/fanarthandler.xml + + 4 + 0 + 5 + 374 + + Fanart Handler is a plugin for MediaPortal (MP). The plugin basically supports; + * Search and download music artist fanart or artist and album thumbnails (scrape) from the fanart.tv, htbackdrops, last.fm, coverartarchive site. + * for all artists stored in your MP music database. + * for any artist currently being played (on the fly). + + * Push fanart that you store on your local harddrive to the current used MP skin. + * push fanart for now played music + * push fanart for selected music or movie + * push random images from selected folders + Update for Trakt to use FanartHandler ClearArt paths for Movies and Series +Update for TVSeries to use FanartHandler ClearArt paths +Fix for MovingPictures +CWE-134: Uncontrolled format string - Fix +Normalizing property names, restructure + +*** We Stand with Ukraine *** + Stable + https://github.com/andrewjswan/mediaportal-fanart-handler/releases/download/v4.0.5.374/FanartHandler-4.0.5.374.mpe1 + 2024-05-10T15:24:45.4898104+00:00 + fanart,music,movies,thumbs,clearart,clearlogo,banner,cdart,dvdart,scraper,awards,genres,studios,animated + AnyCPU + ..\builds\FanartHandler-[Version].mpe1 + + + + https://github.com/andrewjswan/mediaportal-fanart-handler/raw/master/FanartHandler_Icon.png + String + The icon file of the package stored online (jpg,png,bmp) + + + %Plugins%\process\fanarthandler.dll + Template + The file used to configure the extension. + If have .exe extension the will be executed If have .dll extension used like MP plugin configuration From 1a1c4474d046d0c7f79cd0dad1f3ac4a8637fadf Mon Sep 17 00:00:00 2001 From: KJ-Cox Date: Sat, 11 May 2024 01:30:44 +1000 Subject: [PATCH 2/5] Add VideoFullScreen to SelectedItem list and clear TVSeries clearart when movie playing --- FanartHandler/FanartSelectedOther.cs | 7 +++++++ FanartHandler/Utils.cs | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/FanartHandler/FanartSelectedOther.cs b/FanartHandler/FanartSelectedOther.cs index 0af6183..5dfd555 100644 --- a/FanartHandler/FanartSelectedOther.cs +++ b/FanartHandler/FanartSelectedOther.cs @@ -928,6 +928,13 @@ public void AddSelectedSeriesPropertys(string SelectedItem) { return; } + + // If imdb number then it's a movie playing + if (SelectedItem.StartsWith("tt") && char.IsDigit(SelectedItem.Last())) + { + ClearSelectedSeriesPropertys(); + return; + } string strTVDBID = Utils.GetProperty("#Trakt.Show.TvdbId"); if (string.IsNullOrEmpty(strTVDBID)) diff --git a/FanartHandler/Utils.cs b/FanartHandler/Utils.cs index 01964bf..bf8e582 100644 --- a/FanartHandler/Utils.cs +++ b/FanartHandler/Utils.cs @@ -2690,6 +2690,14 @@ public static void GetSelectedItem(ref string SelectedItem, ref string SelectedA } } } + else if (iActiveWindow == 2005) // VideoFullScreen + { + SelectedItem = Utils.GetProperty("#Play.Current.IMDBNumber"); // Movies + if (string.IsNullOrEmpty(SelectedItem)) + { + SelectedItem = Utils.GetProperty("#TVSeries.Play.ClearArt"); // TVSeries + } + } else { SelectedItem = Utils.GetProperty("#selecteditem"); From 97e444ccecb5f7686e2b5069c713e38c1933cfe9 Mon Sep 17 00:00:00 2001 From: KJ-Cox Date: Sat, 11 May 2024 01:33:53 +1000 Subject: [PATCH 3/5] Undo accidental change to fanarthandler.xml file --- scripts/fanarthandler.xml | 248 -------------------------------------- 1 file changed, 248 deletions(-) diff --git a/scripts/fanarthandler.xml b/scripts/fanarthandler.xml index 5f386c7..c5a6f61 100644 --- a/scripts/fanarthandler.xml +++ b/scripts/fanarthandler.xml @@ -1215,254 +1215,6 @@ Normalizing property names, restructure Template The file used to configure the extension. If have .exe extension the will be executed - If have .dll extension used like MP plugin configuration - - - https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot01.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot02.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot03.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot04.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot05.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot06.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot07.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot08.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot09.jpg;https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/screenshots/screenshot10.jpg - String - Online stored screenshot urls separated by ; - - - YES - Bool - Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer. - - - - - - - - - - - false - - - 2.0 - - - - Default - true - Default - - - - - - Images - true - Images - - - - - - Language - true - Language - - - - - - Skin images - true - Skin images - - - - - - Awards - true - Awards - - - - - - Genres - true - Genres - - - - - - Studios - true - Studios - - - - - - Libraries - true - Libraries - - - - - - Scripts - true - Scripts - - - - - - Holidays - true - Holidays - - - - - - Weather - true - Weather - - - - - - - - - - - - - MediaPortal - - - * - * - * - * - - - * - * - * - * - - false - - MediaPortal - None - - - Skin - - - 1 - 4 - 0 - 0 - - - 1 - 4 - 0 - 0 - - true - Requires Skin version 1.4.0.0 to 1.4.0.0. - Skin - None - - - Installer - - - 1 - 24 - 100 - 0 - - - 1 - 999 - 999 - 999 - - false - This version of FanartHandler requires MediaPortal 1.25 Pre - Installer - None - - - - - - - - - - 1.1.6.27644 - 1.1.6.27644 - - - - - - - - - - - Fanart Handler - 814a6918-0183-4323-a3b4-c00fac11b4f6 - ajs (maintained by yoavain, original by cul8er) - https://github.com/andrewjswan/mediaportal-fanart-handler - https://forum.team-mediaportal.com/fanart-handler-535/ - https://raw.githubusercontent.com/andrewjswan/mediaportal-fanart-handler/master/scripts/fanarthandler.xml - - 4 - 0 - 5 - 374 - - Fanart Handler is a plugin for MediaPortal (MP). The plugin basically supports; - * Search and download music artist fanart or artist and album thumbnails (scrape) from the fanart.tv, htbackdrops, last.fm, coverartarchive site. - * for all artists stored in your MP music database. - * for any artist currently being played (on the fly). - - * Push fanart that you store on your local harddrive to the current used MP skin. - * push fanart for now played music - * push fanart for selected music or movie - * push random images from selected folders - Update for Trakt to use FanartHandler ClearArt paths for Movies and Series -Update for TVSeries to use FanartHandler ClearArt paths -Fix for MovingPictures -CWE-134: Uncontrolled format string - Fix -Normalizing property names, restructure - -*** We Stand with Ukraine *** - Stable - https://github.com/andrewjswan/mediaportal-fanart-handler/releases/download/v4.0.5.374/FanartHandler-4.0.5.374.mpe1 - 2024-05-10T15:24:45.4898104+00:00 - fanart,music,movies,thumbs,clearart,clearlogo,banner,cdart,dvdart,scraper,awards,genres,studios,animated - AnyCPU - ..\builds\FanartHandler-[Version].mpe1 - - - - https://github.com/andrewjswan/mediaportal-fanart-handler/raw/master/FanartHandler_Icon.png - String - The icon file of the package stored online (jpg,png,bmp) - - - %Plugins%\process\fanarthandler.dll - Template - The file used to configure the extension. - If have .exe extension the will be executed If have .dll extension used like MP plugin configuration From 989c3ddf0c68a06428d15aeb5c12633c58be16b2 Mon Sep 17 00:00:00 2001 From: KJ-Cox Date: Sat, 11 May 2024 14:25:24 +1000 Subject: [PATCH 4/5] Changed value on Utils.cs to #Play.Current.Title. Resolved issue with Release Configuration. --- FanartHandler.sln | 8 ++++---- FanartHandler/FanartHandler.csproj | 10 +++++----- FanartHandler/Utils.cs | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/FanartHandler.sln b/FanartHandler.sln index 992fac0..184f44b 100644 --- a/FanartHandler.sln +++ b/FanartHandler.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34728.123 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FanartHandler", "FanartHandler\FanartHandler.csproj", "{4E7B5EA7-A01E-4E5A-A0CE-A3684A68376B}" EndProject @@ -13,8 +13,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {4E7B5EA7-A01E-4E5A-A0CE-A3684A68376B}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU {4E7B5EA7-A01E-4E5A-A0CE-A3684A68376B}.Debug|AnyCPU.Build.0 = Debug|AnyCPU - {4E7B5EA7-A01E-4E5A-A0CE-A3684A68376B}.Release|AnyCPU.ActiveCfg = Release|AnyCPU - {4E7B5EA7-A01E-4E5A-A0CE-A3684A68376B}.Release|AnyCPU.Build.0 = Release|AnyCPU + {4E7B5EA7-A01E-4E5A-A0CE-A3684A68376B}.Release|AnyCPU.ActiveCfg = Release|Any CPU + {4E7B5EA7-A01E-4E5A-A0CE-A3684A68376B}.Release|AnyCPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FanartHandler/FanartHandler.csproj b/FanartHandler/FanartHandler.csproj index 4505d53..2b3bcce 100644 --- a/FanartHandler/FanartHandler.csproj +++ b/FanartHandler/FanartHandler.csproj @@ -45,15 +45,15 @@ false - pdbonly - true + true bin\Release\ TRACE + full + AnyCPU + 7.3 prompt - 4 - true AllRules.ruleset - false + true diff --git a/FanartHandler/Utils.cs b/FanartHandler/Utils.cs index bf8e582..42c9016 100644 --- a/FanartHandler/Utils.cs +++ b/FanartHandler/Utils.cs @@ -2695,7 +2695,7 @@ public static void GetSelectedItem(ref string SelectedItem, ref string SelectedA SelectedItem = Utils.GetProperty("#Play.Current.IMDBNumber"); // Movies if (string.IsNullOrEmpty(SelectedItem)) { - SelectedItem = Utils.GetProperty("#TVSeries.Play.ClearArt"); // TVSeries + SelectedItem = Utils.GetProperty("#Play.Current.Title"); // TVSeries } } else From 1ad7dc9b72f49cd590167a0d4763f9bef96617c8 Mon Sep 17 00:00:00 2001 From: KJ-Cox Date: Mon, 13 May 2024 01:08:43 +1000 Subject: [PATCH 5/5] Removing changes to project and solution --- FanartHandler.sln | 8 ++++---- FanartHandler/FanartHandler.csproj | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/FanartHandler.sln b/FanartHandler.sln index 184f44b..992fac0 100644 --- a/FanartHandler.sln +++ b/FanartHandler.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.9.34728.123 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30723.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FanartHandler", "FanartHandler\FanartHandler.csproj", "{4E7B5EA7-A01E-4E5A-A0CE-A3684A68376B}" EndProject @@ -13,8 +13,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {4E7B5EA7-A01E-4E5A-A0CE-A3684A68376B}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU {4E7B5EA7-A01E-4E5A-A0CE-A3684A68376B}.Debug|AnyCPU.Build.0 = Debug|AnyCPU - {4E7B5EA7-A01E-4E5A-A0CE-A3684A68376B}.Release|AnyCPU.ActiveCfg = Release|Any CPU - {4E7B5EA7-A01E-4E5A-A0CE-A3684A68376B}.Release|AnyCPU.Build.0 = Release|Any CPU + {4E7B5EA7-A01E-4E5A-A0CE-A3684A68376B}.Release|AnyCPU.ActiveCfg = Release|AnyCPU + {4E7B5EA7-A01E-4E5A-A0CE-A3684A68376B}.Release|AnyCPU.Build.0 = Release|AnyCPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FanartHandler/FanartHandler.csproj b/FanartHandler/FanartHandler.csproj index 2b3bcce..4505d53 100644 --- a/FanartHandler/FanartHandler.csproj +++ b/FanartHandler/FanartHandler.csproj @@ -45,15 +45,15 @@ false - true + pdbonly + true bin\Release\ TRACE - full - AnyCPU - 7.3 prompt + 4 + true AllRules.ruleset - true + false