Skip to content

Commit a0b9736

Browse files
torumtorum
committed
v2.0.4 Microsoft Store release
1 parent 13631c8 commit a0b9736

File tree

14 files changed

+43
-14
lines changed

14 files changed

+43
-14
lines changed

‎MPDCtrl2/MPDCtrl.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Global
2121
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|Any CPU.Build.0 = Debug|Any CPU
2222
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x64.ActiveCfg = Debug|Any CPU
2323
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x64.Build.0 = Debug|Any CPU
24-
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x86.ActiveCfg = Debug|Any CPU
25-
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x86.Build.0 = Debug|Any CPU
24+
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x86.ActiveCfg = Release|Any CPU
25+
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x86.Build.0 = Release|Any CPU
2626
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|Any CPU.ActiveCfg = Release|Any CPU
2727
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|Any CPU.Build.0 = Release|Any CPU
2828
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x64.ActiveCfg = Release|Any CPU

‎MPDCtrl2/MPDCtrl/MPDCtrl.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<TargetFramework>net5.0-windows</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<ApplicationIcon>MPDCtrl2.ico</ApplicationIcon>
8-
<Version>2.0.3</Version>
8+
<Version>2.0.4</Version>
99
<Authors>torum</Authors>
1010
<Company>Torum</Company>
1111
<Copyright>2020</Copyright>

‎MPDCtrl2/MPDCtrl/Models/MPC.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ public void MpdSearch(string queryTag, string queryShiki, string queryValue)
14001400
}
14011401
else
14021402
{
1403-
mpdCommand = "search \"" + expression + "\"\n";
1403+
mpdCommand = "search \"(" + expression + ")\"\n";
14041404
}
14051405

14061406
_asyncClient.Send("noidle" + "\n");

‎MPDCtrl2/MPDCtrl/ViewModels/MainViewModel.cs‎

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ namespace MPDCtrl.ViewModels
3030
{
3131
/// TODO:
3232
///
33-
/// ルートディレクトリにファイルがある時のテスト。というか色々テスト。検索は古いMPDでも大丈夫かテスト。
3433
///
35-
/// v2.0.4
34+
/// v2.0.5
3635
///
3736
/// Ctrl+F検索とFilesでプレイリストに追加できるように。"Save Selected to" context menu.
3837
/// 「プレイリストに追加」をコンテキストメニューで。
@@ -54,6 +53,8 @@ namespace MPDCtrl.ViewModels
5453
/// レイアウト大改造？ ３ペイン（上キューと下に２ペイン) + (Treeviewでプレイリストとディレクトリ纏める？？）
5554

5655
/// 更新履歴：
56+
/// v2.0.4 store公開。
57+
/// v2.0.3.4 ルートディレクトリにファイルがある時のテスト。
5758
/// v2.0.3.3 Search and filter is done.
5859
/// v2.0.3.2 Clearコマンドを送る前にQueueをクリアしておくようにして高速化。プレイリストとFilesはダブルクリック無効にした（なんか混乱するから）。 KeyboardNavigation.TabNavigation="Cycle"の設定。
5960
/// v2.0.3.1 検索とブラウズ途中。
@@ -102,7 +103,7 @@ public class MainViewModel : ViewModelBase
102103
const string _appName = "MPDCtrl";
103104

104105
// Application version
105-
const string _appVer = "v2.0.3.3";
106+
const string _appVer = "v2.0.4";
106107

107108
public string AppVer
108109
{
@@ -1674,6 +1675,9 @@ public NodeDirectory SelectedNode
16741675
_selectedNode = value;
16751676
NotifyPropertyChanged(nameof(SelectedNode));
16761677

1678+
// TODO: 絞り込みモードか、マッチしたフォルダ内だけかの切り替え
1679+
bool filteringMode = true;
1680+
16771681
// Treeview で選択ノードが変更されたのでListview でフィルターを掛ける。
16781682
var collectionView = CollectionViewSource.GetDefaultView(MusicEntries);
16791683
collectionView.Filter = x =>
@@ -1682,13 +1686,38 @@ public NodeDirectory SelectedNode
16821686

16831687
string path = entry.FileUri.LocalPath; //person.FileUri.AbsoluteUri;
16841688
string filename = System.IO.Path.GetFileName(path);//System.IO.Path.GetFileName(uri.LocalPath);
1685-
path = path.Replace(("/"+ filename), "");
16861689

1687-
// マッチしたフォルダ内だけ
1688-
//return (path == _selectedNode.DireUri.LocalPath );
1690+
if (_selectedNode.DireUri.LocalPath == "/")
1691+
{
1692+
if (filteringMode)
1693+
{
1694+
// 絞り込みモード
1695+
return true;
1696+
}
1697+
else
1698+
{
1699+
// マッチしたフォルダ内だけ
1700+
path = path.Replace("/", "");
1701+
return (path == filename);
1702+
}
1703+
}
1704+
else
1705+
{
1706+
path = path.Replace(("/" + filename), "");
1707+
1708+
if (filteringMode)
1709+
{
1710+
// 絞り込みモード
1711+
return (path.StartsWith(_selectedNode.DireUri.LocalPath));
1712+
}
1713+
else
1714+
{
1715+
// マッチしたフォルダ内だけ
1716+
return (path == _selectedNode.DireUri.LocalPath);
1717+
}
1718+
}
1719+
16891720

1690-
// 絞り込みモード
1691-
return (path.StartsWith(_selectedNode.DireUri.LocalPath));
16921721
};
16931722

16941723
collectionView.Refresh();

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MPDCtrl is a Windows desktop client app for [MPD (Music player daemon)](http://w
55

66
### MPDCtrl version 2.x
77

8-
![MPDCtrl](https://github.com/torum/MPDCtrl/blob/master/images/screenshots/v2/Main_En.png?raw=true)
8+
![MPDCtrl](https://github.com/torum/MPDCtrl/blob/master/images/screenshots/v2/Main.png?raw=true)
99

1010
### MPDCtrl version 1.x
1111

‎docs/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ MPDCtrl is a Windows desktop client app for [MPD (Music player daemon)](http://w
2020

2121
### MPDCtrl version 2.x
2222

23-
![MPDCtrl](https://github.com/torum/MPDCtrl/blob/master/images/screenshots/v2/Main_En.png?raw=true)
23+
![MPDCtrl](https://github.com/torum/MPDCtrl/blob/master/images/screenshots/v2/Main.png?raw=true)
2424

2525
### MPDCtrl version 1.x
2626

‎images/screenshots/v2/1_Main.png‎

118 KB
Loading

‎images/screenshots/v2/2_Search.png‎

58.5 KB
Loading

‎images/screenshots/v2/3_Directory.png‎

69.7 KB
Loading

‎images/screenshots/v2/Main.png‎

112 KB
Loading

0 commit comments

Comments
 (0)