Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1467 from MediaBrowser/dev

Browse Source 
merge from dev
This commit is contained in:
Luke 2016-02-15 12:56:03 -05:00
commit 8a2eeba914
4 changed files with 33 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Model/Configuration/UserConfiguration.cs
View File

@ -42,8 +42,6 @@ namespace MediaBrowser.Model.Configuration
public bool IncludeTrailersInSuggestions { get; set; } public bool IncludeTrailersInSuggestions { get; set; }
public bool EnableCinemaMode { get; set; }
public string[] LatestItemsExcludes { get; set; } public string[] LatestItemsExcludes { get; set; }
public string[] PlainFolderViews { get; set; } public string[] PlainFolderViews { get; set; }
@ -64,7 +62,6 @@ namespace MediaBrowser.Model.Configuration
PlainFolderViews = new string[] { }; PlainFolderViews = new string[] { };
IncludeTrailersInSuggestions = true; IncludeTrailersInSuggestions = true;
EnableCinemaMode = true;
GroupedFolders = new string[] { }; GroupedFolders = new string[] { };
} }

62
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
View File

@ -41,29 +41,21 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
void _deviceDiscovery_DeviceDiscovered(object sender, SsdpMessageEventArgs e) void _deviceDiscovery_DeviceDiscovered(object sender, SsdpMessageEventArgs e)
{ {
//string server = null; string st = null;
//if (e.Headers.TryGetValue("SERVER", out server) && server.IndexOf("HDHomeRun", StringComparison.OrdinalIgnoreCase) != -1) if (e.Headers.TryGetValue("ST", out st) && string.Equals(st, "urn:ses-com:device:SatIPServer:1", StringComparison.OrdinalIgnoreCase))
//{ {
// string location; string location;
// if (e.Headers.TryGetValue("Location", out location)) if (e.Headers.TryGetValue("Location", out location) && !string.IsNullOrWhiteSpace(location))
// { {
// //_logger.Debug("HdHomerun found at {0}", location); _logger.Debug("SAT IP found at {0}", location);
// // Just get the beginning of the url // Just get the beginning of the url
// Uri uri; AddDevice(location);
// if (Uri.TryCreate(location, UriKind.Absolute, out uri)) }
// { }
// var apiUrl = location.Replace(uri.LocalPath, String.Empty, StringComparison.OrdinalIgnoreCase)
// .TrimEnd('/');
// //_logger.Debug("HdHomerun api url: {0}", apiUrl);
// AddDevice(apiUrl);
// }
// }
//}
} }
private async void AddDevice(string url) private async void AddDevice(string location)
{ {
await _semaphore.WaitAsync().ConfigureAwait(false); await _semaphore.WaitAsync().ConfigureAwait(false);
@ -71,24 +63,24 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
{ {
var options = GetConfiguration(); var options = GetConfiguration();
if (options.TunerHosts.Any(i => //if (options.TunerHosts.Any(i =>
string.Equals(i.Type, SatIpHost.DeviceType, StringComparison.OrdinalIgnoreCase) && // string.Equals(i.Type, SatIpHost.DeviceType, StringComparison.OrdinalIgnoreCase) &&
UriEquals(i.Url, url))) // UriEquals(i.Url, url)))
{ //{
return; // return;
} //}
// Strip off the port //// Strip off the port
url = new Uri(url).GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Port, UriFormat.UriEscaped).TrimEnd('/'); //url = new Uri(url).GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Port, UriFormat.UriEscaped).TrimEnd('/');
await TestUrl(url).ConfigureAwait(false); //await TestUrl(url).ConfigureAwait(false);
await _liveTvManager.SaveTunerHost(new TunerHostInfo
{
Type = SatIpHost.DeviceType,
Url = url
}).ConfigureAwait(false); //await _liveTvManager.SaveTunerHost(new TunerHostInfo
//{
// Type = SatIpHost.DeviceType,
// Url = url
//}).ConfigureAwait(false);
} }
catch (Exception ex) catch (Exception ex)
{ {

6
MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs
View File

@ -33,7 +33,7 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
case OperatingSystem.Linux: case OperatingSystem.Linux:
info.ArchiveType = "7z"; info.ArchiveType = "7z";
info.Version = "20150917"; info.Version = "20160215";
break; break;
case OperatingSystem.Osx: case OperatingSystem.Osx:
@ -119,12 +119,12 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
case Architecture.X86_X64: case Architecture.X86_X64:
return new[] return new[]
{ {
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-2.8.0-64bit-static.7z" "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-git-20160215-64bit-static.7z"
}; };
case Architecture.X86: case Architecture.X86:
return new[] return new[]
{ {
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-2.8.0-32bit-static.7z" "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-git-20160215-32bit-static.7z"
}; };
case Architecture.Arm: case Architecture.Arm:
return new[] return new[]

6
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -113,6 +113,9 @@
<Content Include="dashboard-ui\components\filterdialog\filterdialog.template.html"> <Content Include="dashboard-ui\components\filterdialog\filterdialog.template.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\components\filterdialog\style.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\components\guestinviter\guestinviter.js"> <Content Include="dashboard-ui\components\guestinviter\guestinviter.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -511,9 +514,6 @@
<Content Include="dashboard-ui\scripts\photos.js"> <Content Include="dashboard-ui\scripts\photos.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\scripts\queryfilters.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\registrationservices.js"> <Content Include="dashboard-ui\scripts\registrationservices.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>