unkin/jellyfin-ha-src
4
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

update sat/ip

Browse Source
This commit is contained in:
Luke Pulverenti
2016-03-31 19:26:13 -04:00
parent 31e98681fa
commit 1381447bda
8 changed files with 114 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+7 -6
View File
@@ -2450,7 +2450,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
public List<NameValuePair> GetSatIniMappings()
{
var names = GetType().Assembly.GetManifestResourceNames().Where(i => i.IndexOf("SatIp.ini.satellite", StringComparison.OrdinalIgnoreCase) != -1).ToList();
var names = GetType().Assembly.GetManifestResourceNames().Where(i => i.IndexOf("SatIp.ini", StringComparison.OrdinalIgnoreCase) != -1).ToList();
return names.Select(GetSatIniMappings).Where(i => i != null).DistinctBy(i => i.Value.Split('|')[0]).ToList();
}
@@ -2472,20 +2472,21 @@ namespace MediaBrowser.Server.Implementations.LiveTv
return null;
}
var srch = "SatIp.ini.";
var filename = Path.GetFileName(resource);
return new NameValuePair
{
Name = satType1 + " " + satType2,
Value = satType2 + "|" + Path.GetFileName(resource)
Value = satType2 + "|" + filename.Substring(filename.IndexOf(srch) + srch.Length)
};
}
}
}
public async Task<List<ChannelInfo>> GetSatChannelScanResult(TunerHostInfo info, CancellationToken cancellationToken)
public Task<List<ChannelInfo>> GetSatChannelScanResult(TunerHostInfo info, CancellationToken cancellationToken)
{
var result = await new TunerHosts.SatIp.ChannelScan().Scan(info, cancellationToken).ConfigureAwait(false);
return result.Select(i => new ChannelInfo()).ToList();
return new TunerHosts.SatIp.ChannelScan(_logger).Scan(info, cancellationToken);
}
}
}