lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1009 from MediaBrowser/master

Browse Source 
Merge main to dev
This commit is contained in:
Luke 2015-02-10 23:11:16 -05:00
commit 94f534b3c6
3 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Server.Mac/Main.cs
View File

@ -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());

79
MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
View File

@ -70,6 +70,11 @@
<Reference Include="Mono.Posix">
<HintPath>..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll</HintPath>
</Reference>
<Reference Include="Mono.Security">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ThirdParty\Mono.Security\Mono.Security.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
@ -94,6 +99,9 @@
</Compile>
<Compile Include="Main.cs" />
<Compile Include="MenuBarIcon.cs" />
<Compile Include="..\MediaBrowser.Server.Mono\Networking\CertificateGenerator.cs">
<Link>Native\CertificateGenerator.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="MainMenu.xib" />
@ -297,6 +305,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\dashboardgeneral.html">
<Link>Resources\dashboard-ui\dashboardgeneral.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\dashboardhosting.html">
<Link>Resources\dashboard-ui\dashboardhosting.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\device.html">
<Link>Resources\dashboard-ui\device.html</Link>
</BundleResource>
@ -375,9 +386,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\itemdetails.html">
<Link>Resources\dashboard-ui\itemdetails.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\itemgallery.html">
<Link>Resources\dashboard-ui\itemgallery.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\itemlist.html">
<Link>Resources\dashboard-ui\itemlist.html</Link>
</BundleResource>
@ -450,8 +458,8 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\metadataimages.html">
<Link>Resources\dashboard-ui\metadataimages.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\metadatakodi.html">
<Link>Resources\dashboard-ui\metadatakodi.html</Link>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\metadatanfo.html">
<Link>Resources\dashboard-ui\metadatanfo.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\metadatasubtitles.html">
<Link>Resources\dashboard-ui\metadatasubtitles.html</Link>
@ -663,6 +671,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\livetv.css">
<Link>Resources\dashboard-ui\css\livetv.css</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\materialize.css">
<Link>Resources\dashboard-ui\css\materialize.css</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\mediaplayer-video.css">
<Link>Resources\dashboard-ui\css\mediaplayer-video.css</Link>
</BundleResource>
@ -744,6 +755,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\server.png">
<Link>Resources\dashboard-ui\css\images\server.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\splash.jpg">
<Link>Resources\dashboard-ui\css\images\splash.jpg</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\stars.png">
<Link>Resources\dashboard-ui\css\images\stars.png</Link>
</BundleResource>
@ -939,39 +953,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\detail\video.png">
<Link>Resources\dashboard-ui\css\images\items\detail\video.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\folders\books.png">
<Link>Resources\dashboard-ui\css\images\items\folders\books.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\folders\channels.png">
<Link>Resources\dashboard-ui\css\images\items\folders\channels.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\folders\folder.png">
<Link>Resources\dashboard-ui\css\images\items\folders\folder.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\folders\games.png">
<Link>Resources\dashboard-ui\css\images\items\folders\games.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\folders\home.png">
<Link>Resources\dashboard-ui\css\images\items\folders\home.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\folders\homevideos.png">
<Link>Resources\dashboard-ui\css\images\items\folders\homevideos.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\folders\movies.png">
<Link>Resources\dashboard-ui\css\images\items\folders\movies.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\folders\music.png">
<Link>Resources\dashboard-ui\css\images\items\folders\music.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\folders\musicvideos.png">
<Link>Resources\dashboard-ui\css\images\items\folders\musicvideos.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\folders\photos.png">
<Link>Resources\dashboard-ui\css\images\items\folders\photos.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\folders\tv.png">
<Link>Resources\dashboard-ui\css\images\items\folders\tv.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\list\audio.png">
<Link>Resources\dashboard-ui\css\images\items\list\audio.png</Link>
</BundleResource>
@ -1038,18 +1019,12 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\notifications\info.png">
<Link>Resources\dashboard-ui\css\images\notifications\info.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\supporter\donatepaypal.png">
<Link>Resources\dashboard-ui\css\images\supporter\donatepaypal.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\supporter\nonsupporterbadge.png">
<Link>Resources\dashboard-ui\css\images\supporter\nonsupporterbadge.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\supporter\premiumflag.png">
<Link>Resources\dashboard-ui\css\images\supporter\premiumflag.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\supporter\registerpaypal.png">
<Link>Resources\dashboard-ui\css\images\supporter\registerpaypal.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\supporter\supporterbadge.png">
<Link>Resources\dashboard-ui\css\images\supporter\supporterbadge.png</Link>
</BundleResource>
@ -1182,6 +1157,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\dashboardgeneral.js">
<Link>Resources\dashboard-ui\scripts\dashboardgeneral.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\dashboardhosting.js">
<Link>Resources\dashboard-ui\scripts\dashboardhosting.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\dashboardpage.js">
<Link>Resources\dashboard-ui\scripts\dashboardpage.js</Link>
</BundleResource>
@ -1272,9 +1250,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\itemdetailpage.js">
<Link>Resources\dashboard-ui\scripts\itemdetailpage.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\itemgallery.js">
<Link>Resources\dashboard-ui\scripts\itemgallery.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\itemlistpage.js">
<Link>Resources\dashboard-ui\scripts\itemlistpage.js</Link>
</BundleResource>
@ -1365,8 +1340,8 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\metadataimagespage.js">
<Link>Resources\dashboard-ui\scripts\metadataimagespage.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\metadatakodi.js">
<Link>Resources\dashboard-ui\scripts\metadatakodi.js</Link>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\metadatanfo.js">
<Link>Resources\dashboard-ui\scripts\metadatanfo.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\metadatasubtitles.js">
<Link>Resources\dashboard-ui\scripts\metadatasubtitles.js</Link>
@ -1512,6 +1487,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\syncsettings.js">
<Link>Resources\dashboard-ui\scripts\syncsettings.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\taskbutton.js">
<Link>Resources\dashboard-ui\scripts\taskbutton.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\thememediaplayer.js">
<Link>Resources\dashboard-ui\scripts\thememediaplayer.js</Link>
</BundleResource>
@ -1596,6 +1574,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\device.js">
<Link>Resources\dashboard-ui\thirdparty\apiclient\device.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\logger.js">
<Link>Resources\dashboard-ui\thirdparty\apiclient\logger.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\md5.js">
<Link>Resources\dashboard-ui\thirdparty\apiclient\md5.js</Link>
</BundleResource>

11
MediaBrowser.Server.Mac/Native/NetworkManager.cs
View File

@ -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
{
@ -35,5 +36,15 @@ namespace MediaBrowser.Server.Mac
{
return new List<FileSystemEntryInfo> ();
}
/// <summary>
/// Generates a self signed certificate at the locatation specified by <paramref name="certificatePath"/>.
/// </summary>
/// <param name="certificatePath">The path to generate the certificate.</param>
/// <param name="hostname">The common name for the certificate.</param>
public void GenerateSelfSignedSslCertificate(string certificatePath, string hostname)
{
CertificateGenerator.CreateSelfSignCertificatePfx(certificatePath, hostname, Logger);
}
}
}