Commit: a5753d88fd6d0f140f3c0901927fe7993ea8ef6f - mAgicAnimeMod (git)

mAgicAnime 俺用改造版

Commit MetaInfo

• Révision: a5753d88fd6d0f140f3c0901927fe7993ea8ef6f (tree)
• l'heure: 2019-11-24 17:07:25
• Auteur: yoshy <yoshy@user...>
• Commiter: yoshy

Message de Log

[FIX] 曜日と時刻の平均でソートする際に現在日時以降の放送開始日時のみを有効とするよう修正
複数クールの再放送の場合、現四半期分までしか登録されていないため未登録分は1つ前の本/再放送の日時となりソート結果が不正となるため。

Change Summary

• modified: RecordingManager/AnimeProgram.cs
• modified: RecordingManager/AnimeServer.cs
• modified: RecordingManager/AnimeSort.cs
• add: RecordingManager/AnimeSortMod.cs
• modified: UserInterface/SortDialog.cs
• modified: magicAnime.csproj

Modification

--- a/RecordingManager/AnimeProgram.cs
+++ b/RecordingManager/AnimeProgram.cs
@@ -65,8 +65,11 @@ namespace magicAnime
 		public int							priority				= 30;	// 優先度(最低10〜最高50)
 		public bool							enableFilterKeyword		= false;	// 録画ファイルを指定文字列でフィルタ
 		public string						filterKeyword			= "";		// フィルタ文字列
+        // add yossiepon 20191124 begin
+        public DateTime                     mSortRepresentative;            // ソートに使用する代表時刻
+        // add yossiepon 20191124 end
 
-		private	int							mStoryCount;
+        private int							mStoryCount;
         // add yossiepon 20160806 begin
         private int                         mSpecialStoryCount;
         // add yossiepon 20160806 end
@@ -82,8 +85,8 @@ namespace magicAnime
 		private EpisodeList					mSpecialEpisodes;				// この番組の符番されていない各話(Episode)の集合
         // add yossiepon 20160806 end
 		private	Mutex						mEpisodeLock		= new Mutex();
-		private DateTime					mLastUpdate;					// データｰベースからの最終更新時刻
-		private Image						mThambnailImage		= null;
+		private DateTime					mLastUpdate;                    // データｰベースからの最終更新時刻
+        private Image						mThambnailImage		= null;
 		private Mutex						mThambnailLock		= new Mutex();
 
 

--- a/RecordingManager/AnimeServer.cs
+++ b/RecordingManager/AnimeServer.cs
@@ -588,19 +588,26 @@ namespace magicAnime
 		internal void SortAnime(AnimeSort sort)
 		{
 			lock( mAnimeList )
-				mAnimeList.Sort( sort );
-			
-		}
-
-		//=========================================================================
-		///	<summary>
-		///		録画データをオンラインで更新する
-		///	</summary>
-		/// <remarks>
-		/// </remarks>
-		/// <history>2006/XX/XX 新規作成</history>
-		//=========================================================================
-		public void UpdateOnline(
+            // mod yossiepon 20191124 begin
+            //    mAnimeList.Sort( sort );
+            {
+                DateTime baseTime = DateTime.Now;
+                mAnimeList.ForEach(x => sort.PreScan(x, baseTime));
+                mAnimeList.Sort(sort);
+            }
+            // mod yossiepon 20191124 end
+
+        }
+
+        //=========================================================================
+        ///	<summary>
+        ///		録画データをオンラインで更新する
+        ///	</summary>
+        /// <remarks>
+        /// </remarks>
+        /// <history>2006/XX/XX 新規作成</history>
+        //=========================================================================
+        public void UpdateOnline(
 			List<AnimeProgram>	animes	,		// [i] 更新対象の番組
 			bool				force	,		// [i] 強制更新
 			ProgressUpdateDelegate callBack )	// [i] プログレス通知

--- a/RecordingManager/AnimeSort.cs
+++ b/RecordingManager/AnimeSort.cs
@@ -13,21 +13,24 @@ using magicAnime.Properties;
 
 namespace magicAnime
 {
-	//=========================================================================
-	///	<summary>
-	///		AnimeProgramリストのソートコンペアラクラス
-	///	</summary>
-	/// <remarks>
-	/// </remarks>
-	/// <history>2006/XX/XX 新規作成</history>
-	//=========================================================================
-	class AnimeSort : System.Collections.Generic.IComparer<AnimeProgram>
-	{
-		//--------------------
-		// コンペア条件
-		//--------------------
-
-		public enum Order
+    //=========================================================================
+    ///	<summary>
+    ///		AnimeProgramリストのソートコンペアラクラス
+    ///	</summary>
+    /// <remarks>
+    /// </remarks>
+    /// <history>2006/XX/XX 新規作成</history>
+    //=========================================================================
+    // mod yossiepon 20191124 begin
+    //class AnimeSort : System.Collections.Generic.IComparer<AnimeProgram>
+    abstract class AnimeSort : System.Collections.Generic.IComparer<AnimeProgram>
+    // mod yossiepon 20191124 end
+    {
+        //--------------------
+        // コンペア条件
+        //--------------------
+
+        public enum Order
 		{
 			DayOfWeek,		// 曜日ごと
 			NextOnair,		// 次回放送日時順
@@ -41,36 +44,47 @@ namespace magicAnime
 			Limit1CoursOption = 2,// ソート基準を最新1クールに限る
 		};
 
-		private Order order;
-		private OrderOption orderOption;
-		//		private bool last;
-
-		//=========================================================================
-		///	<summary>
-		///		コンストラクタ
-		///	</summary>
-		/// <remarks>
-		/// </remarks>
-		/// <history>2006/XX/XX 新規作成</history>
-		//=========================================================================
-		public AnimeSort( Order order, OrderOption option )
+        // mod yossiepon 20191124 begin
+        //private Order order;
+		//private OrderOption orderOption;
+        ////		private bool last;
+        protected Order order;
+        protected OrderOption orderOption;
+        // mod yossiepon 20191124 end
+
+        //=========================================================================
+        ///	<summary>
+        ///		コンストラクタ
+        ///	</summary>
+        /// <remarks>
+        /// </remarks>
+        /// <history>2006/XX/XX 新規作成</history>
+        //=========================================================================
+        public AnimeSort( Order order, OrderOption option )
 		{
 			this.order = order;
 			this.orderOption = option;
 			//			this.last			= last;
 		}
 
-		//=========================================================================
-		///	<summary>
-		///		AnimeProgramの放送時間コンペア
-		///	</summary>
-		/// <remarks>
-		/// </remarks>
-		/// <history>2006/XX/XX 新規作成</history>
-		//=========================================================================
-		public int Compare( AnimeProgram x, AnimeProgram y )
-		{
-			AnimeEpisode nextA, nextB;
+        // add yossiepon 20191124 begin
+        public abstract void PreScan(AnimeProgram p, DateTime baseTime);
+        // add yossiepon 20191124 end
+
+        //=========================================================================
+        ///	<summary>
+        ///		AnimeProgramの放送時間コンペア
+        ///	</summary>
+        /// <remarks>
+        /// </remarks>
+        /// <history>2006/XX/XX 新規作成</history>
+        //=========================================================================
+        // mod yossiepon 20191124 begin
+        public abstract int Compare(AnimeProgram x, AnimeProgram y);
+#if false
+        public int Compare(AnimeProgram x, AnimeProgram y)
+        {
+            AnimeEpisode nextA, nextB;
 			AnimeProgram.NextEpisode resultA, resultB;
 
 			//--------------------------
@@ -228,264 +242,9 @@ namespace magicAnime
 					return +1;
 			}
 
-			return 0;
+            return 0;
 		}
-
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#endif
+// mod yossiepon 20191124 end
+    }
 }

--- /dev/null
+++ b/RecordingManager/AnimeSortMod.cs
@@ -0,0 +1,192 @@
+//=========================================================================
+///	<summary>
+///		AnimeProgramリストのソートコンペアクラス
+///	</summary>
+/// <remarks>
+/// </remarks>
+/// <history>2019/11/24 新規作成</history>
+//=========================================================================
+using System;
+using System.Collections.Generic;
+using magicAnime.Properties;
+
+namespace magicAnime
+{
+    //=========================================================================
+    ///	<summary>
+    ///		AnimeProgramリストのソートコンペアラクラス
+    ///	</summary>
+    /// <remarks>
+    /// </remarks>
+    /// <history>2019/11/24 新規作成</history>
+    //=========================================================================
+    class AnimeSortMod : AnimeSort
+    {
+        private const int SECONDS_OF_DAY = 86400;
+        private const int SECONDS_OF_HOUR = 3600;
+        private const int HOURS_OF_DAY = 24;
+        private const int DAYS_OF_WEEK = 7;
+
+        private const long TICKS_OF_SECOND = 10000000;
+
+        //=========================================================================
+        ///	<summary>
+        ///		コンストラクタ
+        ///	</summary>
+        /// <remarks>
+        /// </remarks>
+        /// <history>2019/11/24 新規作成</history>
+        //=========================================================================
+        public AnimeSortMod(Order order, OrderOption option) : base(order, option)
+        {
+        }
+
+        //=========================================================================
+        ///	<summary>
+        ///		AnimeProgramを前処理スキャンしてソート代表値を決定する
+        ///	</summary>
+        ///	<param name="p">番組</param>
+        ///	<param name="baseTime">ソート基準日時</param>
+        /// <remarks>
+        /// </remarks>
+        /// <history>2019/11/24 新規作成</history>
+        //=========================================================================
+        public override void PreScan(AnimeProgram p, DateTime baseTime)
+        {
+            p.mSortRepresentative = DateTime.MaxValue;
+
+            // 話数が0の場合は前に回す
+            if ( (p.StoryCount == 0) && (p.SpecialStoryCount == 0) )
+            {
+                p.mSortRepresentative = DateTime.MinValue;
+                return;
+            }
+
+            switch (order)
+            {
+                // 曜日と時刻の平均を基準にソート
+                case Order.DayOfWeek:
+                    PreScanDayOfWeek(p, baseTime);
+                    break;
+                // 次回の放送日時でソート
+                default:
+                case Order.NextOnair:
+                    PreScanNextOnAir(p, baseTime);
+                    break;
+            }
+        }
+
+        private void PreScanDayOfWeek(AnimeProgram p, DateTime baseTime)
+        {
+            //--------------------------
+            // ソート基準日時以降の放送回を取得
+            //（放送開始日時が基準日時以降であれば含める）
+            //--------------------------
+            List<AnimeEpisode> normals = p.NormalEpisodes.FindAll(e => e.HasPlan && e.StartDateTime >= baseTime);
+            List<AnimeEpisode> specials = p.SpecialEpisodes.FindAll(e => e.HasPlan && e.StartDateTime >= baseTime);
+
+            // 通常回が存在すれば
+            if (normals.Count > 0)
+            {
+                // 最新13話のみで判断する場合
+                if ((orderOption & OrderOption.Limit1CoursOption) != 0)
+                {
+                    // 通常回が14話以上あれば先頭の余分な放送回を削除
+                    if (normals.Count > 13)
+                    {
+                        normals.Sort(comp);
+                        normals.RemoveRange(0, normals.Count - 13);
+                    }
+                }
+
+                // 通常回のみで曜日と時刻の平均をとる
+                long ticks = 0;
+                normals.ForEach(e => ticks += ModuloDateTimeOfWeek(e));
+                p.mSortRepresentative = new DateTime(ticks / normals.Count * TICKS_OF_SECOND);
+            }
+            // 特番回のみ存在すれば
+            else if (specials.Count > 0)
+            {
+                // 基準日時以降で最も早く放送される特番回の放送開始日時を代表値とする
+                // 特番回のみの複数話で構成される場合、平均からずれる可能性がある。
+                specials.Sort(comp);
+                p.mSortRepresentative = specials[0].StartDateTime;
+            }
+            // 放送終了分を末尾に回す
+            else
+            {
+                AnimeEpisode last = LastEpicode(p);
+
+                // 放送終了分を末尾に回す
+                if ((orderOption & OrderOption.LastOrder) != 0)
+                {
+                    // 放送終了分を一番最後に放送された順番で末尾に並べる
+                    p.mSortRepresentative = last.StartDateTime;
+                    return;
+                }
+                // 一番最後に放送された曜日と時刻で並べる
+                else
+                {
+                    p.mSortRepresentative = new DateTime(ModuloDateTimeOfWeek(last) * TICKS_OF_SECOND);
+                }
+            }
+        }
+
+        private void PreScanNextOnAir(AnimeProgram p, DateTime baseTime)
+        {
+            // 次の放送回を検索する
+            AnimeEpisode ep;
+            AnimeProgram.NextEpisode epType = p.GetNextEpisode(baseTime, out ep);
+
+            // 次の放送回が存在しなければ
+            if (epType != AnimeProgram.NextEpisode.NextDecided)
+            {
+                // 一番最後に放送された放送回を選択する
+                ep = LastEpicode(p);
+
+                // 放送終了分を末尾に回す
+                if ((orderOption & OrderOption.LastOrder) != 0)
+                {
+                    // 放送終了分を一番最後に放送された順番で末尾に並べる
+                    // 放送開始日時に100年を足したものを代表値とする
+                    p.mSortRepresentative = ep.StartDateTime.AddYears(100);
+                    return;
+                }
+            }
+
+            // 取得した放送回の放送開始日時をソート代表値とする
+            p.mSortRepresentative = ep.StartDateTime;
+        }
+
+        private static long ModuloDateTimeOfWeek(AnimeEpisode e)
+        {
+            long shiftDayOfWeek = 1;
+            return (e.StartDateTime.Ticks / TICKS_OF_SECOND
+                    - (Settings.Default.hoursPerDay - HOURS_OF_DAY) * SECONDS_OF_HOUR + SECONDS_OF_DAY * shiftDayOfWeek)
+                            % (SECONDS_OF_DAY * DAYS_OF_WEEK);
+        }
+
+        private static AnimeEpisode LastEpicode(AnimeProgram p)
+        {
+            List<AnimeEpisode> episodes = p.Episodes;
+            episodes.Sort(comp);
+
+            return episodes[episodes.Count - 1];
+        }
+
+        private static Comparison<AnimeEpisode> comp = (x, y) => x.StartDateTime.CompareTo(y.StartDateTime);
+
+        //=========================================================================
+        ///	<summary>
+        ///		AnimeProgramの放送時間コンペア
+        ///	</summary>
+        /// <remarks>
+        /// </remarks>
+        /// <history>2019/11/24 新規作成</history>
+        //=========================================================================
+        public override int Compare(AnimeProgram x, AnimeProgram y)
+        {
+            return x.mSortRepresentative.CompareTo(y.mSortRepresentative);
+        }
+    }
+}

--- a/UserInterface/SortDialog.cs
+++ b/UserInterface/SortDialog.cs
@@ -65,10 +65,13 @@ namespace magicAnime.UserInterface
 					orderOption |= AnimeSort.OrderOption.Limit1CoursOption;
 				}
 
-				AnimeSort comparer = new AnimeSort( order, orderOption );
+                // mod yossiepon 20191124 begin
+                //AnimeSort comparer = new AnimeSort(order, orderOption);
+                AnimeSort comparer = new AnimeSortMod(order, orderOption);
+                // mod yossiepon 20191124 end
 
-// <MOD> 2010/01/06 ->
-				server.SortAnime( comparer );
+                // <MOD> 2010/01/06 ->
+                server.SortAnime( comparer );
 //				server.Animes.Sort( comparer );
 // <MOD> 2010/01/06 <-
 

--- a/magicAnime.csproj
+++ b/magicAnime.csproj
@@ -78,6 +78,7 @@
     <Compile Include="PathHelper.cs" />
     <Compile Include="DateTimeHelper.cs" />
     <Compile Include="MakeThumbnail.cs" />
+    <Compile Include="RecordingManager\AnimeSortMod.cs" />
     <Compile Include="UserInterface\StationTableDialog.cs">
       <SubType>Form</SubType>
     </Compile>