From c524f3919ef019092d3bcfa246870bc3f16070c5 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 21 Jul 2014 21:29:06 -0400
Subject: added cloud sync model objects

---
 MediaBrowser.ServerApplication/ApplicationHost.cs          | 14 +++++++++-----
 .../FFMpeg/FFMpegDownloadInfo.cs                           |  6 +++---
 MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs  |  9 +++++----
 3 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'MediaBrowser.ServerApplication')

diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 7c36a7c5eb..2208bc2170 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -188,6 +188,7 @@ namespace MediaBrowser.ServerApplication
 
         private IEncodingManager EncodingManager { get; set; }
         private IChannelManager ChannelManager { get; set; }
+        private ISyncManager SyncManager { get; set; }
 
         /// <summary>
         /// Gets or sets the user data repository.
@@ -613,7 +614,8 @@ namespace MediaBrowser.ServerApplication
                 MediaEncoder, ChapterManager);
             RegisterSingleInstance(EncodingManager);
 
-            RegisterSingleInstance<ISyncManager>(new SyncManager());
+            SyncManager = new SyncManager();
+            RegisterSingleInstance(SyncManager);
 
             var authContext = new AuthorizationContext();
             RegisterSingleInstance<IAuthorizationContext>(authContext);
@@ -823,6 +825,7 @@ namespace MediaBrowser.ServerApplication
             ChannelManager.AddParts(GetExports<IChannel>(), GetExports<IChannelFactory>());
 
             NotificationManager.AddParts(GetExports<INotificationService>(), GetExports<INotificationTypeFactory>());
+            SyncManager.AddParts(GetExports<ISyncProvider>());
         }
 
         /// <summary>
@@ -1139,15 +1142,16 @@ namespace MediaBrowser.ServerApplication
 
             var versionObject = version == null || string.IsNullOrWhiteSpace(version.versionStr) ? null : new Version(version.versionStr);
 
-            HasUpdateAvailable = versionObject != null && versionObject >= ApplicationVersion;
+            var isUpdateAvailable = versionObject != null && versionObject > ApplicationVersion;
+            HasUpdateAvailable = isUpdateAvailable;
 
-            if (versionObject != null && versionObject >= ApplicationVersion)
+            if (isUpdateAvailable)
             {
                 Logger.Info("New application version is available: {0}", versionObject);
             }
 
-            return versionObject != null ? 
-                new CheckForUpdateResult { AvailableVersion = versionObject.ToString(), IsUpdateAvailable = versionObject > ApplicationVersion, Package = version } :
+            return versionObject != null ?
+                new CheckForUpdateResult { AvailableVersion = versionObject.ToString(), IsUpdateAvailable = isUpdateAvailable, Package = version } :
                 new CheckForUpdateResult { AvailableVersion = ApplicationVersion.ToString(), IsUpdateAvailable = false };
         }
 
diff --git a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
index 206a044603..eb73966ce4 100644
--- a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
+++ b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
@@ -35,7 +35,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg
                     switch (arg)
                     {
                         case "Version":
-                            return "20140612";
+                            return "20140721";
                         case "FFMpegFilename":
                             return "ffmpeg.exe";
                         case "FFProbeFilename":
@@ -113,8 +113,8 @@ namespace MediaBrowser.ServerApplication.FFMpeg
                 case PlatformID.Win32NT:
                     return new[]
                     {
-                        "http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20140612-git-3a1c895-win32-static.7z",
-                        "https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/windows/ffmpeg-20140612-git-3a1c895-win32-static.7z"
+                        "http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20140721-git-ce385c8-win32-static.7z",
+                        "https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/windows/ffmpeg-20140721-git-ce385c8-win32-static.7z"
                     };
 
                 case PlatformID.Unix:
diff --git a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
index c550cb27fb..a93ed91960 100644
--- a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
+++ b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
@@ -26,10 +26,10 @@ namespace MediaBrowser.ServerApplication.FFMpeg
         private readonly IZipClient _zipClient;
         private readonly IFileSystem _fileSystem;
 
-        private readonly string[] _fontUrls = new[]
-            {
-                "https://www.dropbox.com/s/pj847twf7riq0j7/ARIALUNI.7z?dl=1"
-            };
+        private readonly string[] _fontUrls =
+        {
+            "https://www.dropbox.com/s/pj847twf7riq0j7/ARIALUNI.7z?dl=1"
+        };
 
         public FFMpegDownloader(ILogger logger, IApplicationPaths appPaths, IHttpClient httpClient, IZipClient zipClient, IFileSystem fileSystem)
         {
@@ -251,6 +251,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg
                     Task.Run(async () =>
                     {
                         await DownloadFontFile(fontsDirectory, fontFilename, new Progress<double>()).ConfigureAwait(false);
+                        
                         await WriteFontConfigFile(fontsDirectory).ConfigureAwait(false);
                     });
                 }
-- 
cgit v1.2.3