Added progression bar to episodes

Mpv.JsonIpc/Api.cs

@@ -36,5 +36,11 @@ public async Task<TimeSpan> GetCurrentPosition()
             var result = await _ipc.GetProperty<double>(Property.Position);
             return TimeSpan.FromSeconds(result.Data);
         }
+
+        public async Task<TimeSpan> GetDuration()
+        {
+            var result = await _ipc.GetProperty<double>(Property.Duration);
+            return TimeSpan.FromSeconds(result.Data);
+        }
     }
 }

Mpv.JsonIpc/IApi.cs

@@ -10,5 +10,6 @@ public interface IApi
         Task<float> GetVolume();
         Task PlayMedia(string path);
         Task<TimeSpan> GetCurrentPosition();
+        Task<TimeSpan> GetDuration();
     }
 }

Mpv.JsonIpc/Property.cs

@@ -4,6 +4,7 @@ public enum Property
     {
         Volume,
         Pause,
-        Position
+        Position,
+        Duration
     }
 }

Mpv.JsonIpc/PropertyEnumConverterExtension.cs

@@ -9,6 +9,7 @@ public static class PropertyEnumConverterExtension
             {Property.Volume, "volume"},
             {Property.Pause, "pause"},
             {Property.Position, "time-pos"},
+            {Property.Duration, "duration"},
         };
 
         public static string GetStringValue(this Property property)

SnackTime.Core/Database/DatabaseFactory.cs

@@ -4,7 +4,7 @@ namespace SnackTime.Core.Database
 {
     public class DatabaseFactory
     {
-        private const string ConnectionString = "MediaDb";
+        private const string ConnectionString = "../Media.db";
 
         public LiteDatabase GetDatabase()
         {

SnackTime.Core/DependencyModule.cs

@@ -35,6 +35,7 @@ protected override void Load(ContainerBuilder builder)
             builder.RegisterType<EpisodeProvider>().AsSelf();
 
             builder.RegisterType<ProcessManager>().AsSelf();
+            builder.RegisterType<EpisodeBuilder>().AsSelf();
         }
 
         public class SonarrConfig

SnackTime.Core/Media/Episodes/EpisodeBuilder.cs

@@ -1,11 +1,20 @@
 using System.Collections.Generic;
 using System.Linq;
+using SnackTime.Core.Session;
 using SnackTime.MediaServer.Models.ProtoGenerated;
+using SnackTime.MediaServer.Storage.ProtoGenerated;
 
 namespace SnackTime.Core.Media.Episodes
 {
     public class EpisodeBuilder
     {
+        private readonly SessionService _sessionService;
+
+        public EpisodeBuilder(SessionService sessionService)
+        {
+            _sessionService = sessionService;
+        }
+
         public List<Episode> Build(IEnumerable<SonarrSharp.Models.Episode> episodes)
         {
             return episodes.Select(Build)
@@ -22,6 +31,13 @@ public Episode Build(SonarrSharp.Models.Episode episode)
                 FileId = episode.EpisodeFileId,
             };
 
+            var allSessionsForCurrentEpisode = _sessionService.GetAll()
+                .Where(session => session.MediaId == mediaFileId.ToString())
+                .ToList();
+
+            var end = allSessionsForCurrentEpisode.Max(session => (long?) session.Duration.EndPostionInSec) ?? 0;
+            var lastWatchedSession = allSessionsForCurrentEpisode.OrderBy(session => session.EndUTC).FirstOrDefault();
+
             return new Episode
             {
                 Title = GrpcStringParser.Parse(episode.Title),
@@ -31,6 +47,12 @@ public Episode Build(SonarrSharp.Models.Episode episode)
                 EpisideNumber = episode.EpisodeNumber,
                 EpisodeFileId = episode.EpisodeFileId,
                 PlayableId = mediaFileId.ToString(),
+                Progress = new Progress
+                {
+                    LastWatchedUtc = lastWatchedSession?.EndUTC ?? 0,
+                    WatchedInSec = end,
+                    Lenght = lastWatchedSession?.MediaLenghtInSec ?? 0
+                },
             };
         }
     }

SnackTime.Core/Media/Episodes/EpisodeProvider.cs

@@ -10,10 +10,10 @@ public class EpisodeProvider
         private readonly SonarrClient   _client;
         private readonly EpisodeBuilder _seriesBuilder;
 
-        public EpisodeProvider(SonarrClient client)
+        public EpisodeProvider(SonarrClient client, EpisodeBuilder episodeBuilder)
         {
             _client = client;
-            _seriesBuilder = new EpisodeBuilder();
+            _seriesBuilder = episodeBuilder;
         }
 
         public async Task<List<Episode>> GetEpisodesForSeriesById(int seriesId)

SnackTime.Core/Session/SessionService.cs

@@ -18,23 +18,29 @@ public SessionService(DatabaseFactory databaseFactory, TimeService timeService)
             _timeService = timeService;
         }
 
-        public MediaServer.Storage.ProtoGenerated.Session CreateNewSession(MediaFileId mediaFileId, TimeSpan? startPosition = null)
+        public MediaServer.Storage.ProtoGenerated.Session CreateNewSession
+        (
+            MediaFileId mediaFileId,
+            TimeSpan mediaDuration,
+            TimeSpan? startPosition = null
+        )
         {
-            var duration = new Duration {EndPostionInSec = 0, StartPostionInSec = 0};
+            var timeWatched = new Duration {EndPostionInSec = 0, StartPostionInSec = 0};
             if (startPosition.HasValue)
             {
-                duration.StartPostionInSec = startPosition.Value.TotalSeconds;
-                duration.EndPostionInSec = startPosition.Value.TotalSeconds;
+                timeWatched.StartPostionInSec = startPosition.Value.TotalSeconds;
+                timeWatched.EndPostionInSec = startPosition.Value.TotalSeconds;
             }
 
             var sessionId = Guid.NewGuid().ToString("N");
             return new MediaServer.Storage.ProtoGenerated.Session
             {
                 Id = sessionId,
                 MediaId = mediaFileId.ToString(),
-                Duration = duration,
+                Duration = timeWatched,
                 StartUTC = _timeService.GetCurrentTimeAsUnixSeconds(),
                 EndUTC = _timeService.GetCurrentTimeAsUnixSeconds(),
+                MediaLenghtInSec = mediaDuration.TotalSeconds,
             };
         }
 

SnackTime.MediaServer.Proto/csharp/Media.cs

@@ -24,23 +24,24 @@ public static partial class MediaReflection {
     static MediaReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChFwcm90by9tZWRpYS5wcm90bxIPc25hY2t0aW1lLm1lZGlhIncKBlNlcmll",
-            "cxIKCgJpZBgBIAEoBRINCgV0aXRsZRgCIAEoCRItCglpbWFnZXNVcmwYAyAB",
-            "KAsyGi5zbmFja3RpbWUubWVkaWEuSW1hZ2VzVXJsEhAKCG92ZXJ2aWV3GAQg",
-            "ASgJEhEKCW1vbml0b3JlZBgFIAEoCCI7CglJbWFnZXNVcmwSDgoGYmFubmVy",
-            "GAEgASgJEg4KBmZhbmFydBgCIAEoCRIOCgZwb3N0ZXIYAyABKAkilAEKB0Vw",
-            "aXNvZGUSEAoIc2VyaWVzSWQYASABKAUSFQoNZXBpc29kZUZpbGVJZBgCIAEo",
-            "BRIUCgxzZWFzb25OdW1iZXIYAyABKAUSFQoNZXBpc2lkZU51bWJlchgEIAEo",
-            "BRINCgV0aXRsZRgFIAEoCRIQCghvdmVydmlldxgGIAEoCRISCgpwbGF5YWJs",
-            "ZUlkGAcgASgJKiMKCVByb3ZpZGVycxIKCgZTb25hcnIQABIKCgZSYWRhcnIQ",
-            "AUIuqgIrU25hY2tUaW1lLk1lZGlhU2VydmVyLk1vZGVscy5Qcm90b0dlbmVy",
-            "YXRlZGIGcHJvdG8z"));
+            "ChFwcm90by9tZWRpYS5wcm90bxIPc25hY2t0aW1lLm1lZGlhGhNwcm90by9z",
+            "dG9yYWdlLnByb3RvIncKBlNlcmllcxIKCgJpZBgBIAEoBRINCgV0aXRsZRgC",
+            "IAEoCRItCglpbWFnZXNVcmwYAyABKAsyGi5zbmFja3RpbWUubWVkaWEuSW1h",
+            "Z2VzVXJsEhAKCG92ZXJ2aWV3GAQgASgJEhEKCW1vbml0b3JlZBgFIAEoCCI7",
+            "CglJbWFnZXNVcmwSDgoGYmFubmVyGAEgASgJEg4KBmZhbmFydBgCIAEoCRIO",
+            "CgZwb3N0ZXIYAyABKAkiwwEKB0VwaXNvZGUSEAoIc2VyaWVzSWQYASABKAUS",
+            "FQoNZXBpc29kZUZpbGVJZBgCIAEoBRIUCgxzZWFzb25OdW1iZXIYAyABKAUS",
+            "FQoNZXBpc2lkZU51bWJlchgEIAEoBRINCgV0aXRsZRgFIAEoCRIQCghvdmVy",
+            "dmlldxgGIAEoCRISCgpwbGF5YWJsZUlkGAcgASgJEi0KCHByb2dyZXNzGAgg",
+            "ASgLMhsuc25hY2t0aW1lLnN0b3JhZ2UuUHJvZ3Jlc3MqIwoJUHJvdmlkZXJz",
+            "EgoKBlNvbmFychAAEgoKBlJhZGFychABQi6qAitTbmFja1RpbWUuTWVkaWFT",
+            "ZXJ2ZXIuTW9kZWxzLlByb3RvR2VuZXJhdGVkYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
+          new pbr::FileDescriptor[] { global::SnackTime.MediaServer.Storage.ProtoGenerated.StorageReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::SnackTime.MediaServer.Models.ProtoGenerated.Providers), }, new pbr::GeneratedClrTypeInfo[] {
             new pbr::GeneratedClrTypeInfo(typeof(global::SnackTime.MediaServer.Models.ProtoGenerated.Series), global::SnackTime.MediaServer.Models.ProtoGenerated.Series.Parser, new[]{ "Id", "Title", "ImagesUrl", "Overview", "Monitored" }, null, null, null),
             new pbr::GeneratedClrTypeInfo(typeof(global::SnackTime.MediaServer.Models.ProtoGenerated.ImagesUrl), global::SnackTime.MediaServer.Models.ProtoGenerated.ImagesUrl.Parser, new[]{ "Banner", "Fanart", "Poster" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::SnackTime.MediaServer.Models.ProtoGenerated.Episode), global::SnackTime.MediaServer.Models.ProtoGenerated.Episode.Parser, new[]{ "SeriesId", "EpisodeFileId", "SeasonNumber", "EpisideNumber", "Title", "Overview", "PlayableId" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::SnackTime.MediaServer.Models.ProtoGenerated.Episode), global::SnackTime.MediaServer.Models.ProtoGenerated.Episode.Parser, new[]{ "SeriesId", "EpisodeFileId", "SeasonNumber", "EpisideNumber", "Title", "Overview", "PlayableId", "Progress" }, null, null, null)
           }));
     }
     #endregion
@@ -519,6 +520,7 @@ public Episode(Episode other) : this() {
       title_ = other.title_;
       overview_ = other.overview_;
       playableId_ = other.playableId_;
+      progress_ = other.progress_ != null ? other.progress_.Clone() : null;
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
@@ -604,6 +606,17 @@ public string PlayableId {
       }
     }
 
+    /// <summary>Field number for the "progress" field.</summary>
+    public const int ProgressFieldNumber = 8;
+    private global::SnackTime.MediaServer.Storage.ProtoGenerated.Progress progress_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::SnackTime.MediaServer.Storage.ProtoGenerated.Progress Progress {
+      get { return progress_; }
+      set {
+        progress_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as Episode);
@@ -624,6 +637,7 @@ public bool Equals(Episode other) {
       if (Title != other.Title) return false;
       if (Overview != other.Overview) return false;
       if (PlayableId != other.PlayableId) return false;
+      if (!object.Equals(Progress, other.Progress)) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
@@ -637,6 +651,7 @@ public override int GetHashCode() {
       if (Title.Length != 0) hash ^= Title.GetHashCode();
       if (Overview.Length != 0) hash ^= Overview.GetHashCode();
       if (PlayableId.Length != 0) hash ^= PlayableId.GetHashCode();
+      if (progress_ != null) hash ^= Progress.GetHashCode();
       if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
@@ -678,6 +693,10 @@ public void WriteTo(pb::CodedOutputStream output) {
         output.WriteRawTag(58);
         output.WriteString(PlayableId);
       }
+      if (progress_ != null) {
+        output.WriteRawTag(66);
+        output.WriteMessage(Progress);
+      }
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
@@ -707,6 +726,9 @@ public int CalculateSize() {
       if (PlayableId.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(PlayableId);
       }
+      if (progress_ != null) {
+        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Progress);
+      }
       if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
@@ -739,6 +761,12 @@ public void MergeFrom(Episode other) {
       if (other.PlayableId.Length != 0) {
         PlayableId = other.PlayableId;
       }
+      if (other.progress_ != null) {
+        if (progress_ == null) {
+          progress_ = new global::SnackTime.MediaServer.Storage.ProtoGenerated.Progress();
+        }
+        Progress.MergeFrom(other.Progress);
+      }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
     }
 
@@ -778,6 +806,13 @@ public void MergeFrom(pb::CodedInputStream input) {
             PlayableId = input.ReadString();
             break;
           }
+          case 66: {
+            if (progress_ == null) {
+              progress_ = new global::SnackTime.MediaServer.Storage.ProtoGenerated.Progress();
+            }
+            input.ReadMessage(progress_);
+            break;
+          }
         }
       }
     }