From 4764e3924773546d8db8c805d05990bbbfe44a7e Mon Sep 17 00:00:00 2001 From: Luke Date: Sat, 6 May 2017 15:54:19 -0400 Subject: [PATCH] update mac project --- .../Emby.Server.Mac.csproj | 210 ++++++++---------- MediaBrowser.Server.Mac/Main.cs | 4 +- 2 files changed, 98 insertions(+), 116 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 27ee37f5d8..8133efafb8 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -335,18 +335,6 @@ Resources\dashboard-ui\gamegenres.html - - Resources\dashboard-ui\games.html - - - Resources\dashboard-ui\gamesrecommended.html - - - Resources\dashboard-ui\gamestudios.html - - - Resources\dashboard-ui\gamesystems.html - Resources\dashboard-ui\home.html @@ -950,84 +938,6 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\material-icons\style.css - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\-l14jk06m6puhb-5mxqqnrjtnkitppoi_ivcxxdnrsc.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\0ec6fl06luxeywpbsjvxcbjtnkitppoi_ivcxxdnrsc.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\2tsd397wlxj96qwhynikxpeszw2xoq-xsnqo47m55da.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\97uahxiqzroncbacei3awxjtnkitppoi_ivcxxdnrsc.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\azmswpodyevhtrvuabjwvbtbgvql8ndjpwnre27mub0.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\cwb0xya8bzo0ksthx0utua.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\d-6iyplofoccackzxwxsoftxra8tvwticgirnjhmvjw.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\e7mevayvogmqfwwl61pkhbtbgvql8ndjpwnre27mub0.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\fcx7wwv8ozt71a3e1xoajveszw2xoq-xsnqo47m55da.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\fl4y0qdoxyythegmxx8kcrjtnkitppoi_ivcxxdnrsc.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\frnv30oaydlfrth2vnzzdhtbgvql8ndjpwnre27mub0.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\gwvjdern2amz39wrsoz7fxtbgvql8ndjpwnre27mub0.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\hgo13k-tfspn0qi1sfdufvtxra8tvwticgirnjhmvjw.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\i3s1wsgsg9ycurv6puktorjtnkitppoi_ivcxxdnrsc.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\nydwbdd4giq26g5xybhsfbjtnkitppoi_ivcxxdnrsc.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\ooefwznlrtefzlymlvv1ubjtnkitppoi_ivcxxdnrsc.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\pru33qjshpzsmg3z6vywnrjtnkitppoi_ivcxxdnrsc.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\robotobold.woff - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\robotolight.woff - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\robotomedium.woff - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\robotoregular.woff - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\robotothin.woff - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\rxzjdnzeo3r5zsexge8uuvtxra8tvwticgirnjhmvjw.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\style.css - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\ty9dfvlaziwdqq2dhoyjphtbgvql8ndjpwnre27mub0.woff2 - - - Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\roboto\vvxugkzxbhtx_s_vctlpghtbgvql8ndjpwnre27mub0.woff2 - Resources\dashboard-ui\bower_components\emby-webcomponents\fullscreen\fullscreen-doubleclick.js @@ -1058,9 +968,6 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\headroom\headroom.js - - Resources\dashboard-ui\bower_components\emby-webcomponents\homescreensettings\homescreensettings.css - Resources\dashboard-ui\bower_components\emby-webcomponents\homescreensettings\homescreensettings.js @@ -1328,6 +1235,21 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\scroller\smoothscroller.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\search\searchfields.css + + + Resources\dashboard-ui\bower_components\emby-webcomponents\search\searchfields.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\search\searchfields.template.html + + + Resources\dashboard-ui\bower_components\emby-webcomponents\search\searchresults.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\search\searchresults.template.html + Resources\dashboard-ui\bower_components\emby-webcomponents\serviceworker\notifications.js @@ -2159,6 +2081,84 @@ Resources\dashboard-ui\files\dummy.mp4 + + Resources\dashboard-ui\fonts\roboto\-l14jk06m6puhb-5mxqqnrjtnkitppoi_ivcxxdnrsc.woff2 + + + Resources\dashboard-ui\fonts\roboto\0ec6fl06luxeywpbsjvxcbjtnkitppoi_ivcxxdnrsc.woff2 + + + Resources\dashboard-ui\fonts\roboto\2tsd397wlxj96qwhynikxpeszw2xoq-xsnqo47m55da.woff2 + + + Resources\dashboard-ui\fonts\roboto\97uahxiqzroncbacei3awxjtnkitppoi_ivcxxdnrsc.woff2 + + + Resources\dashboard-ui\fonts\roboto\azmswpodyevhtrvuabjwvbtbgvql8ndjpwnre27mub0.woff2 + + + Resources\dashboard-ui\fonts\roboto\cwb0xya8bzo0ksthx0utua.woff2 + + + Resources\dashboard-ui\fonts\roboto\d-6iyplofoccackzxwxsoftxra8tvwticgirnjhmvjw.woff2 + + + Resources\dashboard-ui\fonts\roboto\e7mevayvogmqfwwl61pkhbtbgvql8ndjpwnre27mub0.woff2 + + + Resources\dashboard-ui\fonts\roboto\fcx7wwv8ozt71a3e1xoajveszw2xoq-xsnqo47m55da.woff2 + + + Resources\dashboard-ui\fonts\roboto\fl4y0qdoxyythegmxx8kcrjtnkitppoi_ivcxxdnrsc.woff2 + + + Resources\dashboard-ui\fonts\roboto\frnv30oaydlfrth2vnzzdhtbgvql8ndjpwnre27mub0.woff2 + + + Resources\dashboard-ui\fonts\roboto\gwvjdern2amz39wrsoz7fxtbgvql8ndjpwnre27mub0.woff2 + + + Resources\dashboard-ui\fonts\roboto\hgo13k-tfspn0qi1sfdufvtxra8tvwticgirnjhmvjw.woff2 + + + Resources\dashboard-ui\fonts\roboto\i3s1wsgsg9ycurv6puktorjtnkitppoi_ivcxxdnrsc.woff2 + + + Resources\dashboard-ui\fonts\roboto\nydwbdd4giq26g5xybhsfbjtnkitppoi_ivcxxdnrsc.woff2 + + + Resources\dashboard-ui\fonts\roboto\ooefwznlrtefzlymlvv1ubjtnkitppoi_ivcxxdnrsc.woff2 + + + Resources\dashboard-ui\fonts\roboto\pru33qjshpzsmg3z6vywnrjtnkitppoi_ivcxxdnrsc.woff2 + + + Resources\dashboard-ui\fonts\roboto\robotobold.woff + + + Resources\dashboard-ui\fonts\roboto\robotolight.woff + + + Resources\dashboard-ui\fonts\roboto\robotomedium.woff + + + Resources\dashboard-ui\fonts\roboto\robotoregular.woff + + + Resources\dashboard-ui\fonts\roboto\robotothin.woff + + + Resources\dashboard-ui\fonts\roboto\rxzjdnzeo3r5zsexge8uuvtxra8tvwticgirnjhmvjw.woff2 + + + Resources\dashboard-ui\fonts\roboto\style.css + + + Resources\dashboard-ui\fonts\roboto\ty9dfvlaziwdqq2dhoyjphtbgvql8ndjpwnre27mub0.woff2 + + + Resources\dashboard-ui\fonts\roboto\vvxugkzxbhtx_s_vctlpghtbgvql8ndjpwnre27mub0.woff2 + Resources\dashboard-ui\legacy\buttonenabled.js @@ -2228,36 +2228,15 @@ Resources\dashboard-ui\scripts\encodingsettings.js - - Resources\dashboard-ui\scripts\episodes.js - Resources\dashboard-ui\scripts\forgotpassword.js Resources\dashboard-ui\scripts\forgotpasswordpin.js - - Resources\dashboard-ui\scripts\gamegenrepage.js - - - Resources\dashboard-ui\scripts\gamespage.js - - - Resources\dashboard-ui\scripts\gamesrecommendedpage.js - - - Resources\dashboard-ui\scripts\gamestudiospage.js - - - Resources\dashboard-ui\scripts\gamesystemspage.js - Resources\dashboard-ui\scripts\homefavorites.js - - Resources\dashboard-ui\scripts\homeupcoming.js - Resources\dashboard-ui\scripts\indexpage.js @@ -2429,6 +2408,9 @@ Resources\dashboard-ui\scripts\searchpage.js + + Resources\dashboard-ui\scripts\searchtab.js + Resources\dashboard-ui\scripts\secondaryitems.js diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs index 2acbe7ce4c..932ff61055 100644 --- a/MediaBrowser.Server.Mac/Main.cs +++ b/MediaBrowser.Server.Mac/Main.cs @@ -138,9 +138,9 @@ namespace MediaBrowser.Server.Mac Task.Run (() => StartServer(CancellationToken.None)); } - private static void GenerateCertificate(string certPath, string certHost) + private static void GenerateCertificate(string certPath, string certHost, string certPassword) { - CertificateGenerator.CreateSelfSignCertificatePfx(certPath, certHost, _logger); + CertificateGenerator.CreateSelfSignCertificatePfx(certPath, certHost, certPassword, _logger); } private static EnvironmentInfo GetEnvironmentInfo()