Added sync for sessions

Zexuz · Apr 22, 2019 · d0d19c2 · d0d19c2
1 parent 2ee6d1a
commit d0d19c2
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/SnackTime.Core/Database/DatabaseFactory.cs b/SnackTime.Core/Database/DatabaseFactory.cs
@@ -4,7 +4,7 @@ namespace SnackTime.Core.Database
 {
     public class DatabaseFactory
     {
-        private const string ConnectionString = "../Media.db";
+        private const string ConnectionString = "Media.db";
 
         public LiteDatabase GetDatabase()
         {

diff --git a/SnackTime.WebApi/Controllers/SessionController.cs b/SnackTime.WebApi/Controllers/SessionController.cs
@@ -1,6 +1,8 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using SnackTime.Core.Session;
+using SnackTime.WebApi.Services;
 
 namespace SnackTime.WebApi.Controllers
 {
@@ -9,19 +11,27 @@ namespace SnackTime.WebApi.Controllers
     public class SessionController : ControllerBase
     {
         private readonly ILogger<SessionController> _logger;
-        private readonly SessionService _sessionService;
+        private readonly SessionService             _sessionService;
+        private readonly SessionSyncService         _sessionSyncService;
 
-        public SessionController(ILogger<SessionController> logger, SessionService sessionService)
+        public SessionController(ILogger<SessionController> logger, SessionService sessionService, SessionSyncService sessionSyncService)
         {
             _logger = logger;
             _sessionService = sessionService;
+            _sessionSyncService = sessionSyncService;
         }
 
         [HttpGet("")]
-        public ActionResult GetSettings()
+        public ActionResult GetAll()
         {
             return Ok(_sessionService.GetAll());
         }
 
+        [HttpGet("sync")]
+        public async Task<ActionResult> SyncSession()
+        {
+            await _sessionSyncService.Sync();
+            return Ok();
+        }
     }
 }
diff --git a/SnackTime.WebApi/DependencyModule.cs b/SnackTime.WebApi/DependencyModule.cs
@@ -18,6 +18,7 @@ protected override void Load(ContainerBuilder builder)
             builder.RegisterType<MediaPlayerObserver>().As<IHostedService>().SingleInstance();
 
             builder.RegisterType<FileService>().AsSelf();
+            builder.RegisterType<SessionSyncService>().AsSelf();
             builder.RegisterType<FileDownloadService>().AsSelf();
         }
     }
@@ -65,7 +66,9 @@ private Channel GetChannel()
             }
 
             _lastAddress = address;
-            return new Channel(_lastAddress, 50052, ChannelCredentials.Insecure);
+            _lastChannel = new Channel(_lastAddress, 50052, ChannelCredentials.Insecure);
+
+            return _lastChannel;
         }
     }
 }
diff --git a/SnackTime.WebApi/Services/FileDownloadService.cs b/SnackTime.WebApi/Services/FileDownloadService.cs
@@ -112,10 +112,12 @@ public async Task DownloadFile(MediaFileId id)
                             hash = BitConverter.ToString(byteHash).Replace("-", "").ToLowerInvariant();
                         }
 
-                        if (hash != res.Done.Hash)
-                        {
-                            throw new HashMismatchException(res.Done.Hash, hash);
-                        }
+                        // TODO
+                        //This needs to be the zip:ed file, else there will be a missmatch.
+//                        if (hash != res.Done.Hash)
+//                        {
+//                            throw new HashMismatchException(res.Done.Hash, hash);
+//                        }
 
                         _logger.LogDebug($"Combined files in {sw.Elapsed:g}");
                         sw.Stop();

diff --git a/SnackTime.WebApi/Startup.cs b/SnackTime.WebApi/Startup.cs
@@ -24,9 +24,9 @@ public Startup(IConfiguration configuration)
 
         public void ConfigureContainer(ContainerBuilder builder)
         {
-            builder.RegisterModule(new DependencyModule());
             builder.RegisterModule(new Mpv.JsonIpc.DependencyModule());
             builder.RegisterModule(new Core.DependencyModule());
+            builder.RegisterModule(new DependencyModule());
         }
 
         public void ConfigureServices(IServiceCollection services)