michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1601 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-03-26 13:51:55 -04:00
commit c5ce8be211
10 changed files with 87 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Dlna/Server/UpnpDevice.cs
View File

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

4
MediaBrowser.Dlna/Ssdp/SsdpHandler.cs
View File

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

92
MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
View File

@ -78,12 +78,12 @@
<HintPath>..\ThirdParty\Mono.Security\Mono.Security.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="CommonIO">
<HintPath>..\packages\CommonIO.1.0.0.8\lib\net45\CommonIO.dll</HintPath>
</Reference>
<Reference Include="Patterns.Logging">
<HintPath>..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath>
</Reference>
<Reference Include="CommonIO">
<HintPath>..\packages\CommonIO.1.0.0.9\lib\net45\CommonIO.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
@ -1364,6 +1364,21 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\confirm\nativeconfirm.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\confirm\nativeconfirm.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\dialoghelper\dialoghelper.css">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\dialoghelper\dialoghelper.css</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\dialoghelper\dialoghelper.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\dialoghelper\dialoghelper.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\fonts\material-icons\2fcrYFNaTjcS6g4U3t-Y5ZjZjT5FdEJ140U2DJYC3mY.woff2">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\material-icons\2fcrYFNaTjcS6g4U3t-Y5ZjZjT5FdEJ140U2DJYC3mY.woff2</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\fonts\material-icons\2fcrYFNaTjcS6g4U3t-Y5ewrjPiaoEww8AihgqWRJAo.woff">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\material-icons\2fcrYFNaTjcS6g4U3t-Y5ewrjPiaoEww8AihgqWRJAo.woff</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\fonts\material-icons\style.css">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\material-icons\style.css</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\fonts\montserrat\IQHow_FEYlDC4Gzy_m8fcgFhaRv2pGgT5Kf0An0s4MM.woff">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\montserrat\IQHow_FEYlDC4Gzy_m8fcgFhaRv2pGgT5Kf0An0s4MM.woff</Link>
</BundleResource>
@ -1568,12 +1583,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\page.js\page.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\page.js\page.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\paperdialoghelper\paperdialoghelper.css">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\paperdialoghelper\paperdialoghelper.css</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\paperdialoghelper\paperdialoghelper.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\paperdialoghelper\paperdialoghelper.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\prompt\icons.html">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\prompt\icons.html</Link>
</BundleResource>
@ -1778,6 +1787,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hls.js\src\controller\buffer-controller.js">
<Link>Resources\dashboard-ui\bower_components\hls.js\src\controller\buffer-controller.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hls.js\src\controller\cap-level-controller.js">
<Link>Resources\dashboard-ui\bower_components\hls.js\src\controller\cap-level-controller.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hls.js\src\controller\fps-controller.js">
<Link>Resources\dashboard-ui\bower_components\hls.js\src\controller\fps-controller.js</Link>
</BundleResource>
@ -1823,6 +1835,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hls.js\src\demux\tsdemuxer.js">
<Link>Resources\dashboard-ui\bower_components\hls.js\src\demux\tsdemuxer.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hls.js\src\helper\buffer-helper.js">
<Link>Resources\dashboard-ui\bower_components\hls.js\src\helper\buffer-helper.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\hls.js\src\helper\level-helper.js">
<Link>Resources\dashboard-ui\bower_components\hls.js\src\helper\level-helper.js</Link>
</BundleResource>
@ -2498,6 +2513,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-input\demo\index.html">
<Link>Resources\dashboard-ui\bower_components\iron-input\demo\index.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-input\test\disabled-input.html">
<Link>Resources\dashboard-ui\bower_components\iron-input\test\disabled-input.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-input\test\index.html">
<Link>Resources\dashboard-ui\bower_components\iron-input\test\index.html</Link>
</BundleResource>
@ -2570,6 +2588,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-menu-behavior\iron-menubar-behavior.html">
<Link>Resources\dashboard-ui\bower_components\iron-menu-behavior\iron-menubar-behavior.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-menu-behavior\.github\ISSUE_TEMPLATE.md">
<Link>Resources\dashboard-ui\bower_components\iron-menu-behavior\.github\ISSUE_TEMPLATE.md</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-menu-behavior\demo\index.html">
<Link>Resources\dashboard-ui\bower_components\iron-menu-behavior\demo\index.html</Link>
</BundleResource>
@ -2663,6 +2684,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-overlay-behavior\iron-overlay-manager.html">
<Link>Resources\dashboard-ui\bower_components\iron-overlay-behavior\iron-overlay-manager.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-overlay-behavior\.github\ISSUE_TEMPLATE.md">
<Link>Resources\dashboard-ui\bower_components\iron-overlay-behavior\.github\ISSUE_TEMPLATE.md</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-overlay-behavior\demo\index.html">
<Link>Resources\dashboard-ui\bower_components\iron-overlay-behavior\demo\index.html</Link>
</BundleResource>
@ -4487,6 +4511,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-dialog-behavior\paper-dialog-shared-styles.html">
<Link>Resources\dashboard-ui\bower_components\paper-dialog-behavior\paper-dialog-shared-styles.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-dialog-behavior\.github\ISSUE_TEMPLATE.md">
<Link>Resources\dashboard-ui\bower_components\paper-dialog-behavior\.github\ISSUE_TEMPLATE.md</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-dialog-behavior\demo\index.html">
<Link>Resources\dashboard-ui\bower_components\paper-dialog-behavior\demo\index.html</Link>
</BundleResource>
@ -9197,38 +9224,38 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\enjoy.jpg">
<Link>Resources\dashboard-ui\css\images\tour\enjoy.jpg</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\dashboard\chapters.png">
<Link>Resources\dashboard-ui\css\images\tour\dashboard\chapters.png</Link>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\admin\chapters.png">
<Link>Resources\dashboard-ui\css\images\tour\admin\chapters.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\dashboard\cinemamode.png">
<Link>Resources\dashboard-ui\css\images\tour\dashboard\cinemamode.png</Link>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\admin\cinemamode.png">
<Link>Resources\dashboard-ui\css\images\tour\admin\cinemamode.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\dashboard\dashboard.png">
<Link>Resources\dashboard-ui\css\images\tour\dashboard\dashboard.png</Link>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\admin\dashboard.png">
<Link>Resources\dashboard-ui\css\images\tour\admin\dashboard.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\dashboard\help.png">
<Link>Resources\dashboard-ui\css\images\tour\dashboard\help.png</Link>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\admin\help.png">
<Link>Resources\dashboard-ui\css\images\tour\admin\help.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\dashboard\mobile.png">
<Link>Resources\dashboard-ui\css\images\tour\dashboard\mobile.png</Link>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\admin\mobile.png">
<Link>Resources\dashboard-ui\css\images\tour\admin\mobile.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\dashboard\notifications.png">
<Link>Resources\dashboard-ui\css\images\tour\dashboard\notifications.png</Link>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\admin\notifications.png">
<Link>Resources\dashboard-ui\css\images\tour\admin\notifications.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\dashboard\plugins.png">
<Link>Resources\dashboard-ui\css\images\tour\dashboard\plugins.png</Link>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\admin\plugins.png">
<Link>Resources\dashboard-ui\css\images\tour\admin\plugins.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\dashboard\scheduledtasks.png">
<Link>Resources\dashboard-ui\css\images\tour\dashboard\scheduledtasks.png</Link>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\admin\scheduledtasks.png">
<Link>Resources\dashboard-ui\css\images\tour\admin\scheduledtasks.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\dashboard\subtitles.png">
<Link>Resources\dashboard-ui\css\images\tour\dashboard\subtitles.png</Link>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\admin\subtitles.png">
<Link>Resources\dashboard-ui\css\images\tour\admin\subtitles.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\dashboard\sync.png">
<Link>Resources\dashboard-ui\css\images\tour\dashboard\sync.png</Link>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\admin\sync.png">
<Link>Resources\dashboard-ui\css\images\tour\admin\sync.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\dashboard\users.png">
<Link>Resources\dashboard-ui\css\images\tour\dashboard\users.png</Link>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\admin\users.png">
<Link>Resources\dashboard-ui\css\images\tour\admin\users.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\tour\web\tourcollections.jpg">
<Link>Resources\dashboard-ui\css\images\tour\web\tourcollections.jpg</Link>
@ -9308,6 +9335,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\legacy\objectassign.js">
<Link>Resources\dashboard-ui\legacy\objectassign.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\legacy\selectmenu.js">
<Link>Resources\dashboard-ui\legacy\selectmenu.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\aboutpage.js">
<Link>Resources\dashboard-ui\scripts\aboutpage.js</Link>
</BundleResource>

2
MediaBrowser.Server.Mono/Native/BaseMonoApp.cs
View File

@ -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)
{
}

1
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

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

2
MediaBrowser.Server.Startup.Common/INativeApp.cs
View File

@ -21,7 +21,7 @@ namespace MediaBrowser.Server.Startup.Common
/// <param name="httpServerPort">The HTTP server port.</param>
/// <param name="httpsServerPort">The HTTPS server port.</param>
/// <param name="tempDirectory">The temporary directory.</param>
void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string tempDirectory);
void AuthorizeServer(int udpPort, int httpServerPort, int httpsServerPort, string applicationPath, string tempDirectory);
/// <summary>
/// Gets the environment.

7
MediaBrowser.ServerApplication/Native/RegisterServer.bat
View File

@ -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

4
MediaBrowser.ServerApplication/Native/ServerAuthorization.cs
View File

@ -17,7 +17,7 @@ namespace MediaBrowser.ServerApplication.Native
/// <param name="httpServerPort">The HTTP server port.</param>
/// <param name="httpsServerPort">The HTTPS server port.</param>
/// <param name="tempDirectory">The temp directory.</param>
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,

4
MediaBrowser.ServerApplication/Native/WindowsApp.cs
View File

@ -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

4
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5920")]
[assembly: AssemblyVersion("3.0.*")]
//[assembly: AssemblyVersion("3.0.5910")]