From b922738ccfe2f746ca89f8218f1ce300ab62f349 Mon Sep 17 00:00:00 2001
From: YoShibyl <m.yoshiog1@gmail.com>
Date: Tue, 17 Dec 2024 00:13:46 -0500
Subject: [PATCH] Version 1.2.0

---
 FGH3ChartBrowser.csproj |   6 +-
 MainWindow.xaml         |  23 +++--
 MainWindow.xaml.cs      | 209 +++++++++++++++++++++++++++++++---------
 3 files changed, 182 insertions(+), 56 deletions(-)

diff --git a/FGH3ChartBrowser.csproj b/FGH3ChartBrowser.csproj
index 46033ec..a962739 100644
--- a/FGH3ChartBrowser.csproj
+++ b/FGH3ChartBrowser.csproj
@@ -8,10 +8,10 @@
     <UseWPF>true</UseWPF>
     <PackageIcon>icon.png</PackageIcon>
     <ApplicationIcon>favicon.ico</ApplicationIcon>
-    <AssemblyVersion>1.1.1.0</AssemblyVersion>
-    <FileVersion>1.1.1.0</FileVersion>
+    <AssemblyVersion>1.2.0.0</AssemblyVersion>
+    <FileVersion>1.2.0.0</FileVersion>
     <Configurations>Debug;Release</Configurations>
-    <Version>$(VersionPrefix)1.1.1</Version>
+    <Version>$(VersionPrefix)1.2.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 29190df..608dc01 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -1,11 +1,11 @@
-<Window x:Class="FGH3ChartBrowser.MainWindow"
+<Window x:Name="MainWin" x:Class="FGH3ChartBrowser.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:FGH3ChartBrowser"
         mc:Ignorable="d"
-        Title="Chart Browser for FastGH3" Height="596" Width="800" ResizeMode="CanMinimize" Background="{DynamicResource {x:Static SystemColors.MenuBarBrushKey}}" Icon="/icon.png">
+        Title="FastGH3 Chart Browser v1.2.0" Height="596" Width="800" ResizeMode="CanMinimize" Background="{DynamicResource {x:Static SystemColors.MenuBarBrushKey}}" Icon="/icon.png">
     <Grid Margin="0,0,10,10">
         <Grid.ColumnDefinitions>
         </Grid.ColumnDefinitions>
@@ -18,11 +18,11 @@
         <Button x:Name="ScanChartsBtn" Content="  Scan Songs  " HorizontalAlignment="Left" Margin="531,13,0,0" VerticalAlignment="Top" FontSize="21" Click="ScanChartsBtn_Click" Height="46" Width="245"/>
 
         <TextBox x:Name="SearchTxtBox" HorizontalAlignment="Left" Margin="129,67,0,0" VerticalAlignment="Top" Width="392" FontSize="18" VerticalContentAlignment="Center" TextChanged="SearchTxtBox_TextChanged"/>
-        <Button x:Name="PlaySongBtn" Content="   Play Selected Song   " HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="28" RenderTransformOrigin="0.5,0.5" Click="PlaySongBtn_Click" Margin="10,490,0,0" Height="50" Width="587"/>
+        <Button x:Name="PlaySongBtn" Content="Play Song" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="28" RenderTransformOrigin="0.5,0.5" Click="PlaySongBtn_Click" Margin="246,481,0,0" Height="59" Width="530" Background="#FFDDDDDD"/>
         <DataGrid x:Name="SongsDataGrid" d:ItemsSource="{d:SampleData ItemCount=5}" Margin="245,110,0,0" AutoGenerateColumns="False" Height="224" IsReadOnly="True" Width="531" HorizontalAlignment="Left" VerticalAlignment="Top" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Visible" SelectionMode="Single" ScrollViewer.HorizontalScrollBarVisibility="Visible" RowHeaderWidth="0" SelectionChanged="SongsDataGrid_SelectionChanged" MouseDoubleClick="SongsDataGrid_MouseDoubleClick">
             <DataGrid.Columns>
                 <DataGridTextColumn x:Name="ArtistColumn" Header="Artist" Binding="{Binding Path=Artist}" MaxWidth="180"/>
-                <DataGridTextColumn x:Name="TitleColumn"  Header="Title" Binding="{Binding Path=Title}" MaxWidth="360"/>
+                <DataGridTextColumn x:Name="TitleColumn"  Header="Title" Binding="{Binding Path=Title}" MaxWidth="300"/>
                 <DataGridTextColumn Header="Album" MaxWidth="180" Binding="{Binding Path=Album}"/>
                 <DataGridTextColumn Header="Genre" Binding="{Binding Path=Genre}"/>
                 <DataGridTextColumn x:Name="CharterColumn" Header="Charter" Binding="{Binding Path=Charter}" MaxWidth="150"/>
@@ -31,9 +31,20 @@
         </DataGrid>
         <Label Content="Filter Songs:" HorizontalAlignment="Left" Margin="10,63,0,0" VerticalAlignment="Top" FontSize="18"/>
         <ProgressBar x:Name="ScanProgressBar" HorizontalAlignment="Left" Height="26" Margin="531,67,0,0" VerticalAlignment="Top" Width="245"/>
-        <Button x:Name="FGH3SettingsBtn" Content="Open FastGH3 Settings" HorizontalAlignment="Left" Margin="602,490,0,0" VerticalAlignment="Top" FontSize="16" Width="174" Height="50" Click="FGH3SettingsBtn_Click"/>
+        <Button x:Name="FGH3SettingsBtn" Content="Open FastGH3 Settings" HorizontalAlignment="Left" Margin="11,515,0,0" VerticalAlignment="Top" Width="224" Height="25" Click="FGH3SettingsBtn_Click"/>
         <Rectangle HorizontalAlignment="Left" Height="224" Margin="11,110,0,0" VerticalAlignment="Top" Width="224" Fill="#33000000"/>
         <Rectangle x:Name="AlbumRect" HorizontalAlignment="Left" Height="224" Margin="11,110,0,0" VerticalAlignment="Top" Width="224"/>
-        <TextBlock x:Name="LoadingPhraseTxt" Margin="256,353,26,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Height="100" TextTrimming="WordEllipsis" TextAlignment="Center"/>
+        <TextBlock x:Name="LoadingPhraseTxt" Margin="256,375,26,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="96" TextTrimming="WordEllipsis" TextAlignment="Center" Text="Lorem ipsum odor amet, consectetuer adipiscing elit. Ligula sodales eros malesuada a nulla inceptos. Et phasellus volutpat dictum torquent pulvinar felis tempor ultricies fringilla. Nec parturient nunc leo; nostra fermentum etiam class. Tempor pharetra sapien metus at sagittis magnis. Faucibus fermentum efficitur commodo maecenas molestie facilisis. Felis rutrum litora aenean phasellus donec. Est suscipit luctus dictum conubia fringilla. Pulvinar erat proin justo sit ridiculus. Felis mollis sagittis consectetur accumsan quis curabitur; lacus erat. Lacus iaculis gravida leo urna at pharetra tincidunt. Consequat imperdiet ad, rhoncus ac neque bibendum inceptos ultrices. Phasellus senectus etiam semper at fringilla imperdiet nisl ipsum nulla. Enim vehicula egestas fames curabitur mollis lobortis integer sem."/>
+        <Label x:Name="SongTitleTxt" Content="Lorem ipsum odor amet, consectetuer adipiscing elit. Ligula sodales eros malesuada a nulla inceptos. Et phasellus volutpat dictum torquent pulvinar felis tempor ultricies fringilla. Nec parturient nunc leo; nostra fermentum etiam class. Tempor pharetra sapien metus at sagittis magnis. Faucibus fermentum efficitur commodo maecenas molestie facilisis. Felis rutrum litora aenean phasellus donec. Est suscipit luctus dictum conubia fringilla. Pulvinar erat proin justo sit ridiculus. Felis mollis sagittis consectetur accumsan quis curabitur; lacus erat. Lacus iaculis gravida leo urna at pharetra tincidunt. Consequat imperdiet ad, rhoncus ac neque bibendum inceptos ultrices. Phasellus senectus etiam semper at fringilla imperdiet nisl ipsum nulla. Enim vehicula egestas fames curabitur mollis lobortis integer sem." HorizontalAlignment="Left" Margin="246,339,0,0" VerticalAlignment="Top" FontSize="16" HorizontalContentAlignment="Center" Width="530"/>
+        <Button x:Name="AlbumClickBtn" Content="Button" HorizontalAlignment="Left" Margin="13,113,0,0" VerticalAlignment="Top" Height="221" Width="221" Click="AlbumClick" ScrollViewer.VerticalScrollBarVisibility="Disabled" OpacityMask="#00000000"/>
+        <Button x:Name="OpenInExplorerBtn" Content="Open Song in Explorer" HorizontalAlignment="Left" Margin="11,481,0,0" VerticalAlignment="Top" Width="224" Height="25" Click="OpenInExplorerBtn_Click"/>
+        <TextBlock x:Name="ArtistTxt" HorizontalAlignment="Left" Margin="10,344,0,0" TextWrapping="Wrap" Text="Lorem ipsum odor amet, consectetuer adipiscing elit. Ligula sodales eros malesuada a nulla inceptos. Et phasellus volutpat dictum torquent pulvinar felis tempor ultricies fringilla. Nec parturient nunc leo; nostra fermentum etiam class. Tempor pharetra sapien metus at sagittis magnis. Faucibus fermentum efficitur commodo maecenas molestie facilisis. Felis rutrum litora aenean phasellus donec. Est suscipit luctus dictum conubia fringilla. Pulvinar erat proin justo sit ridiculus. Felis mollis sagittis consectetur accumsan quis curabitur; lacus erat. Lacus iaculis gravida leo urna at pharetra tincidunt. Consequat imperdiet ad, rhoncus ac neque bibendum inceptos ultrices. Phasellus senectus etiam semper at fringilla imperdiet nisl ipsum nulla. Enim vehicula egestas fames curabitur mollis lobortis integer sem." VerticalAlignment="Top" Width="223" FontSize="16" FontWeight="SemiBold" TextAlignment="Center" Height="44" MaxHeight="44" TextTrimming="CharacterEllipsis"/>
+        <TextBlock x:Name="AlbumTxt" Text="Album:  Lorem ipsum odor amet, consectetuer adipiscing elit. Ligula sodales eros malesuada a nulla inceptos. Et phasellus volutpat dictum torquent pulvinar felis tempor ultricies fringilla. Nec parturient nunc leo; nostra fermentum etiam class. Tempor pharetra sapien metus at sagittis magnis. Faucibus fermentum efficitur commodo maecenas molestie facilisis. Felis rutrum litora aenean phasellus donec. Est suscipit luctus dictum conubia fringilla. Pulvinar erat proin justo sit ridiculus. Felis mollis sagittis consectetur accumsan quis curabitur; lacus erat. Lacus iaculis gravida leo urna at pharetra tincidunt. Consequat imperdiet ad, rhoncus ac neque bibendum inceptos ultrices. Phasellus senectus etiam semper at fringilla imperdiet nisl ipsum nulla. Enim vehicula egestas fames curabitur mollis lobortis integer sem." HorizontalAlignment="Left" Margin="10,394,0,0" VerticalAlignment="Top" Width="221" TextTrimming="CharacterEllipsis"/>
+        <Label x:Name="YearTxt" Content="Year:  42069" HorizontalAlignment="Left" Margin="172,408,0,0" VerticalAlignment="Top" Width="75"/>
+        <TextBlock x:Name="GenreTxt" Text="Genre:  Lorem ipsum odor amet, consectetuer adipiscing elit. Ligula sodales eros malesuada a nulla inceptos. Et phasellus volutpat dictum torquent pulvinar felis tempor ultricies fringilla. Nec parturient nunc leo; nostra fermentum etiam class. Tempor pharetra sapien metus at sagittis magnis. Faucibus fermentum efficitur commodo maecenas molestie facilisis. Felis rutrum litora aenean phasellus donec. Est suscipit luctus dictum conubia fringilla. Pulvinar erat proin justo sit ridiculus. Felis mollis sagittis consectetur accumsan quis curabitur; lacus erat. Lacus iaculis gravida leo urna at pharetra tincidunt. Consequat imperdiet ad, rhoncus ac neque bibendum inceptos ultrices. Phasellus senectus etiam semper at fringilla imperdiet nisl ipsum nulla. Enim vehicula egestas fames curabitur mollis lobortis integer sem." HorizontalAlignment="Left" Margin="13,413,0,0" VerticalAlignment="Top" Width="157" TextTrimming="CharacterEllipsis"/>
+        <Label x:Name="LeadDiffTxt" Content="Lead Intensity:  99+" HorizontalAlignment="Left" Margin="10,429,0,0" VerticalAlignment="Top" Width="114"/>
+        <Label x:Name="BassDiffTxt" Content="Bass Intensity:  99+" HorizontalAlignment="Left" Margin="12,449,0,0" VerticalAlignment="Top" Width="112"/>
+        <Label x:Name="LeadStarsTxt" Content="★★★★★★★★★+" HorizontalAlignment="Left" Margin="118,428,0,0" VerticalAlignment="Top" FontSize="13"/>
+        <Label x:Name="BassStarsTxt" Content="★★★★★★★★★+" HorizontalAlignment="Left" Margin="118,448,0,0" VerticalAlignment="Top" FontSize="13" Foreground="Black"/>
     </Grid>
 </Window>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index bbf696f..47e438a 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -44,24 +44,82 @@ public partial class MainWindow : Window
         public BackgroundWorker AlbumLoadBgWorker;
         public string currentLoadingPhrase;
         public SysConfig.Configuration config;
+        public BitmapSource bmpSrc;
+        public Bitmap bmp;
 
         public MainWindow()
         {
             scanFolder = "";
             songList = new List<SongEntry>() { };
             InitializeComponent();
+            RefreshSongInfo();
             totalSongs = 0;
             scannedSongs = 0;
             SongsDataGrid.ItemsSource = songList;
             ScanBgWorker = new BackgroundWorker();
             AlbumLoadBgWorker = new BackgroundWorker();
-            Thread.Sleep(10);
+            currentLoadingPhrase = "";
+            config = SysConfig.ConfigurationManager.OpenExeConfiguration(SysConfig.ConfigurationUserLevel.None);
+            bmpSrc = new BitmapImage();
+            bmp = new Bitmap(4,4);
             LoadConfig();
         }
 
+        private void RefreshSongInfo(SongEntry song)
+        {
+            LoadingPhraseTxt.Text = song.LoadingPhrase;
+            SongTitleTxt.Content = song.Title;
+            ArtistTxt.Text = song.Artist;
+            AlbumTxt.Text = "Album:  " + song.Album;
+            GenreTxt.Text = "Genre:  " + song.Genre;
+            string yearStr = "";
+            if (song.Year > 0) yearStr = int.Clamp(song.Year, 0, 99999).ToString();
+            YearTxt.Content = $"Year:  {yearStr}";
+            LeadDiffTxt.Content = $"Lead Intensity:  {int.Clamp(song.IntensityLead, 0, 99)}";
+            BassDiffTxt.Content = $"Bass Intensity:  {int.Clamp(song.IntensityBass, 0, 99)}";
+            if (song.IntensityLead > 99) LeadDiffTxt.Content += "+";
+            if (song.IntensityBass > 99) BassDiffTxt.Content += "+";
+            string starsLead = "";
+            string starsBass = "";
+            if (song.IntensityLead >= 0)
+            {
+                int i = 1;
+                for (i = 1; i <= 9; i++)
+                {
+                    if (i <= song.IntensityLead) starsLead += "★";
+                    else if (i <= 6) starsLead += "☆";
+                }
+                if (song.IntensityLead > 9) starsLead += "+";
+            }
+            if (song.IntensityBass >= 0)
+            {
+                int i = 1;
+                for (i = 1; i <= 9; i++)
+                {
+                    if (i <= song.IntensityBass) starsBass += "★";
+                    else if (i <= 6) starsBass += "☆";
+                }
+                if (song.IntensityBass > 9) starsBass += "+";
+            }
+            LeadStarsTxt.Content = starsLead;
+            BassStarsTxt.Content = starsBass;
+        }
+        private void RefreshSongInfo()
+        {
+            LoadingPhraseTxt.Text = "";
+            SongTitleTxt.Content = "";
+            ArtistTxt.Text = "";
+            AlbumTxt.Text = "Album:  ";
+            GenreTxt.Text = "Genre:  ";
+            YearTxt.Content = "Year:  ";
+            LeadDiffTxt.Content = "Lead Intensity:  ";
+            BassDiffTxt.Content = "Bass Intensity:  ";
+            LeadStarsTxt.Content = "☆☆☆☆☆☆";
+            BassStarsTxt.Content = "☆☆☆☆☆☆";
+        }
+
         private void LoadConfig()
         {
-            config = SysConfig.ConfigurationManager.OpenExeConfiguration(SysConfig.ConfigurationUserLevel.None);
             FGH3_Path_TxtBox.Text = config.AppSettings.Settings["fastgh3_exe_location"].Value;
             if (String.IsNullOrEmpty(FGH3_Path_TxtBox.Text))
             {
@@ -93,11 +151,11 @@ private void GH3PathBrowseBtn_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private async void ScanSongs(object sender, DoWorkEventArgs e)
+        private async void ScanSongs(object? sender, DoWorkEventArgs e)
         {
             string searchPath = scanFolder;
-            BackgroundWorker bw = sender as BackgroundWorker;
-            if (!String.IsNullOrWhiteSpace(searchPath) && System.IO.Path.Exists(searchPath) && bw != null)
+            //BackgroundWorker bw = sender as BackgroundWorker;
+            if (!String.IsNullOrWhiteSpace(searchPath) && System.IO.Path.Exists(searchPath))
             {
                 IEnumerable<string> charts = Directory.EnumerateFiles(searchPath, "notes.chart", SearchOption.AllDirectories);
                 IEnumerable<string> midis = Directory.EnumerateFiles(searchPath, "notes.mid", SearchOption.AllDirectories);
@@ -111,14 +169,14 @@ private async void ScanSongs(object sender, DoWorkEventArgs e)
                     foreach (string chart in charts)
                     {
                         FileInfo fileInfo = new FileInfo(chart);
-                        string chartDir = fileInfo.Directory.FullName;
+                        string chartDir = "" + fileInfo.Directory?.FullName;
                         string[] songIniFiles = Directory.GetFiles(chartDir, "song.ini", SearchOption.TopDirectoryOnly);
                         if (songIniFiles != null)
                         {
                             if (songIniFiles.Length > 0)
                             {
-                                SongEntry songEntry = new SongEntry();
-                                IConfiguration config = null;
+                                SongEntry songEntry = new SongEntry(chart);
+                                IConfiguration songIniConfig = null;
                                 string artist = "Unknown Artist";
                                 string title = "Unknown Title";
                                 string album = "Unknown Album";
@@ -128,21 +186,26 @@ private async void ScanSongs(object sender, DoWorkEventArgs e)
                                 int year = 0;
                                 try
                                 {
-                                    config = new ConfigurationBuilder().AddIniFile(songIniFiles[0]).Build();
-                                    IConfigurationSection songSect = config.GetSection("song");
+                                    songIniConfig = new ConfigurationBuilder().AddIniFile(songIniFiles[0]).Build();
+                                    IConfigurationSection songSect = songIniConfig.GetSection("song");
                                     artist = RemoveHtml(songSect["artist"] + "");
                                     title = RemoveHtml(songSect["name"] + "");
                                     album = RemoveHtml(songSect["album"] + "");
                                     charter = RemoveHtml(songSect["charter"] + "");
                                     genre = RemoveHtml(songSect["genre"] + "");
-                                    loadingPhrase += RemoveHtml((songSect["loading_phrase"]+"").Replace("<br>", "\n"));
-                                    int.TryParse(config.GetSection("song")["year"], out year);
+                                    loadingPhrase += RemoveHtml((songSect["loading_phrase"] + "").Replace("<br>", "\n"));
+                                    int.TryParse(songIniConfig.GetSection("song")["year"], out year);
+                                    int diffLead = 0;
+                                    int diffBass = 0;
+                                    int.TryParse(songIniConfig.GetSection("song")["diff_guitar"], out diffLead);
+                                    if (!int.TryParse(songIniConfig.GetSection("song")["diff_bass"], out diffBass))
+                                    {
+                                        int.TryParse(songIniConfig.GetSection("song")["diff_rhythm"], out diffBass);
+                                    }
+                                    songEntry.IntensityLead = int.Clamp(diffLead, 0, 100);
+                                    songEntry.IntensityBass = int.Clamp(diffBass, 0, 100);
                                 }
                                 catch { }
-                                if (String.IsNullOrWhiteSpace(artist)) artist = "Unknown Artist";
-                                if (String.IsNullOrWhiteSpace(title)) title = "Unknown Title";
-                                if (String.IsNullOrWhiteSpace(album)) album = "Unknown Album";
-                                if (String.IsNullOrWhiteSpace(charter)) charter = "Unknown Charter";
                                 songEntry.Artist = "" + artist;
                                 songEntry.Title = "" + title;
                                 songEntry.Album = "" + album;
@@ -161,19 +224,19 @@ private async void ScanSongs(object sender, DoWorkEventArgs e)
                             totalSongs -= 1;
                         }
                         scanProgress = scannedSongs / totalSongs * 100;
-                        bw.ReportProgress(scanProgress);
+                        // bw.ReportProgress(scanProgress);
                     }
                     foreach (string midi in midis)
                     {
                         FileInfo fileInfo = new FileInfo(midi);
-                        string chartDir = fileInfo.Directory.FullName;
+                        string chartDir = "" + fileInfo.Directory?.FullName;
                         string[] songIniFiles = Directory.GetFiles(chartDir, "song.ini", SearchOption.TopDirectoryOnly);
                         if (songIniFiles != null)
                         {
                             if (songIniFiles.Length > 0)
                             {
-                                SongEntry songEntry = new SongEntry();
-                                IConfiguration config = null;
+                                SongEntry songEntry = new SongEntry(midi);
+                                IConfiguration songIniConfig = null;
                                 string artist = "Unknown Artist";
                                 string title = "Unknown Title";
                                 string album = "Unknown Album";
@@ -183,21 +246,25 @@ private async void ScanSongs(object sender, DoWorkEventArgs e)
                                 int year = 0;
                                 try
                                 {
-                                    config = new ConfigurationBuilder().AddIniFile(songIniFiles[0]).Build();
-                                    IConfigurationSection songSect = config.GetSection("song");
+                                    songIniConfig = new ConfigurationBuilder().AddIniFile(songIniFiles[0]).Build();
+                                    IConfigurationSection songSect = songIniConfig.GetSection("song");
                                     artist = RemoveHtml(songSect["artist"] + "");
                                     title = RemoveHtml(songSect["name"] + "");
                                     album = RemoveHtml(songSect["album"] + "");
                                     charter = RemoveHtml(songSect["charter"] + "");
                                     genre = RemoveHtml(songSect["genre"] + "");
                                     loadingPhrase += RemoveHtml((songSect["loading_phrase"] + "").Replace("<br>","\n"));
-                                    int.TryParse(config.GetSection("song")["year"], out year);
+                                    int.TryParse(songIniConfig.GetSection("song")["year"], out year);
+                                    int diffLead = 0;
+                                    int diffBass = 0;
+                                    int.TryParse(songIniConfig.GetSection("song")["diff_guitar"], out diffLead);        if (!int.TryParse(songIniConfig.GetSection("song")["diff_bass"], out diffBass))
+                                    {
+                                        int.TryParse(songIniConfig.GetSection("song")["diff_rhythm"], out diffBass);
+                                    }
+                                    songEntry.IntensityLead = int.Clamp(diffLead, 0, 100);
+                                    songEntry.IntensityBass = int.Clamp(diffBass, 0, 100);
                                 }
                                 catch { }
-                                if (String.IsNullOrWhiteSpace(artist))  artist = "Unknown Artist";
-                                if (String.IsNullOrWhiteSpace(title))   title = "Unknown Title";
-                                if (String.IsNullOrWhiteSpace(album))   album = "Unknown Album";
-                                if (String.IsNullOrWhiteSpace(charter)) charter = "Unknown Charter";
                                 songEntry.Artist = "" + artist;
                                 songEntry.Title = "" + title;
                                 songEntry.Album = "" + album;
@@ -216,13 +283,12 @@ private async void ScanSongs(object sender, DoWorkEventArgs e)
                             totalSongs -= 1;
                         }
                         scanProgress = scannedSongs / totalSongs * 100;
-                        bw.ReportProgress(scanProgress);
+                        //bw.ReportProgress(scanProgress);
                     }
                     foreach (string sngPath in sngs)
                     {
                         FileInfo fileInfo = new FileInfo(sngPath);
-                        // I think I got this done correctly...?
-                        SongEntry songEntry = new SongEntry();
+                        SongEntry songEntry = new SongEntry(sngPath);
                         songEntry.Genre = "";
                         songEntry.LoadingPhrase = "";
                         songEntry.Year = 0;
@@ -235,18 +301,28 @@ private async void ScanSongs(object sender, DoWorkEventArgs e)
                             string charter = "";
                             string genre = "";
                             string loadingPhrase = "";
+                            string diffLeadStr = "";
+                            string diffBassStr = "";
+                            int diffLead = 0;
+                            int diffBass = 0;
                             sngData.meta.TryGetValue("artist", out artist);
                             sngData.meta.TryGetValue("name", out title);
                             sngData.meta.TryGetValue("album", out album);
                             sngData.meta.TryGetValue("genre", out genre);
                             sngData.meta.TryGetValue("charter", out charter);
                             sngData.meta.TryGetValue("loading_phrase", out loadingPhrase);
-                            songEntry.Title         = "" + title;
-                            songEntry.Artist        = "" + artist;
-                            songEntry.Album         = "" + album;
-                            songEntry.Genre         = "" + genre;
-                            songEntry.Charter       = "" + charter;
-                            songEntry.LoadingPhrase = "" + loadingPhrase;
+                            sngData.meta.TryGetValue("diff_guitar", out diffLeadStr);
+                            sngData.meta.TryGetValue("diff_rhythm", out diffBassStr);
+                            int.TryParse(diffLeadStr, out diffLead);
+                            int.TryParse(diffBassStr, out diffBass);
+                            songEntry.IntensityLead = int.Clamp(diffLead, 0, 100);
+                            songEntry.IntensityBass = int.Clamp(diffBass, 0, 100);
+                            songEntry.Title         = "" + RemoveHtml(title);
+                            songEntry.Artist        = "" + RemoveHtml(artist);
+                            songEntry.Album         = "" + RemoveHtml(album);
+                            songEntry.Genre         = "" + RemoveHtml(genre);
+                            songEntry.Charter       = "" + RemoveHtml(charter);
+                            songEntry.LoadingPhrase = "" + RemoveHtml(("" + loadingPhrase).Replace("<br>","\n"));
                             int year = 0;
                             int.TryParse(sngData.meta["year"], out year);
                             songEntry.Year = year;
@@ -270,6 +346,7 @@ private void UpdateScanProgress(object? sender, ProgressChangedEventArgs e)
 
         }
 
+
         private void FinishedScanning(object? sender, RunWorkerCompletedEventArgs e)
         {
             SongsDataGrid.ItemsSource = songList;
@@ -281,6 +358,11 @@ private void FinishedScanning(object? sender, RunWorkerCompletedEventArgs e)
             ScanChartsBtn.IsEnabled = true;
         }
 
+        private void AlbumClick(object sender, RoutedEventArgs e)
+        {
+            // TO DO: figure out making a popup with album image
+        }
+
         private void ScanChartsBtn_Click(object sender, RoutedEventArgs e)
         {
             ScanChartsBtn.IsEnabled = false;
@@ -364,11 +446,14 @@ private void PlaySong()
             if (index >= 0)
             {
                 var entry = SongsDataGrid.SelectedItems[0];
-                if (entry.GetType() == typeof(SongEntry))
+                if (entry != null)
                 {
-                    string shart = (entry as SongEntry).Path;
-                    if (System.IO.Path.Exists(FGH3_Path_TxtBox.Text))
-                        System.Diagnostics.Process.Start(FGH3_Path_TxtBox.Text, "\"" + shart + "\"");
+                    if (entry.GetType() == typeof(SongEntry))
+                    {
+                        string shart = (entry as SongEntry)?.Path + "";
+                        if (System.IO.Path.Exists(FGH3_Path_TxtBox.Text))
+                            System.Diagnostics.Process.Start(FGH3_Path_TxtBox.Text, "\"" + shart + "\"");
+                    }
                 }
             }
         }
@@ -379,9 +464,6 @@ private void FGH3SettingsBtn_Click(object sender, RoutedEventArgs e)
                 System.Diagnostics.Process.Start(FGH3_Path_TxtBox.Text, "-settings");
         }
 
-        public BitmapSource bmpSrc;
-        public Bitmap bmp;
-
         [System.Runtime.InteropServices.DllImport("gdi32.dll")]
         public static extern bool DeleteObject(IntPtr hObject);
 
@@ -421,7 +503,6 @@ private void SetAlbumArt(object? sender, RunWorkerCompletedEventArgs? e)
             AlbumRect.Fill = new ImageBrush(bmpSrc);
             AlbumRect.Visibility = Visibility.Visible;
         }
-
         private void SongsDataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (SongsDataGrid.SelectedItem != null)
@@ -431,7 +512,7 @@ private void SongsDataGrid_SelectionChanged(object sender, SelectionChangedEvent
                 {
                     SongEntry song = (SongEntry)entry;
                     currentLoadingPhrase = song.LoadingPhrase;
-                    LoadingPhraseTxt.Text = song.LoadingPhrase;
+                    RefreshSongInfo(song);
                     if (song.Path.ToLower().EndsWith(".chart") || song.Path.ToLower().EndsWith(".mid"))
                     {
                         string? folder = new FileInfo(song.Path).DirectoryName;
@@ -439,13 +520,13 @@ private void SongsDataGrid_SelectionChanged(object sender, SelectionChangedEvent
                         if (albumCandidates.Length > 0)
                         {
                             LoadAlbumArtFromBitmap(albumCandidates[0]);
+                            SetAlbumArt(null, null);
                         }
                         else AlbumRect.Visibility = Visibility.Hidden;
                     }
 
                     if (song.Path.EndsWith(".sng"))
                     {
-                        
                         try
                         {
                             Sng sng = Sng.Load(song.Path);
@@ -471,7 +552,7 @@ private void SongsDataGrid_SelectionChanged(object sender, SelectionChangedEvent
                                 AlbumRect.Visibility = Visibility.Hidden;
                             }
                         }
-                        catch (Exception ex) { }
+                        catch { }
                     }
                 }
             }
@@ -482,6 +563,24 @@ private void SongsDataGrid_MouseDoubleClick(object sender, MouseButtonEventArgs
         {
             // PlaySong();  // TO DO: Find a better way to implement quickly selecting a song to play?
         }
+
+        private void OpenInExplorerBtn_Click(object sender, RoutedEventArgs e)
+        {
+            if (SongsDataGrid.SelectedItem != null)
+            {
+                var entry = SongsDataGrid.SelectedItem;
+                if (entry.GetType() == typeof(SongEntry))
+                {
+                    SongEntry song = (SongEntry)entry;
+                    FileInfo fileInfo = new FileInfo(song.Path);
+                    string songDir = "" + fileInfo.Directory?.FullName;
+                    if (File.Exists(song.Path))
+                        System.Diagnostics.Process.Start("explorer.exe", $"/select, \"{song.Path}\"");
+                    else
+                        System.Diagnostics.Process.Start("explorer.exe", songDir);
+                }
+            }
+        }
     }
     public class SongEntry
     {
@@ -493,5 +592,21 @@ public class SongEntry
         public string Genre { get; set; }
         public string Path { get; set; }
         public string LoadingPhrase { get; set; }
+        public int IntensityLead { get; set; }
+        public int IntensityBass { get; set; }
+
+        public SongEntry(string path = "", string artist = "Unknown Artist", string title = "Unknown Title", string album = "Unknown Album", string charter = "", int year = 0, string genre = "", string loadingPhrase = "", int intensityLead = 0, int intensityBass = 0)
+        {
+            Artist = artist;
+            Title = title;
+            Album = album;
+            Charter = charter;
+            Year = year;
+            Genre = genre;
+            Path = path;
+            LoadingPhrase = loadingPhrase;
+            IntensityLead = intensityLead;
+            IntensityBass = intensityBass;
+        }
     }
 }
\ No newline at end of file