Fixes ShokoAnime#93 - Show more detailed file size information by gro…

…up and including bitrate
purposelycryptic · Nov 11, 2014 · d552f7f · d552f7f
1 parent 91de5dc
commit d552f7f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/JMMContracts/Contract_GroupFileSummary.cs b/JMMContracts/Contract_GroupFileSummary.cs
@@ -14,6 +14,9 @@ public class Contract_GroupFileSummary
 		public int FileCountSpecials { get; set; }
 		public bool SpecialsComplete { get; set; }
 
+        public double TotalFileSize { get; set; }
+        public long TotalRunningTime { get; set; }
+
 		public List<int> NormalEpisodeNumbers { get; set; }
 		public string NormalEpisodeNumberSummary { get; set; }
 

diff --git a/JMMContracts/Contract_GroupVideoQuality.cs b/JMMContracts/Contract_GroupVideoQuality.cs
@@ -19,6 +19,7 @@ public class Contract_GroupVideoQuality : IComparable<Contract_GroupVideoQuality
 		public bool SpecialsComplete { get; set; }
 
         public double TotalFileSize { get; set; }
+        public long TotalRunningTime { get; set; }
 
 		public List<int> NormalEpisodeNumbers { get; set; }
 		public string NormalEpisodeNumberSummary { get; set; }

diff --git a/JMMServer/JMMServiceImplementation.cs b/JMMServer/JMMServiceImplementation.cs
@@ -4559,8 +4559,8 @@ public List<Contract_GroupVideoQuality> GetGroupVideoQualitySummary(int animeID)
 
 										if (animeEp.EpisodeTypeEnum == enEpisodeType.Episode) contract.FileCountNormal++;
 										if (animeEp.EpisodeTypeEnum == enEpisodeType.Special) contract.FileCountSpecials++;
-
                                         contract.TotalFileSize += vid.FileSize;
+                                        contract.TotalRunningTime += aniFile.File_LengthSeconds;
 
 										if (animeEp.EpisodeTypeEnum == enEpisodeType.Episode)
 										{
@@ -4575,9 +4575,13 @@ public List<Contract_GroupVideoQuality> GetGroupVideoQualitySummary(int animeID)
 									contract.FileCountNormal = 0;
 									contract.FileCountSpecials = 0;
                                     contract.TotalFileSize = 0;
+                                    contract.TotalRunningTime = 0;
+
 									if (animeEp.EpisodeTypeEnum == enEpisodeType.Episode) contract.FileCountNormal++;
 									if (animeEp.EpisodeTypeEnum == enEpisodeType.Special) contract.FileCountSpecials++;
                                     contract.TotalFileSize += vid.FileSize;
+                                    contract.TotalRunningTime += aniFile.File_LengthSeconds;
+
 									contract.GroupName = aniFile.Anime_GroupName;
 									contract.GroupNameShort = aniFile.Anime_GroupNameShort;
 									contract.VideoBitDepth = bitDepth;
@@ -4623,8 +4627,8 @@ public List<Contract_GroupVideoQuality> GetGroupVideoQualitySummary(int animeID)
 											foundSummaryRecord = true;
 											if (animeEp.EpisodeTypeEnum == enEpisodeType.Episode) contract.FileCountNormal++;
 											if (animeEp.EpisodeTypeEnum == enEpisodeType.Special) contract.FileCountSpecials++;
-
                                             contract.TotalFileSize += vinfo.FileSize;
+                                            contract.TotalRunningTime += vinfo.Duration;
 
 											if (animeEp.EpisodeTypeEnum == enEpisodeType.Episode)
 											{
@@ -4639,9 +4643,13 @@ public List<Contract_GroupVideoQuality> GetGroupVideoQualitySummary(int animeID)
 										contract.FileCountNormal = 0;
 										contract.FileCountSpecials = 0;
                                         contract.TotalFileSize = 0;
+                                        contract.TotalRunningTime = 0;
+
 										if (animeEp.EpisodeTypeEnum == enEpisodeType.Episode) contract.FileCountNormal++;
 										if (animeEp.EpisodeTypeEnum == enEpisodeType.Special) contract.FileCountSpecials++;
                                         contract.TotalFileSize += vinfo.FileSize;
+                                        contract.TotalRunningTime += vinfo.Duration;
+
 										contract.GroupName = Constants.NO_GROUP_INFO;
 										contract.GroupNameShort = Constants.NO_GROUP_INFO;
 										contract.Resolution = vidResInfo;
@@ -4788,6 +4796,8 @@ public List<Contract_GroupFileSummary> GetGroupFileSummary(int animeID)
 
 										if (animeEp.EpisodeTypeEnum == enEpisodeType.Episode) contract.FileCountNormal++;
 										if (animeEp.EpisodeTypeEnum == enEpisodeType.Special) contract.FileCountSpecials++;
+                                        contract.TotalFileSize += aniFile.FileSize;
+                                        contract.TotalRunningTime += aniFile.File_LengthSeconds;
 
 										if (animeEp.EpisodeTypeEnum == enEpisodeType.Episode)
 										{
@@ -4801,8 +4811,14 @@ public List<Contract_GroupFileSummary> GetGroupFileSummary(int animeID)
 									Contract_GroupFileSummary contract = new Contract_GroupFileSummary();
 									contract.FileCountNormal = 0;
 									contract.FileCountSpecials = 0;
+                                    contract.TotalFileSize = 0;
+                                    contract.TotalRunningTime = 0;
+
 									if (animeEp.EpisodeTypeEnum == enEpisodeType.Episode) contract.FileCountNormal++;
 									if (animeEp.EpisodeTypeEnum == enEpisodeType.Special) contract.FileCountSpecials++;
+                                    contract.TotalFileSize += aniFile.FileSize;
+                                    contract.TotalRunningTime += aniFile.File_LengthSeconds;
+
 									contract.GroupName = aniFile.Anime_GroupName;
 									contract.GroupNameShort = aniFile.Anime_GroupNameShort;
 									contract.NormalEpisodeNumbers = new List<int>();
@@ -4829,6 +4845,8 @@ public List<Contract_GroupFileSummary> GetGroupFileSummary(int animeID)
 											foundSummaryRecord = true;
 											if (animeEp.EpisodeTypeEnum == enEpisodeType.Episode) contract.FileCountNormal++;
 											if (animeEp.EpisodeTypeEnum == enEpisodeType.Special) contract.FileCountSpecials++;
+                                            contract.TotalFileSize += vinfo.FileSize;
+                                            contract.TotalRunningTime += vinfo.Duration;
 
 											if (animeEp.EpisodeTypeEnum == enEpisodeType.Episode)
 											{
@@ -4842,8 +4860,14 @@ public List<Contract_GroupFileSummary> GetGroupFileSummary(int animeID)
 										Contract_GroupFileSummary contract = new Contract_GroupFileSummary();
 										contract.FileCountNormal = 0;
 										contract.FileCountSpecials = 0;
+                                        contract.TotalFileSize = 0;
+                                        contract.TotalRunningTime = 0;
+
 										if (animeEp.EpisodeTypeEnum == enEpisodeType.Episode) contract.FileCountNormal++;
 										if (animeEp.EpisodeTypeEnum == enEpisodeType.Special) contract.FileCountSpecials++;
+                                        contract.TotalFileSize += vinfo.FileSize;
+                                        contract.TotalRunningTime += vinfo.Duration;
+
 										contract.GroupName = "NO GROUP INFO";
 										contract.GroupNameShort = "NO GROUP INFO";
 										contract.NormalEpisodeNumbers = new List<int>();

diff --git a/JMMServer/Properties/AssemblyInfo.cs b/JMMServer/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.4.2.2")]
-[assembly: AssemblyFileVersion("3.4.2.2")]
+[assembly: AssemblyVersion("3.4.2.3")]
+[assembly: AssemblyFileVersion("3.4.2.3")]