Skip to content

Commit

Permalink
v3.0.7.0 Fixed Github issue #4 (multiple "Genre" key/tag)
Browse files Browse the repository at this point in the history
  • Loading branch information
@torum
torum committed Jun 3, 2021
1 parent e2bc3fb commit 4c24dc1
Show file tree
Hide file tree
Showing 4 changed files with 108 additions and 11 deletions.
1 change: 1 addition & 0 deletions MPDCtrl-Desktop/MPDCtrl/App.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Linq;
using System.Text;
using System.IO;
using System.Diagnostics;
using System.Globalization;
using MPDCtrl.ViewModels;
using MPDCtrl.ViewModels.Classes;
Expand Down
2 changes: 1 addition & 1 deletion MPDCtrl-Desktop/MPDCtrl/MPDCtrl.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TargetFramework>net5.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<ApplicationIcon>MPDCtrl2.ico</ApplicationIcon>
<Version>3.0.6.0</Version>
<Version>3.0.7.0</Version>
<Authors>torum</Authors>
<Company>Torum</Company>
<Copyright>2021</Copyright>
Expand Down
102 changes: 94 additions & 8 deletions MPDCtrl-Desktop/MPDCtrl/Models/MPC.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2655,8 +2655,11 @@ private Task<bool> ParseCurrentSong(string result)
{
if (SongValues.ContainsKey(StatusValuePair[0].Trim()))
{
// Shouldn't be happening here.
break;
// Shouldn't be happening here except "Genre"
if (StatusValuePair[0].Trim() == "Genre")
{
SongValues["Genre"] = SongValues["Genre"] + "/" + value.Replace(StatusValuePair[0].Trim() + ": ", "");
}
}
else
{
Expand Down Expand Up @@ -2749,6 +2752,46 @@ private Task<bool> ParsePlaylistInfo(string result)
Id: 22637
*/

/*
try
{
resultLines.Clear();
resultLines.Add("file: Slamhaus/Slamwave/06 The Trial.flac");
resultLines.Add("Last-Modified: 2021-05-27T19:20:50Z");
resultLines.Add("Title: The Trial");
resultLines.Add("Artist: Slamhaus");
resultLines.Add("Date: 2021");
resultLines.Add("Comment: Visit https://slamhaus.bandcamp.com");
resultLines.Add("Album: Slamwave");
resultLines.Add("Track: 6");
resultLines.Add("AlbumArtist: Slamhaus");
resultLines.Add("Time: 340");
resultLines.Add("duration: 339.504");
resultLines.Add("Pos: 5");
resultLines.Add("Id: 1438");
resultLines.Add("file: Harris Heller/Synthwave/Sunset/01 - Zig the Zag.flac");
resultLines.Add("Last-Modified: 2021-06-03T16:52:10Z");
resultLines.Add("Album: Sunset");
resultLines.Add("AlbumArtist: Harris Heller");
resultLines.Add("Artist: Harris Heller");
resultLines.Add("Date: 2021-03-05");
resultLines.Add("Disc: 1");
resultLines.Add("Genre: Electro");
resultLines.Add("Genre: Dance");
resultLines.Add("Title: Zig the Zag");
resultLines.Add("Track: 1");
resultLines.Add("Time: 126");
resultLines.Add("duration: 126.250");
resultLines.Add("Pos: 6");
resultLines.Add("Id: 1439");
}
catch (Exception ex)
{
Debug.WriteLine("Error@ParsePlaylistInfo: " + ex.Message);
}
*/

try
{
IsBusy?.Invoke(this, true);
Expand Down Expand Up @@ -2797,12 +2840,31 @@ private Task<bool> ParsePlaylistInfo(string result)
SongValues.Clear();
}
}
/*
if (!SongValues.ContainsKey(StatusValuePair[0].Trim()))
{
SongValues.Add(StatusValuePair[0].Trim(), value.Replace(StatusValuePair[0].Trim() + ": ", ""));
}
else
{
if (StatusValuePair[0].Trim() == "Genre")
{
SongValues["Genre"] = SongValues["Genre"] + "/" + value.Replace(StatusValuePair[0].Trim() + ": ", "");
}
}
*/
}

if (!SongValues.ContainsKey(StatusValuePair[0].Trim()))
{
SongValues.Add(StatusValuePair[0].Trim(), value.Replace(StatusValuePair[0].Trim() + ": ", ""));
}
else
{
SongValues.Add(StatusValuePair[0].Trim(), value.Replace(StatusValuePair[0].Trim() + ": ", ""));
if (StatusValuePair[0].Trim() == "Genre")
{
SongValues["Genre"] = SongValues["Genre"] + "/" + value.Replace(StatusValuePair[0].Trim() + ": ", "");
}
}
}
}
Expand Down Expand Up @@ -2842,7 +2904,7 @@ private Task<bool> ParsePlaylistInfo(string result)
}
catch (Exception ex)
{
Debug.WriteLine("Error@ParsePlaylistInfo: " + ex.Message);
Debug.WriteLine("Exception@ParsePlaylistInfo: " + ex.Message);

if (Application.Current != null)
{
Expand Down Expand Up @@ -3308,13 +3370,25 @@ private Task<bool> ParseSearchResult(string result)
}

// start over
SongValues.Add(ValuePair[0].Trim(), line.Replace(ValuePair[0].Trim() + ": ", ""));
//SongValues.Add(ValuePair[0].Trim(), line.Replace(ValuePair[0].Trim() + ": ", ""));
}
/*
else
{
SongValues.Add(ValuePair[0].Trim(), line.Replace(ValuePair[0].Trim() + ": ", ""));
}

*/
if (!SongValues.ContainsKey(ValuePair[0].Trim()))
{
SongValues.Add(ValuePair[0].Trim(), line.Replace(ValuePair[0].Trim() + ": ", ""));
}
else
{
if (ValuePair[0].Trim() == "Genre")
{
SongValues["Genre"] = SongValues["Genre"] + "/" + line.Replace(ValuePair[0].Trim() + ": ", "");
}
}
}
}

Expand Down Expand Up @@ -3438,13 +3512,25 @@ private ObservableCollection<SongInfo> ParsePlaylistSongsResult(string result)
}

// start over
SongValues.Add(ValuePair[0].Trim(), line.Replace(ValuePair[0].Trim() + ": ", ""));
//SongValues.Add(ValuePair[0].Trim(), line.Replace(ValuePair[0].Trim() + ": ", ""));
}
/*
else
{
SongValues.Add(ValuePair[0].Trim(), line.Replace(ValuePair[0].Trim() + ": ", ""));
}

*/
if (!SongValues.ContainsKey(ValuePair[0].Trim()))
{
SongValues.Add(ValuePair[0].Trim(), line.Replace(ValuePair[0].Trim() + ": ", ""));
}
else
{
if (ValuePair[0].Trim() == "Genre")
{
SongValues["Genre"] = SongValues["Genre"] + "/" + line.Replace(ValuePair[0].Trim() + ": ", "");
}
}
}
}

Expand Down
14 changes: 12 additions & 2 deletions MPDCtrl-Desktop/MPDCtrl/ViewModels/MainViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ namespace MPDCtrl.ViewModels


/// 更新履歴：
/// v3.0.7 MS Store 公開。Github issue #4 "Incomplete rendering of tracks" fix (multiple "Genre" key/tag). Exceptionをログにちゃんと保存するようにした。
/// v3.0.6 MS Store 公開。
/// v3.0.5.2 Github issue #4 "Incomplete rendering of tracks" fix. Exceptionをログにちゃんと保存するようにした。Progress updateをステータスバーにちゃんと表示するようにした。
/// v3.0.5.2 Fixed Queue update conflicts when consume mode is on. Progress updateをステータスバーにちゃんと表示するようにした。
/// v3.0.5.1 TextBoxをRoundCorner化してみた。DebugWindowクリアするボタンにToolTipを付けた。AlbumArtの表示タイミングを少し遅らせてスムーズにした。IDEのメッセージに対処した。
/// v3.0.5 MS Store 公開。
/// v3.0.4.3 CurrentSongのIsNowPlayingがクリアされないシチュエーションがあった。profileが一つある状態で、もう一つ追加する際にデフォルトにするのオプションが強制される状態だった。
Expand Down Expand Up @@ -117,7 +118,7 @@ public class MainViewModel : ViewModelBase
const string _appName = "MPDCtrl";

// Application version
const string _appVer = "v3.0.6.0";
const string _appVer = "v3.0.7.0";

public static string AppVer
{
Expand Down Expand Up @@ -4166,6 +4167,15 @@ public void OnWindowClosing(object sender, CancelEventArgs e)
}
catch { }

// Save error logs.
if (Application.Current != null)
{
Application.Current.Dispatcher.Invoke(() =>
{
App app = App.Current as App;
app.SaveErrorLog();
});
}
}

#endregion
Expand Down

0 comments on commit 4c24dc1

Please sign in to comment.