From ff000d581c09e6f9e37cc68e389d5e04dca8a6c4 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 3 Mar 2016 01:37:13 -0500 Subject: [PATCH 01/10] 3.0.5880 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index ab7f18aa3c..dd370f98d7 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5896")] +[assembly: AssemblyVersion("3.0.5880")] From f70d12ef339cf6597b449aa284024f58c8d9ea01 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 3 Mar 2016 13:18:18 -0500 Subject: [PATCH 02/10] 3.0.5881 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index dd370f98d7..7163198397 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5880")] +[assembly: AssemblyVersion("3.0.5881")] From 09bba2f8165f632873fe4bd344beffaa22edd8d4 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 3 Mar 2016 21:52:41 -0500 Subject: [PATCH 03/10] add path to table creation --- .../Persistence/SqliteItemRepository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs index cd439d1f27..18a41d82a6 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs @@ -128,7 +128,7 @@ namespace MediaBrowser.Server.Implementations.Persistence string[] queries = { - "create table if not exists TypedBaseItems (guid GUID primary key, type TEXT, data BLOB, ParentId GUID)", + "create table if not exists TypedBaseItems (guid GUID primary key, type TEXT, data BLOB, ParentId GUID, Path TEXT)", "create index if not exists idx_TypedBaseItems on TypedBaseItems(guid)", "create index if not exists idx_PathTypedBaseItems on TypedBaseItems(Path)", "create index if not exists idx_ParentIdTypedBaseItems on TypedBaseItems(ParentId)", From 4a7df961dce3c1af6815e6d618de50be5fd0a694 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 3 Mar 2016 21:54:39 -0500 Subject: [PATCH 04/10] 3.0.5882 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 7163198397..e1c8f8995a 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5881")] +[assembly: AssemblyVersion("3.0.5882")] From 736e63241011cb9ae798bf4091cd37e097045c21 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 25 Mar 2016 13:51:54 -0400 Subject: [PATCH 05/10] fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index e1c8f8995a..5f6e1dde66 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5882")] +[assembly: AssemblyVersion("3.0.5920")] From d6832e7a41c2a24f7dd998284e8e4f6eacf1d188 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 25 Mar 2016 13:52:28 -0400 Subject: [PATCH 06/10] 3.0.5910 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 5f6e1dde66..f3c1633d77 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5920")] +[assembly: AssemblyVersion("3.0.5910")] From 1785b6568fb7e20b06434c929af9b9a22edcea25 Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 25 Mar 2016 13:58:52 -0400 Subject: [PATCH 07/10] update mac project --- .../Emby.Server.Mac.csproj | 86 +++++++++++++------ 1 file changed, 58 insertions(+), 28 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 39f39aecdb..2055e65a7b 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -1364,6 +1364,21 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\confirm\nativeconfirm.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\dialoghelper\dialoghelper.css + + + Resources\dashboard-ui\bower_components\emby-webcomponents\dialoghelper\dialoghelper.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\material-icons\2fcrYFNaTjcS6g4U3t-Y5ZjZjT5FdEJ140U2DJYC3mY.woff2 + + + Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\material-icons\2fcrYFNaTjcS6g4U3t-Y5ewrjPiaoEww8AihgqWRJAo.woff + + + Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\material-icons\style.css + Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\montserrat\IQHow_FEYlDC4Gzy_m8fcgFhaRv2pGgT5Kf0An0s4MM.woff @@ -1568,12 +1583,6 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\page.js\page.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\prompt\icons.html @@ -1778,6 +1787,9 @@ Resources\dashboard-ui\bower_components\hls.js\src\controller\buffer-controller.js + + Resources\dashboard-ui\bower_components\hls.js\src\controller\cap-level-controller.js + Resources\dashboard-ui\bower_components\hls.js\src\controller\fps-controller.js @@ -1823,6 +1835,9 @@ Resources\dashboard-ui\bower_components\hls.js\src\demux\tsdemuxer.js + + Resources\dashboard-ui\bower_components\hls.js\src\helper\buffer-helper.js + Resources\dashboard-ui\bower_components\hls.js\src\helper\level-helper.js @@ -2498,6 +2513,9 @@ Resources\dashboard-ui\bower_components\iron-input\demo\index.html + + Resources\dashboard-ui\bower_components\iron-input\test\disabled-input.html + Resources\dashboard-ui\bower_components\iron-input\test\index.html @@ -2570,6 +2588,9 @@ Resources\dashboard-ui\bower_components\iron-menu-behavior\iron-menubar-behavior.html + + Resources\dashboard-ui\bower_components\iron-menu-behavior\.github\ISSUE_TEMPLATE.md + Resources\dashboard-ui\bower_components\iron-menu-behavior\demo\index.html @@ -2663,6 +2684,9 @@ Resources\dashboard-ui\bower_components\iron-overlay-behavior\iron-overlay-manager.html + + Resources\dashboard-ui\bower_components\iron-overlay-behavior\.github\ISSUE_TEMPLATE.md + Resources\dashboard-ui\bower_components\iron-overlay-behavior\demo\index.html @@ -4487,6 +4511,9 @@ Resources\dashboard-ui\bower_components\paper-dialog-behavior\paper-dialog-shared-styles.html + + Resources\dashboard-ui\bower_components\paper-dialog-behavior\.github\ISSUE_TEMPLATE.md + Resources\dashboard-ui\bower_components\paper-dialog-behavior\demo\index.html @@ -9197,38 +9224,38 @@ Resources\dashboard-ui\css\images\tour\enjoy.jpg - - Resources\dashboard-ui\css\images\tour\dashboard\chapters.png + + Resources\dashboard-ui\css\images\tour\admin\chapters.png - - Resources\dashboard-ui\css\images\tour\dashboard\cinemamode.png + + Resources\dashboard-ui\css\images\tour\admin\cinemamode.png - - Resources\dashboard-ui\css\images\tour\dashboard\dashboard.png + + Resources\dashboard-ui\css\images\tour\admin\dashboard.png - - Resources\dashboard-ui\css\images\tour\dashboard\help.png + + Resources\dashboard-ui\css\images\tour\admin\help.png - - Resources\dashboard-ui\css\images\tour\dashboard\mobile.png + + Resources\dashboard-ui\css\images\tour\admin\mobile.png - - Resources\dashboard-ui\css\images\tour\dashboard\notifications.png + + Resources\dashboard-ui\css\images\tour\admin\notifications.png - - Resources\dashboard-ui\css\images\tour\dashboard\plugins.png + + Resources\dashboard-ui\css\images\tour\admin\plugins.png - - Resources\dashboard-ui\css\images\tour\dashboard\scheduledtasks.png + + Resources\dashboard-ui\css\images\tour\admin\scheduledtasks.png - - Resources\dashboard-ui\css\images\tour\dashboard\subtitles.png + + Resources\dashboard-ui\css\images\tour\admin\subtitles.png - - Resources\dashboard-ui\css\images\tour\dashboard\sync.png + + Resources\dashboard-ui\css\images\tour\admin\sync.png - - Resources\dashboard-ui\css\images\tour\dashboard\users.png + + Resources\dashboard-ui\css\images\tour\admin\users.png Resources\dashboard-ui\css\images\tour\web\tourcollections.jpg @@ -9308,6 +9335,9 @@ Resources\dashboard-ui\legacy\objectassign.js + + Resources\dashboard-ui\legacy\selectmenu.js + Resources\dashboard-ui\scripts\aboutpage.js From b398805a817b501da09797ae9d67788ae4dfbd12 Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 25 Mar 2016 14:10:58 -0400 Subject: [PATCH 08/10] update mac project --- MediaBrowser.Server.Mac/Emby.Server.Mac.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 2055e65a7b..01531c3a3a 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -78,12 +78,12 @@ ..\ThirdParty\Mono.Security\Mono.Security.dll False - - ..\packages\CommonIO.1.0.0.8\lib\net45\CommonIO.dll - ..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll + + ..\packages\CommonIO.1.0.0.9\lib\net45\CommonIO.dll + From 661acc256aab7f94c5071c1816b240b705c1cf85 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 26 Mar 2016 13:21:55 -0400 Subject: [PATCH 09/10] update version --- SharedVersion.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index f3c1633d77..f2ac1e3a3c 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5910")] +[assembly: AssemblyVersion("3.0.*")] +//[assembly: AssemblyVersion("3.0.5910")] From ac07c2072ad33e2813924bae72007752904ee823 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 26 Mar 2016 13:51:27 -0400 Subject: [PATCH 10/10] Update firewall authorization --- MediaBrowser.Dlna/Server/UpnpDevice.cs | 11 ++++++++--- MediaBrowser.Dlna/Ssdp/SsdpHandler.cs | 4 ++-- MediaBrowser.Server.Mono/Native/BaseMonoApp.cs | 2 +- MediaBrowser.Server.Startup.Common/ApplicationHost.cs | 1 + MediaBrowser.Server.Startup.Common/INativeApp.cs | 2 +- .../Native/RegisterServer.bat | 7 +++++++ .../Native/ServerAuthorization.cs | 4 ++-- MediaBrowser.ServerApplication/Native/WindowsApp.cs | 4 ++-- 8 files changed, 24 insertions(+), 11 deletions(-) diff --git a/MediaBrowser.Dlna/Server/UpnpDevice.cs b/MediaBrowser.Dlna/Server/UpnpDevice.cs index 10eaeb0535..355a35c012 100644 --- a/MediaBrowser.Dlna/Server/UpnpDevice.cs +++ b/MediaBrowser.Dlna/Server/UpnpDevice.cs @@ -19,13 +19,18 @@ namespace MediaBrowser.Dlna.Server Address = address; - if (Type.StartsWith("uuid:", StringComparison.OrdinalIgnoreCase)) + USN = CreateUSN(aUuid, aType); + } + + private static string CreateUSN(string aUuid, string aType) + { + if (aType.StartsWith("uuid:", StringComparison.OrdinalIgnoreCase)) { - USN = Type; + return aType; } else { - USN = String.Format("uuid:{0}::{1}", Uuid, Type); + return String.Format("uuid:{0}::{1}", aUuid, aType); } } } diff --git a/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs b/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs index dc271c5571..2d1ec12730 100644 --- a/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs +++ b/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs @@ -172,9 +172,9 @@ namespace MediaBrowser.Dlna.Ssdp { get { - var devices = _devices.Values.ToList(); + var devices = _devices.ToList(); - return devices.SelectMany(i => i).ToList(); + return devices.SelectMany(i => i.Value).ToList(); } } diff --git a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs index e57a651c00..e54bc0b4ad 100644 --- a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs @@ -90,7 +90,7 @@ namespace MediaBrowser.Server.Mono.Native return list; } - public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string tempDirectory) + public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string applicationPath, string tempDirectory) { } diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs index 269c306694..210e0abbde 100644 --- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs +++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs @@ -1299,6 +1299,7 @@ namespace MediaBrowser.Server.Startup.Common UdpServerEntryPoint.PortNumber, ServerConfigurationManager.Configuration.HttpServerPortNumber, ServerConfigurationManager.Configuration.HttpsPortNumber, + ConfigurationManager.CommonApplicationPaths.ApplicationPath, ConfigurationManager.CommonApplicationPaths.TempDirectory); } catch (Exception ex) diff --git a/MediaBrowser.Server.Startup.Common/INativeApp.cs b/MediaBrowser.Server.Startup.Common/INativeApp.cs index 75b38d0c4c..9df670bdae 100644 --- a/MediaBrowser.Server.Startup.Common/INativeApp.cs +++ b/MediaBrowser.Server.Startup.Common/INativeApp.cs @@ -21,7 +21,7 @@ namespace MediaBrowser.Server.Startup.Common /// The HTTP server port. /// The HTTPS server port. /// The temporary directory. - void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string tempDirectory); + void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string applicationPath, string tempDirectory); /// /// Gets the environment. diff --git a/MediaBrowser.ServerApplication/Native/RegisterServer.bat b/MediaBrowser.ServerApplication/Native/RegisterServer.bat index 57e93683e0..27f863d581 100644 --- a/MediaBrowser.ServerApplication/Native/RegisterServer.bat +++ b/MediaBrowser.ServerApplication/Native/RegisterServer.bat @@ -1,6 +1,7 @@ rem %1 = udp server port rem %2 = http server port rem %3 = https server port +rem %4 = exe path if [%1]==[] GOTO DONE @@ -17,6 +18,12 @@ if [%3]==[] GOTO DONE netsh advfirewall firewall delete rule name="Port %3" protocol=TCP localport=%3 netsh advfirewall firewall add rule name="Port %3" dir=in action=allow protocol=TCP localport=%3 +if [%4]==[] GOTO DONE + +netsh advfirewall firewall delete rule name="Emby Server" +netsh advfirewall firewall add rule name="Emby Server" dir=in action=allow protocol=TCP program=%4 enable=yes +netsh advfirewall firewall add rule name="Emby Server" dir=in action=allow protocol=UDP program=%4 enable=yes + :DONE Exit \ No newline at end of file diff --git a/MediaBrowser.ServerApplication/Native/ServerAuthorization.cs b/MediaBrowser.ServerApplication/Native/ServerAuthorization.cs index 995c44e318..70444ad9fb 100644 --- a/MediaBrowser.ServerApplication/Native/ServerAuthorization.cs +++ b/MediaBrowser.ServerApplication/Native/ServerAuthorization.cs @@ -17,7 +17,7 @@ namespace MediaBrowser.ServerApplication.Native /// The HTTP server port. /// The HTTPS server port. /// The temp directory. - public static void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string tempDirectory) + public static void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string applicationPath, string tempDirectory) { Directory.CreateDirectory(tempDirectory); @@ -37,7 +37,7 @@ namespace MediaBrowser.ServerApplication.Native { FileName = tmpFile, - Arguments = string.Format("{0} {1} {2}", udpPort, httpServerPort, httpsServerPort), + Arguments = string.Format("{0} {1} {2} \"{3}\"", udpPort, httpServerPort, httpsServerPort, applicationPath), CreateNoWindow = true, WindowStyle = ProcessWindowStyle.Hidden, diff --git a/MediaBrowser.ServerApplication/Native/WindowsApp.cs b/MediaBrowser.ServerApplication/Native/WindowsApp.cs index fe2fe6de6c..ac07a369d8 100644 --- a/MediaBrowser.ServerApplication/Native/WindowsApp.cs +++ b/MediaBrowser.ServerApplication/Native/WindowsApp.cs @@ -35,9 +35,9 @@ namespace MediaBrowser.ServerApplication.Native return list; } - public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string tempDirectory) + public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string applicationPath, string tempDirectory) { - ServerAuthorization.AuthorizeServer(udpPort, httpServerPort, httpsPort, tempDirectory); + ServerAuthorization.AuthorizeServer(udpPort, httpServerPort, httpsPort, applicationPath, tempDirectory); } public NativeEnvironment Environment