Fixed icon overlay changing only once until app restart.

DineshSolanki · Aug 9, 2021 · 5e7bff4 · 5e7bff4
1 parent 599f9bf
commit 5e7bff4
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 23 deletions.
diff --git a/FoliCon/Models/GlobalVariables.cs b/FoliCon/Models/GlobalVariables.cs
@@ -6,14 +6,17 @@ internal static class GlobalVariables
     {
         public static bool SkipAll;
 
-        public static IconOverlay IconOverlayType = new PosterIconConfigViewModel().IconOverlay switch
+        public static IconOverlay IconOverlayType()
         {
-            "Legacy" => IconOverlay.Legacy,
-            "Alternate" => IconOverlay.Alternate,
-            "Liaher" => IconOverlay.Liaher,
-            "Faelpessoal" => IconOverlay.Faelpessoal,
-            _ => IconOverlay.Alternate
-        };
+            return new PosterIconConfigViewModel().IconOverlay switch
+            {
+                "Legacy" => IconOverlay.Legacy,
+                "Alternate" => IconOverlay.Alternate,
+                "Liaher" => IconOverlay.Liaher,
+                "Faelpessoal" => IconOverlay.Faelpessoal,
+                _ => IconOverlay.Alternate
+            };
+        }
 
         public static string MediaInfoFile = "info.folicon";
     }

diff --git a/FoliCon/Models/PosterIcon.cs b/FoliCon/Models/PosterIcon.cs
@@ -11,6 +11,7 @@ public class PosterIcon
         public string RatingVisibility { get; set; }
         public string Rating { get; set; }
         public string MockupVisibility { get; set; }
+        public string MediaTitle { get; set; }
 
         public PosterIcon()
         {
@@ -24,6 +25,7 @@ public PosterIcon()
             Rating = "7.8";
             MockupVisibility = "visible";
             RatingVisibility = "visible";
+            MediaTitle = "Made with ♥ by FoliCon";
         }
 
         public PosterIcon(string folderJpgPath, string rating, string ratingVisibility, string mockupVisibility)
@@ -36,5 +38,16 @@ public PosterIcon(string folderJpgPath, string rating, string ratingVisibility,
             //byte[] bytes = Util.ImageSourceToBytes(new PngBitmapEncoder(), FolderJpg);
             //string base64string = System.Convert.ToBase64String(bytes);
         }
+        public PosterIcon(string folderJpgPath, string rating, string ratingVisibility, string mockupVisibility, string mediaTitle="FoliCon")
+        {
+            RatingVisibility = ratingVisibility;
+            Rating = rating;
+            MockupVisibility = mockupVisibility;
+            var thisMemoryStream = new MemoryStream(File.ReadAllBytes(folderJpgPath));
+            FolderJpg = (ImageSource)new ImageSourceConverter().ConvertFrom(thisMemoryStream);
+            MediaTitle = mediaTitle;
+            //byte[] bytes = Util.ImageSourceToBytes(new PngBitmapEncoder(), FolderJpg);
+            //string base64string = System.Convert.ToBase64String(bytes);
+        }
     }
 }
diff --git a/FoliCon/Modules/Util.cs b/FoliCon/Modules/Util.cs
@@ -423,9 +423,12 @@ public static int MakeIco(string iconMode, string selectedFolder, DataTable pick
                         .Where(p => p["FolderName"].Equals(tempI))
                         .Select(p => p["Rating"].ToString())
                         .FirstOrDefault();
-
+                    var mediaTitle = pickedListDataTable.AsEnumerable()
+                        .Where(p => p["FolderName"].Equals(tempI))
+                        .Select(p => p["Title"].ToString())
+                        .FirstOrDefault();
                     BuildFolderIco(iconMode, $@"{selectedFolder}\{i}\{i}.png", rating, ratingVisibility,
-                        mockupVisibility);
+                        mockupVisibility, mediaTitle);
                     iconProcessedCount += 1;
                     File.Delete($@"{selectedFolder}\{i}\{i}.png"); //<--IO Exception here
                 }
@@ -449,7 +452,7 @@ public static int MakeIco(string iconMode, string selectedFolder, DataTable pick
         /// <param name="ratingVisibility">Show rating or NOT</param>
         /// <param name="mockupVisibility">Is Cover Mockup visible. </param>
         public static void BuildFolderIco(string iconMode, string filmFolderPath, string rating,
-            string ratingVisibility, string mockupVisibility)
+            string ratingVisibility, string mockupVisibility, string mediaTitle)
         {
             if (!File.Exists(filmFolderPath))
             {
@@ -469,7 +472,7 @@ public static void BuildFolderIco(string iconMode, string filmFolderPath, string
             }
             else
             {
-                using var task = GlobalVariables.IconOverlayType switch
+                using var task = GlobalVariables.IconOverlayType() switch
                 {
                     IconOverlay.Legacy => StaTask.Start(() =>
                         new Views.PosterIcon(new PosterIcon(filmFolderPath, rating, ratingVisibility, mockupVisibility))
@@ -482,7 +485,7 @@ public static void BuildFolderIco(string iconMode, string filmFolderPath, string
                             .RenderToBitmap()),
                     IconOverlay.Faelpessoal => StaTask.Start(() => new PosterIconFaelpessoal(new PosterIcon(
                         filmFolderPath, rating,
-                        ratingVisibility, mockupVisibility)).RenderToBitmap()),
+                        ratingVisibility, mockupVisibility, mediaTitle)).RenderToBitmap()),
                     _ => StaTask.Start(() =>
                         new Views.PosterIcon(new PosterIcon(filmFolderPath, rating, ratingVisibility, mockupVisibility))
                             .RenderToBitmap())

diff --git a/FoliCon/Views/PosterIconFaelpessoal.xaml b/FoliCon/Views/PosterIconFaelpessoal.xaml
@@ -25,6 +25,16 @@
                 <RowDefinition Height="100" />
                 <RowDefinition Height="100" />
             </Grid.RowDefinitions>
+            <TextBlock Text="{Binding MediaTitle}" TextWrapping="Wrap" Foreground="White" FontFamily="Cormorant" TextTrimming="WordEllipsis" Margin="190,14,-2,53" RenderTransformOrigin="0.5,0.5" Grid.Row="1">
+                <TextBlock.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform/>
+                        <SkewTransform/>
+                        <RotateTransform Angle="90"/>
+                        <TranslateTransform/>
+                    </TransformGroup>
+                </TextBlock.RenderTransform>
+            </TextBlock>
             <Image x:Name="Shield" Source="../Resources/shield.png" RenderOptions.BitmapScalingMode="HighQuality"
                    Margin="160,97,6,5" Panel.ZIndex="2" Visibility="{Binding RatingVisibility}" Grid.Row="1" Grid.RowSpan="2" />
             <TextBlock x:Name="Ratingtext" Text="{Binding Rating}" HorizontalAlignment="Center"

diff --git a/FoliCon/Views/PosterIconFaelpessoal.xaml.cs b/FoliCon/Views/PosterIconFaelpessoal.xaml.cs
@@ -1,19 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
+using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace FoliCon.Views
 {