From 7d85c1fb4e25695690351ada94ed0e17b9f2d71d Mon Sep 17 00:00:00 2001 From: Luke Date: Tue, 10 Feb 2015 01:29:13 -0500 Subject: [PATCH 1/2] update mac project --- MediaBrowser.Server.Mac/Main.cs | 2 +- .../MediaBrowser.Server.Mac.csproj | 78 +++++++------------ .../Native/NetworkManager.cs | 13 +++- 3 files changed, 42 insertions(+), 51 deletions(-) diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs index 33f870aeec..0a1fd1b3d3 100644 --- a/MediaBrowser.Server.Mac/Main.cs +++ b/MediaBrowser.Server.Mac/Main.cs @@ -89,7 +89,7 @@ namespace MediaBrowser.Server.Mac var nativeApp = new NativeApp(); - AppHost = new ApplicationHost(appPaths, logManager, options, fileSystem, "MBServer.Mono", false, nativeApp); + AppHost = new ApplicationHost(appPaths, logManager, options, fileSystem, "MBServer.Mono", nativeApp); if (options.ContainsOption("-v")) { Console.WriteLine (AppHost.ApplicationVersion.ToString()); diff --git a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj index 25fb839b41..b9978ca049 100644 --- a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj @@ -70,6 +70,10 @@ ..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll + + ..\ThirdParty\Mono.Security\Mono.Security.dll + False + @@ -94,6 +98,9 @@ + + Native\CertificateGenerator.cs + @@ -297,6 +304,9 @@ Resources\dashboard-ui\dashboardgeneral.html + + Resources\dashboard-ui\dashboardhosting.html + Resources\dashboard-ui\device.html @@ -375,9 +385,6 @@ Resources\dashboard-ui\itemdetails.html - - Resources\dashboard-ui\itemgallery.html - Resources\dashboard-ui\itemlist.html @@ -450,8 +457,8 @@ Resources\dashboard-ui\metadataimages.html - - Resources\dashboard-ui\metadatakodi.html + + Resources\dashboard-ui\metadatanfo.html Resources\dashboard-ui\metadatasubtitles.html @@ -663,6 +670,9 @@ Resources\dashboard-ui\css\livetv.css + + Resources\dashboard-ui\css\materialize.css + Resources\dashboard-ui\css\mediaplayer-video.css @@ -744,6 +754,9 @@ Resources\dashboard-ui\css\images\server.png + + Resources\dashboard-ui\css\images\splash.jpg + Resources\dashboard-ui\css\images\stars.png @@ -939,39 +952,6 @@ Resources\dashboard-ui\css\images\items\detail\video.png - - Resources\dashboard-ui\css\images\items\folders\books.png - - - Resources\dashboard-ui\css\images\items\folders\channels.png - - - Resources\dashboard-ui\css\images\items\folders\folder.png - - - Resources\dashboard-ui\css\images\items\folders\games.png - - - Resources\dashboard-ui\css\images\items\folders\home.png - - - Resources\dashboard-ui\css\images\items\folders\homevideos.png - - - Resources\dashboard-ui\css\images\items\folders\movies.png - - - Resources\dashboard-ui\css\images\items\folders\music.png - - - Resources\dashboard-ui\css\images\items\folders\musicvideos.png - - - Resources\dashboard-ui\css\images\items\folders\photos.png - - - Resources\dashboard-ui\css\images\items\folders\tv.png - Resources\dashboard-ui\css\images\items\list\audio.png @@ -1038,18 +1018,12 @@ Resources\dashboard-ui\css\images\notifications\info.png - - Resources\dashboard-ui\css\images\supporter\donatepaypal.png - Resources\dashboard-ui\css\images\supporter\nonsupporterbadge.png Resources\dashboard-ui\css\images\supporter\premiumflag.png - - Resources\dashboard-ui\css\images\supporter\registerpaypal.png - Resources\dashboard-ui\css\images\supporter\supporterbadge.png @@ -1182,6 +1156,9 @@ Resources\dashboard-ui\scripts\dashboardgeneral.js + + Resources\dashboard-ui\scripts\dashboardhosting.js + Resources\dashboard-ui\scripts\dashboardpage.js @@ -1272,9 +1249,6 @@ Resources\dashboard-ui\scripts\itemdetailpage.js - - Resources\dashboard-ui\scripts\itemgallery.js - Resources\dashboard-ui\scripts\itemlistpage.js @@ -1365,8 +1339,8 @@ Resources\dashboard-ui\scripts\metadataimagespage.js - - Resources\dashboard-ui\scripts\metadatakodi.js + + Resources\dashboard-ui\scripts\metadatanfo.js Resources\dashboard-ui\scripts\metadatasubtitles.js @@ -1512,6 +1486,9 @@ Resources\dashboard-ui\scripts\syncsettings.js + + Resources\dashboard-ui\scripts\taskbutton.js + Resources\dashboard-ui\scripts\thememediaplayer.js @@ -1596,6 +1573,9 @@ Resources\dashboard-ui\thirdparty\apiclient\device.js + + Resources\dashboard-ui\thirdparty\apiclient\logger.js + Resources\dashboard-ui\thirdparty\apiclient\md5.js diff --git a/MediaBrowser.Server.Mac/Native/NetworkManager.cs b/MediaBrowser.Server.Mac/Native/NetworkManager.cs index 6e4e055a22..959ac6774a 100644 --- a/MediaBrowser.Server.Mac/Native/NetworkManager.cs +++ b/MediaBrowser.Server.Mac/Native/NetworkManager.cs @@ -4,6 +4,7 @@ using MediaBrowser.Model.IO; using MediaBrowser.Model.Logging; using MediaBrowser.Model.Net; using System.Collections.Generic; +using MediaBrowser.Server.Mono.Networking; namespace MediaBrowser.Server.Mac { @@ -34,6 +35,16 @@ namespace MediaBrowser.Server.Mac public IEnumerable GetNetworkDevices() { return new List (); - } + } + + /// + /// Generates a self signed certificate at the locatation specified by . + /// + /// The path to generate the certificate. + /// The common name for the certificate. + public void GenerateSelfSignedSslCertificate(string certificatePath, string hostname) + { + CertificateGenerator.CreateSelfSignCertificatePfx(certificatePath, hostname, Logger); + } } } From adab5b362c92cdfd7ac2ae39fb23da29fc67eef2 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 10 Feb 2015 13:28:00 -0500 Subject: [PATCH 2/2] update mac project --- MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj index b9978ca049..5a0e69149a 100644 --- a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj @@ -71,6 +71,7 @@ ..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll + False ..\ThirdParty\Mono.Security\Mono.Security.dll False