Merge branch 'feature/#184_search_mylist' into develop

NicoPlayerHohoema/Models/FavFeedManager.cs

@@ -439,15 +439,15 @@ private async Task<List<FavFeedItem>> GetUserFeedItems(FavFeedList userFavFeedLi
 
 		private async Task<List<FavFeedItem>> GetTagFeedItems(FavFeedList tagFavFeedList)
 		{
-			var tagVideos = await _HohoemaApp.ContentFinder.GetTagSearch(tagFavFeedList.Id, 1, SortMethod.FirstRetrieve);
+			var tagVideos = await _HohoemaApp.ContentFinder.GetTagSearch(tagFavFeedList.Id, 0, 50);
 
-			return tagVideos.list.Select(x => 
+			return tagVideos.VideoInfoItems.Select(x => 
 			{
 				return new FavFeedItem()
 				{
-					VideoId = x.id,
-					Title = x.title,
-					SubmitDate = x.FirstRetrieve,
+					VideoId = x.Video.Id,
+					Title = x.Video.Title,
+					SubmitDate = x.Video.FirstRetrieve,
 					ParentList = tagFavFeedList,
 				};
 			})
@@ -464,8 +464,8 @@ private async Task<List<FavFeedItem>> GetMylistFeedItems(FavFeedList mylistFavFe
 				{
 					VideoId = x.Video.Id,
 					Title = x.Video.Title,
-					SubmitDate = DateTime.Parse(x.Video.First_retrieve),
-					IsDeleted = int.Parse(x.Video.Deleted) == 0 ? false : true,
+					SubmitDate = x.Video.FirstRetrieve,
+					IsDeleted = x.Video.IsDeleted,
 					ParentList = mylistFavFeedList,
 				};
 			})

NicoPlayerHohoema/Models/NiconicoContentFinder.cs

@@ -1,12 +1,12 @@
 using Mntone.Nico2;
 using Mntone.Nico2.Mylist;
 using Mntone.Nico2.Mylist.MylistGroup;
+using Mntone.Nico2.Searches.Video;
 using Mntone.Nico2.Users.Fav;
 using Mntone.Nico2.Users.User;
 using Mntone.Nico2.Users.Video;
 using Mntone.Nico2.Videos.Histories;
 using Mntone.Nico2.Videos.Ranking;
-using Mntone.Nico2.Videos.Search;
 using NicoPlayerHohoema.Util;
 using Prism.Mvvm;
 using System;
@@ -29,9 +29,11 @@ public NiconicoContentFinder(HohoemaApp app)
 		}
 
 
-		public async Task Initialize()
+		public Task Initialize()
 		{
 			// お気に入りデータの読み込み
+
+			return Task.CompletedTask;
 		}
 
 
@@ -61,22 +63,22 @@ public async Task<NiconicoRankingRss> GetCategoryRanking(RankingCategory categor
 		}
 
 
-		public async Task<SearchResponse> GetKeywordSearch(string keyword, uint pageCount, SortMethod sortMethod, SortDirection sortDir = SortDirection.Descending)
+		public async Task<VideoSearchResponse> GetKeywordSearch(string keyword, uint from, uint limit, Sort sort = Sort.FirstRetrieve, Order order = Order.Descending)
 		{
 			return await ConnectionRetryUtil.TaskWithRetry(async () =>
 			{
-				return await _HohoemaApp.NiconicoContext.Video.GetKeywordSearchAsync(keyword, pageCount, sortMethod, sortDir);
+				return await _HohoemaApp.NiconicoContext.Search.KeywordSearchAsync(keyword, from, limit, sort, order);
 			});
 		}
 
-		public async Task<SearchResponse> GetTagSearch(string keyword, uint pageCount, SortMethod sortMethod, SortDirection sortDir = SortDirection.Descending)
+		public async Task<VideoSearchResponse> GetTagSearch(string tag, uint from, uint limit, Sort sort = Sort.FirstRetrieve, Order order = Order.Descending)
 		{
 			return await ConnectionRetryUtil.TaskWithRetry(async () =>
 			{
-				return await _HohoemaApp.NiconicoContext.Video.GetKeywordSearchAsync(keyword, pageCount, sortMethod, sortDir)
+				return await _HohoemaApp.NiconicoContext.Search.TagSearchAsync(tag, from, limit, sort, order)
 					.ContinueWith(prevTask =>
 					{
-						if (!prevTask.Result.IsStatusOK)
+						if (!prevTask.Result.IsOK)
 						{
 							throw new WebException();
 						}
@@ -131,7 +133,7 @@ public Task<List<MylistGroupData>> GetUserMylistGroups(string userId)
 		private List<MylistGroupData> _CachedUserMylistGroupDatum = null;
 
 
-		public async Task<MylistGroupDetail> GetMylist(string mylistGroupid)
+		public async Task<MylistGroupResponse> GetMylist(string mylistGroupid)
 		{
 			return await ConnectionRetryUtil.TaskWithRetry(async () =>
 			{
@@ -177,14 +179,14 @@ public async Task<List<FavData>> GetFavMylists()
 
 
 
-		public async Task<UserVideoResponse> GetUserVideos(uint userId, uint page, SortMethod sortMethod = SortMethod.FirstRetrieve, SortDirection sortDir = SortDirection.Descending)
+		public async Task<UserVideoResponse> GetUserVideos(uint userId, uint page, Sort sort = Sort.FirstRetrieve, Order order = Order.Descending)
 		{
-			return await _HohoemaApp.NiconicoContext.User.GetUserVideos(userId, page, sortMethod, sortDir);
+			return await _HohoemaApp.NiconicoContext.User.GetUserVideos(userId, page, sort, order);
 		}
 
-		public async Task<NicoVideoResponse> GetRelatedVideos(string videoId, uint from, uint limit, SortMethod sortMethod = SortMethod.FirstRetrieve, SortDirection sortDir = SortDirection.Descending)
+		public async Task<NicoVideoResponse> GetRelatedVideos(string videoId, uint from, uint limit, Sort sort = Sort.FirstRetrieve, Order order = Order.Descending)
 		{
-			return await _HohoemaApp.NiconicoContext.Video.GetRelatedVideoAsync(videoId, from, limit, sortMethod, sortDir);
+			return await _HohoemaApp.NiconicoContext.Video.GetRelatedVideoAsync(videoId, from, limit, sort, order);
 		}
 
 

NicoPlayerHohoema/Models/SearchOption.cs

@@ -10,8 +10,8 @@ public class SearchOption : IEquatable<SearchOption>
 	{
 		public string Keyword { get; set; }
 		public SearchTarget SearchTarget { get; set; }
-		public Mntone.Nico2.SortMethod SortMethod { get; set; }
-		public Mntone.Nico2.SortDirection SortDirection { get; set; }
+		public Mntone.Nico2.Order Order { get; set; }
+		public Mntone.Nico2.Sort Sort { get; set; }
 
 
 		public string ToParameterString()
@@ -42,8 +42,8 @@ public bool Equals(SearchOption other)
 
 			return this.Keyword == other.Keyword
 				&& this.SearchTarget == other.SearchTarget
-				&& this.SortDirection == other.SortDirection
-				&& this.SortMethod == other.SortMethod;
+				&& this.Order == other.Order
+				&& this.Sort == other.Sort;
 		}
 	}
 }

NicoPlayerHohoema/NicoPlayerHohoema.csproj

@@ -174,6 +174,8 @@
     <Compile Include="ViewModels\FavoriteManagePageViewModel.cs" />
     <Compile Include="ViewModels\FavoriteVideoInfoControlViewModel.cs" />
     <Compile Include="ViewModels\HistoryPageViewModel.cs" />
+    <Compile Include="ViewModels\HohoemaListingPageItemBase.cs" />
+    <Compile Include="ViewModels\HohoemaListingPageViewModelBase.cs" />
     <Compile Include="ViewModels\HohoemaVideoListingPageViewModelBase.cs" />
     <Compile Include="ViewModels\HohoemaViewModelBase.cs" />
     <Compile Include="ViewModels\LoginPageViewModel.cs" />
@@ -182,7 +184,8 @@
     <Compile Include="ViewModels\PortalContent\HistoryPortalPageContentViewModel.cs" />
     <Compile Include="ViewModels\SearchContent\EmptySearchPageContentViewModel.cs" />
     <Compile Include="ViewModels\SearchContent\KeywordSearchPageContentViewModel.cs" />
-    <Compile Include="ViewModels\SearchContent\searchSortOptionListItem.cs" />
+    <Compile Include="ViewModels\SearchContent\MylistSearchPageContentViewModel.cs" />
+    <Compile Include="ViewModels\SearchContent\SearchSortOptionListItem.cs" />
     <Compile Include="ViewModels\SearchContent\TagSearchPageContentViewModel.cs" />
     <Compile Include="ViewModels\SettingsContent\CacheSettingsPageContentViewModel.cs" />
     <Compile Include="ViewModels\SettingsContent\CommentSettingsPageContentViewModel.cs" />
@@ -232,6 +235,9 @@
     <Compile Include="Views\Controls\HohoemaIncrementalLoadingList.xaml.cs">
       <DependentUpon>HohoemaIncrementalLoadingList.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Controls\MylistSearchListItem.xaml.cs">
+      <DependentUpon>MylistSearchListItem.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Controls\RankingCategoryListItem.xaml.cs">
       <DependentUpon>RankingCategoryListItem.xaml</DependentUpon>
     </Compile>
@@ -262,6 +268,9 @@
     <Compile Include="Views\SearchContent\KeywordSearchPageContent.xaml.cs">
       <DependentUpon>KeywordSearchPageContent.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\SearchContent\MylistSearchPageContent.xaml.cs">
+      <DependentUpon>MylistSearchPageContent.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\SearchContent\TagSearchPageContent.xaml.cs">
       <DependentUpon>TagSearchPageContent.xaml</DependentUpon>
     </Compile>
@@ -506,6 +515,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Controls\MylistSearchListItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Controls\RankingCategoryListItem.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -554,6 +567,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\SearchContent\MylistSearchPageContent.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\SearchContent\TagSearchPageContent.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

NicoPlayerHohoema/Util/SortMethodHelper.cs

@@ -7,26 +7,26 @@
 
 namespace NicoPlayerHohoema.Util
 {
-	public static class SortMethodHelper
+	public static class SortHelper
 	{
-		public static string ToCulturizedText(SortMethod method, SortDirection dir)
+		public static string ToCulturizedText(Sort sort, Order order)
 		{
-			var isAscending = dir == SortDirection.Ascending;
-			switch (method)
+			var isAscending = order == Order.Ascending;
+			switch (sort)
 			{
-				case SortMethod.NewComment:
+				case Sort.NewComment:
 					return isAscending ? "コメントが古い順" : "コメントが新しい順";
-				case SortMethod.ViewCount:
+				case Sort.ViewCount:
 					return isAscending ? "再生数が少ない順" : "再生数が多い順";
-				case SortMethod.MylistCount:
+				case Sort.MylistCount:
 					return isAscending ? "マイリスト数が少ない順" : "マイリスト数が多い順";
-				case SortMethod.CommentCount:
+				case Sort.CommentCount:
 					return isAscending ? "コメント数が少ない順" : "コメント数が多い順";
-				case SortMethod.FirstRetrieve:
+				case Sort.FirstRetrieve:
 					return isAscending ? "投稿日時が古い順" : "投稿日時が新しい順";
-				case SortMethod.Length:
+				case Sort.Length:
 					return isAscending ? "動画時間が短い順" : "動画時間が長い順";
-				case SortMethod.Popurarity:
+				case Sort.Popurarity:
 					return "人気が高い順";
 				default:
 					throw new NotSupportedException();

NicoPlayerHohoema/ViewModels/FavoriteAllFeedPageViewModel.cs

@@ -30,14 +30,14 @@ public FavoriteAllFeedPageViewModel(HohoemaApp hohoemaApp, PageManager pageManag
 			});
 
 
-			SelectedItemsMarkAsReadCommand = SelectedVideoInfoItems.ToCollectionChanged()
-				.Select(x => SelectedVideoInfoItems.Count > 0)
+			SelectedItemsMarkAsReadCommand = SelectedItems.ToCollectionChanged()
+				.Select(x => SelectedItems.Count > 0)
 				.ToReactiveCommand()
 				.AddTo(_CompositeDisposable);
 
 			SelectedItemsMarkAsReadCommand.Subscribe(async _ =>
 			{
-				foreach (var item in SelectedVideoInfoItems)
+				foreach (var item in SelectedItems)
 				{
 					await HohoemaApp.FavFeedManager.MarkAsRead(item.VideoId);
 					await HohoemaApp.FavFeedManager.MarkAsRead(item.RawVideoId);

NicoPlayerHohoema/ViewModels/FavoriteManagePageViewModel.cs

@@ -97,8 +97,8 @@ public DelegateCommand SelectedCommand
 								{
 									Keyword = this.SourceId,
 									SearchTarget = SearchTarget.Tag,
-									SortMethod = Mntone.Nico2.SortMethod.FirstRetrieve,
-									SortDirection = Mntone.Nico2.SortDirection.Descending,
+									Sort = Mntone.Nico2.Sort.FirstRetrieve,
+									Order = Mntone.Nico2.Order.Descending,
 								}.ToParameterString();
 
 								_PageManager.OpenPage(HohoemaPageType.Search, param);

NicoPlayerHohoema/ViewModels/FavoriteVideoInfoControlViewModel.cs

@@ -40,8 +40,8 @@ public DelegateCommand OpenFeedSourceCommand
 								{
 									Keyword = feedList.Id,
 									SearchTarget = SearchTarget.Tag,
-									SortDirection = Mntone.Nico2.SortDirection.Descending,
-									SortMethod = Mntone.Nico2.SortMethod.FirstRetrieve
+									Sort = Mntone.Nico2.Sort.FirstRetrieve,
+									Order = Mntone.Nico2.Order.Descending,
 								}.ToParameterString());
 								break;
 							case FavoriteItemType.Mylist:

NicoPlayerHohoema/ViewModels/HistoryPageViewModel.cs

@@ -25,20 +25,20 @@ public class HistoryPageViewModel : HohoemaVideoListingPageViewModelBase<History
 		public HistoryPageViewModel(HohoemaApp hohoemaApp, PageManager pageManager, Views.Service.MylistRegistrationDialogService mylistDialogService)
 			: base(hohoemaApp, pageManager, mylistDialogService)
 		{
-			RemoveHistoryCommand = SelectedVideoInfoItems.ObserveProperty(x => x.Count)
+			RemoveHistoryCommand = SelectedItems.ObserveProperty(x => x.Count)
 				.Select(x => x > 0)
 				.ToReactiveCommand()
 				.AddTo(_CompositeDisposable);
 
 			RemoveHistoryCommand.Subscribe(async _ => 
 			{
-				var selectedItems = SelectedVideoInfoItems.ToArray();
+				var selectedItems = SelectedItems.ToArray();
 
 				foreach (var item in selectedItems)
 				{
 					await RemoveHistory(item.RawVideoId);
 
-					SelectedVideoInfoItems.Remove(item);
+					SelectedItems.Remove(item);
 
 					await Task.Delay(250);
 				}

NicoPlayerHohoema/ViewModels/HohoemaListingPageItemBase.cs

@@ -0,0 +1,17 @@
+using Prism.Mvvm;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace NicoPlayerHohoema.ViewModels
+{
+	abstract public class HohoemaListingPageItemBase : BindableBase, IDisposable
+	{
+		public abstract ICommand SelectedCommand { get; }
+
+		public abstract void Dispose();
+	}
+}