From e6b31ac6f42541540edda24d48e128d110fdff37 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 1 Feb 2016 16:03:19 -0500 Subject: [PATCH 1/5] 3.0.5821 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 000dd49ee0..4d1bcad645 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5820")] +[assembly: AssemblyVersion("3.0.5821")] From 746066c34694fe12e8af18905de5307d4cd28019 Mon Sep 17 00:00:00 2001 From: Luke Date: Tue, 2 Feb 2016 15:03:16 -0500 Subject: [PATCH 2/5] update mac project --- .../Emby.Server.Mac.csproj | 288 +++++++++++++----- MediaBrowser.Server.Mac/Native/BaseMonoApp.cs | 14 + 2 files changed, 221 insertions(+), 81 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 4e6bfaa43b..245076d414 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -758,6 +758,168 @@ Resources\dashboard-ui\bower_components\Sortable\st\iframe\index.html + + Resources\dashboard-ui\bower_components\Swiper\.bower.json + + + Resources\dashboard-ui\bower_components\Swiper\CHANGELOG.md + + + Resources\dashboard-ui\bower_components\Swiper\LICENSE + + + Resources\dashboard-ui\bower_components\Swiper\README.md + + + Resources\dashboard-ui\bower_components\Swiper\bower.json + + + Resources\dashboard-ui\bower_components\Swiper\component.json + + + Resources\dashboard-ui\bower_components\Swiper\gulpfile.js + + + Resources\dashboard-ui\bower_components\Swiper\package.js + + + Resources\dashboard-ui\bower_components\Swiper\dist\css\swiper.css + + + Resources\dashboard-ui\bower_components\Swiper\dist\css\swiper.min.css + + + Resources\dashboard-ui\bower_components\Swiper\dist\js\swiper.jquery.js + + + Resources\dashboard-ui\bower_components\Swiper\dist\js\swiper.jquery.min.js + + + Resources\dashboard-ui\bower_components\Swiper\dist\js\swiper.jquery.umd.js + + + Resources\dashboard-ui\bower_components\Swiper\dist\js\swiper.jquery.umd.min.js + + + Resources\dashboard-ui\bower_components\Swiper\dist\js\swiper.js + + + Resources\dashboard-ui\bower_components\Swiper\dist\js\swiper.min.js + + + Resources\dashboard-ui\bower_components\Swiper\dist\js\maps\swiper.jquery.min.js.map + + + Resources\dashboard-ui\bower_components\Swiper\dist\js\maps\swiper.jquery.umd.min.js.map + + + Resources\dashboard-ui\bower_components\Swiper\dist\js\maps\swiper.min.js.map + + + Resources\dashboard-ui\bower_components\Swiper\src\js\a11y.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\amd.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\controller.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\core.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\dom-plugins.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\dom.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\effects.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\emitter.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\get-dom-lib.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\get-jquery.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\hashnav.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\init.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\keyboard.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\lazy-load.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\mousewheel.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\parallax.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\plugins.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\scrollbar.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\swiper-intro-f7.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\swiper-intro.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\swiper-outro.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\swiper-proto.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\wrap-end-umd.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\wrap-end.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\wrap-start-umd.js + + + Resources\dashboard-ui\bower_components\Swiper\src\js\wrap-start.js + + + Resources\dashboard-ui\bower_components\Swiper\src\less\core.less + + + Resources\dashboard-ui\bower_components\Swiper\src\less\effects.less + + + Resources\dashboard-ui\bower_components\Swiper\src\less\mixins.less + + + Resources\dashboard-ui\bower_components\Swiper\src\less\navigation-f7.less + + + Resources\dashboard-ui\bower_components\Swiper\src\less\navigation.less + + + Resources\dashboard-ui\bower_components\Swiper\src\less\preloader-f7.less + + + Resources\dashboard-ui\bower_components\Swiper\src\less\preloader.less + + + Resources\dashboard-ui\bower_components\Swiper\src\less\scrollbar.less + + + Resources\dashboard-ui\bower_components\Swiper\src\less\swiper.less + Resources\dashboard-ui\bower_components\cryptojslib\.bower.json @@ -1058,6 +1220,9 @@ Resources\dashboard-ui\bower_components\emby-apiclient\apiclient.js + + Resources\dashboard-ui\bower_components\emby-apiclient\appstorage.js + Resources\dashboard-ui\bower_components\emby-apiclient\bower.json @@ -1082,9 +1247,6 @@ Resources\dashboard-ui\bower_components\emby-apiclient\serverdiscovery.js - - Resources\dashboard-ui\bower_components\emby-apiclient\store.js - Resources\dashboard-ui\bower_components\emby-apiclient\wakeonlan.js @@ -1130,6 +1292,12 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\fetchhelper.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\focusmanager.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\performancemanager.js + Resources\dashboard-ui\bower_components\emby-webcomponents\qualityoptions.js @@ -1151,6 +1319,21 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\images\persistentimagefetcher.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\paperdialoghelper\paperdialoghelper.css + + + Resources\dashboard-ui\bower_components\emby-webcomponents\paperdialoghelper\paperdialoghelper.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\slideshow\icons.html + + + Resources\dashboard-ui\bower_components\emby-webcomponents\slideshow\slideshow.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\slideshow\style.css + Resources\dashboard-ui\bower_components\fastclick\.bower.json @@ -1334,6 +1517,9 @@ Resources\dashboard-ui\bower_components\hls.js\src\controller\mse-media-controller.js + + Resources\dashboard-ui\bower_components\hls.js\src\controller\timeline-controller.js + Resources\dashboard-ui\bower_components\hls.js\src\crypt\aes.js @@ -1394,6 +1580,9 @@ Resources\dashboard-ui\bower_components\hls.js\src\utils\binary-search.js + + Resources\dashboard-ui\bower_components\hls.js\src\utils\cea-708-interpreter.js + Resources\dashboard-ui\bower_components\hls.js\src\utils\hex.js @@ -2162,6 +2351,9 @@ Resources\dashboard-ui\bower_components\iron-overlay-behavior\test\test-overlay.html + + Resources\dashboard-ui\bower_components\iron-overlay-behavior\test\test-overlay2.html + Resources\dashboard-ui\bower_components\iron-pages\.bower.json @@ -2276,6 +2468,9 @@ Resources\dashboard-ui\bower_components\iron-selector\.travis.yml + + Resources\dashboard-ui\bower_components\iron-selector\CONTRIBUTING.md + Resources\dashboard-ui\bower_components\iron-selector\README.md @@ -3278,12 +3473,18 @@ Resources\dashboard-ui\bower_components\neon-animation\animations\slide-down-animation.html + + Resources\dashboard-ui\bower_components\neon-animation\animations\slide-from-bottom-animation.html + Resources\dashboard-ui\bower_components\neon-animation\animations\slide-from-left-animation.html Resources\dashboard-ui\bower_components\neon-animation\animations\slide-from-right-animation.html + + Resources\dashboard-ui\bower_components\neon-animation\animations\slide-from-top-animation.html + Resources\dashboard-ui\bower_components\neon-animation\animations\slide-left-animation.html @@ -3635,6 +3836,9 @@ Resources\dashboard-ui\bower_components\paper-dialog-behavior\test\paper-dialog-behavior.html + + Resources\dashboard-ui\bower_components\paper-dialog-behavior\test\test-buttons.html + Resources\dashboard-ui\bower_components\paper-dialog-behavior\test\test-dialog.html @@ -4448,78 +4652,6 @@ Resources\dashboard-ui\bower_components\requirejs\require.js - - Resources\dashboard-ui\bower_components\swipebox\.bower.json - - - Resources\dashboard-ui\bower_components\swipebox\.gitattributes - - - Resources\dashboard-ui\bower_components\swipebox\.gitignore - - - Resources\dashboard-ui\bower_components\swipebox\README.md - - - Resources\dashboard-ui\bower_components\swipebox\bower.json - - - Resources\dashboard-ui\bower_components\swipebox\index.html - - - Resources\dashboard-ui\bower_components\swipebox\demo\bagpakk.min.css - - - Resources\dashboard-ui\bower_components\swipebox\demo\fork.png - - - Resources\dashboard-ui\bower_components\swipebox\demo\normalize.css - - - Resources\dashboard-ui\bower_components\swipebox\demo\style.css - - - Resources\dashboard-ui\bower_components\swipebox\grunt\.jshintrc - - - Resources\dashboard-ui\bower_components\swipebox\grunt\README.md - - - Resources\dashboard-ui\bower_components\swipebox\grunt\gruntfile.js - - - Resources\dashboard-ui\bower_components\swipebox\grunt\package.json - - - Resources\dashboard-ui\bower_components\swipebox\lib\ios-orientationchange-fix.js - - - Resources\dashboard-ui\bower_components\swipebox\lib\jquery-2.1.0.min.js - - - Resources\dashboard-ui\bower_components\swipebox\scss\swipebox.scss - - - Resources\dashboard-ui\bower_components\swipebox\src\css\swipebox.css - - - Resources\dashboard-ui\bower_components\swipebox\src\css\swipebox.min.css - - - Resources\dashboard-ui\bower_components\swipebox\src\img\icons.png - - - Resources\dashboard-ui\bower_components\swipebox\src\img\icons.svg - - - Resources\dashboard-ui\bower_components\swipebox\src\img\loader.gif - - - Resources\dashboard-ui\bower_components\swipebox\src\js\jquery.swipebox.js - - - Resources\dashboard-ui\bower_components\swipebox\src\js\jquery.swipebox.min.js - Resources\dashboard-ui\bower_components\velocity\.bower.json @@ -4655,9 +4787,6 @@ Resources\dashboard-ui\components\humanedate.js - - Resources\dashboard-ui\components\paperdialoghelper.js - Resources\dashboard-ui\components\prompt.js @@ -4667,9 +4796,6 @@ Resources\dashboard-ui\components\sharingwidget.js - - Resources\dashboard-ui\components\testermessage.js - Resources\dashboard-ui\components\collectioneditor\collectioneditor.js diff --git a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs index 9b8b0cd1b6..2e5d2d0fc6 100644 --- a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs @@ -6,6 +6,7 @@ using System; using System.Collections.Generic; using System.Reflection; using System.Text.RegularExpressions; +using MediaBrowser.Controller.Power; namespace MediaBrowser.Server.Mac { @@ -110,6 +111,11 @@ namespace MediaBrowser.Server.Mac return new NetworkManager(logger); } + public IPowerManagement GetPowerManagement() + { + return new NullPowerManagement (); + } + private NativeEnvironment GetEnvironmentInfo() { var info = new NativeEnvironment @@ -169,5 +175,13 @@ namespace MediaBrowser.Server.Mac public string sysname = string.Empty; public string machine = string.Empty; } + + private class NullPowerManagement : IPowerManagement + { + public void ScheduleWake(DateTime utcTime) + { + throw new NotImplementedException (); + } + } } } From 14e9e88f6a15aa27ba06503547e54deba938265d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 1 Feb 2016 21:41:00 -0500 Subject: [PATCH 3/5] update naming project --- .../MediaBrowser.Server.Implementations.csproj | 4 ++-- MediaBrowser.Server.Implementations/packages.config | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index c54ea42a55..077d64a994 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -48,9 +48,9 @@ ..\packages\Interfaces.IO.1.0.0.5\lib\portable-net45+sl4+wp71+win8+wpa81\Interfaces.IO.dll - + False - ..\packages\MediaBrowser.Naming.1.0.0.44\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll + ..\packages\MediaBrowser.Naming.1.0.0.45\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll ..\packages\morelinq.1.4.0\lib\net35\MoreLinq.dll diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config index b7f5533ced..c39d337e7a 100644 --- a/MediaBrowser.Server.Implementations/packages.config +++ b/MediaBrowser.Server.Implementations/packages.config @@ -2,7 +2,7 @@ - + From 15617b480606b4b3a6199945917ccb83b0b9ca60 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 3 Feb 2016 12:26:34 -0500 Subject: [PATCH 4/5] update naming project --- .../MediaBrowser.Server.Implementations.csproj | 4 ++-- MediaBrowser.Server.Implementations/packages.config | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 077d64a994..f3376aff04 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -48,9 +48,9 @@ ..\packages\Interfaces.IO.1.0.0.5\lib\portable-net45+sl4+wp71+win8+wpa81\Interfaces.IO.dll - + False - ..\packages\MediaBrowser.Naming.1.0.0.45\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll + ..\packages\MediaBrowser.Naming.1.0.0.46\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll ..\packages\morelinq.1.4.0\lib\net35\MoreLinq.dll diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config index c39d337e7a..c3c6e6e256 100644 --- a/MediaBrowser.Server.Implementations/packages.config +++ b/MediaBrowser.Server.Implementations/packages.config @@ -2,7 +2,7 @@ - + From 7d26b8995f313917829573a7cd96c37decc9158a Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 3 Feb 2016 12:26:45 -0500 Subject: [PATCH 5/5] increase startup timeout --- MediaBrowser.ServerApplication/MainStartup.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs index cf174c2d3b..87acd652e2 100644 --- a/MediaBrowser.ServerApplication/MainStartup.cs +++ b/MediaBrowser.ServerApplication/MainStartup.cs @@ -148,7 +148,7 @@ namespace MediaBrowser.ServerApplication { _logger.Info("Found a duplicate process. Giving it time to exit."); - if (!duplicate.WaitForExit(12000)) + if (!duplicate.WaitForExit(15000)) { _logger.Info("The duplicate process did not exit."); return true;