|
@@ -559,7 +559,6 @@ namespace FNZCM.ConHost.Ver2
|
|
|
|
|
|
if (mediaTag != null && false == string.IsNullOrWhiteSpace(mediaTag.Title))
|
|
|
{
|
|
|
-
|
|
|
sb.AppendLine($"<li>" +
|
|
|
$"<span class=\"simp-source\" data-src=\"{mediaPath}\">{mediaTag.Title}</span>" +
|
|
|
$"<span class=\"simp-desc\">{mediaTag.Artist}</span>" +
|
|
@@ -606,11 +605,15 @@ namespace FNZCM.ConHost.Ver2
|
|
|
|
|
|
foreach (var track in tracks.OrderBy(p => p.Key))
|
|
|
{
|
|
|
+ var coverPath = $"/cover/{libName.FuckVlcAndEscape()}/{discPath.FuckVlcAndEscape()}/cover.jpg";
|
|
|
var mediaTag = GetTag($"/media/{libName}/{discPath}/{track.Key}");
|
|
|
if (mediaTag != null && false == string.IsNullOrWhiteSpace(mediaTag.Title))
|
|
|
{
|
|
|
- var coverPath = $"/cover/{libName.FuckVlcAndEscape()}/{discPath.FuckVlcAndEscape()}/cover.jpg";
|
|
|
- sb.AppendLine($"#EXTINF:{mediaTag.Duration} tvg-logo=\"{prefix + coverPath}\",{mediaTag.Title}");
|
|
|
+ sb.AppendLine($"#EXTINF:{mediaTag.Duration} tvg-logo=\"{prefix + coverPath}\",{mediaTag.Artist} - {mediaTag.Title}");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ sb.AppendLine($"#EXTINF:0 logo=\"{prefix + coverPath}\",{Path.GetFileNameWithoutExtension(track.Key)}");
|
|
|
}
|
|
|
|
|
|
var mediaPath = $"/media/{libName.FuckVlcAndEscape()}/{discPath.FuckVlcAndEscape()}/{track.Key.FuckVlcAndEscape()}";
|
|
@@ -637,7 +640,6 @@ namespace FNZCM.ConHost.Ver2
|
|
|
{
|
|
|
var sb = new StringBuilder();
|
|
|
|
|
|
-
|
|
|
//var prefix = $"{request.Url.GetLeftPart(UriPartial.Scheme | UriPartial.Authority)}";
|
|
|
|
|
|
foreach (var discKvp in lib.Discs.OrderByDescending(p => p.Key))
|
|
@@ -709,13 +711,18 @@ namespace FNZCM.ConHost.Ver2
|
|
|
foreach (var track in tracks.OrderBy(p => p.Key))
|
|
|
{
|
|
|
var mediaTag = GetTag($"/media/{libName}/{discPath}/{trackSetName}/{track.Key}");
|
|
|
+ var coverPath = $"/cover/{libName.FuckVlcAndEscape()}/{discPath.FuckVlcAndEscape()}/cover.jpg";
|
|
|
+ var mediaPath = $"/media/{libName.FuckVlcAndEscape()}/{discPath.FuckVlcAndEscape()}/{trackSetName.FuckVlcAndEscape()}/{track.Key.FuckVlcAndEscape()}";
|
|
|
+
|
|
|
if (mediaTag != null && false == string.IsNullOrWhiteSpace(mediaTag.Title))
|
|
|
{
|
|
|
- var coverPath = $"/cover/{libName.FuckVlcAndEscape()}/{discPath.FuckVlcAndEscape()}/cover.jpg";
|
|
|
- sb.AppendLine($"#EXTINF:{mediaTag.Duration} tvg-logo=\"{prefix + coverPath}\",{mediaTag.Title}");
|
|
|
+ sb.AppendLine($"#EXTINF:{mediaTag.Duration} logo=\"{prefix + coverPath}\",{mediaTag.Artist} - {mediaTag.Title}");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ sb.AppendLine($"#EXTINF:0 logo=\"{prefix + coverPath}\",{Path.GetFileNameWithoutExtension(track.Key)}");
|
|
|
}
|
|
|
|
|
|
- var mediaPath = $"/media/{libName.FuckVlcAndEscape()}/{discPath.FuckVlcAndEscape()}/{trackSetName.FuckVlcAndEscape()}/{track.Key.FuckVlcAndEscape()}";
|
|
|
sb.AppendLine(prefix + mediaPath);
|
|
|
}
|
|
|
}
|
|
@@ -798,11 +805,11 @@ namespace FNZCM.ConHost.Ver2
|
|
|
var mediaTag = GetTag($"/media/{libName}/{discPath}/{track.Key}");
|
|
|
if (mediaTag != null && false == string.IsNullOrWhiteSpace(mediaTag.Title))
|
|
|
{
|
|
|
- sb.AppendLine($"#EXTINF:{mediaTag.Duration} logo=\"{prefix + coverPath}\" tvg-logo=\"{prefix + coverPath}\",{mediaTag.Artist} - {mediaTag.Title}");
|
|
|
+ sb.AppendLine($"#EXTINF:{mediaTag.Duration} logo=\"{prefix + coverPath}\",{mediaTag.Artist} - {mediaTag.Title}");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- sb.AppendLine($"#EXTINF:0, logo=\"{prefix + coverPath}\" tvg-logo=\"{prefix + coverPath}\"");
|
|
|
+ sb.AppendLine($"#EXTINF:0 logo=\"{prefix + coverPath}\",{Path.GetFileNameWithoutExtension(track.Key)}");
|
|
|
}
|
|
|
|
|
|
var mediaPath = $"/media/{libName.FuckVlcAndEscape()}/{discPath.FuckVlcAndEscape()}/{track.Key.FuckVlcAndEscape()}";
|
|
@@ -897,10 +904,15 @@ namespace FNZCM.ConHost.Ver2
|
|
|
foreach (var track in trackSet.Tracks.OrderBy(p => p.Key))
|
|
|
{
|
|
|
var mediaTag = GetTag($"/media/{libName}/{discPath}/{subSetPath}/{track.Key}");
|
|
|
+ var coverPath = $"/cover/{libName.FuckVlcAndEscape()}/{discPath.FuckVlcAndEscape()}/cover.jpg";
|
|
|
+
|
|
|
if (mediaTag != null && false == string.IsNullOrWhiteSpace(mediaTag.Title))
|
|
|
{
|
|
|
- var coverPath = $"/cover/{libName.FuckVlcAndEscape()}/{discPath.FuckVlcAndEscape()}/cover.jpg";
|
|
|
- sb.AppendLine($"#EXTINF:{mediaTag.Duration} tvg-logo=\"{prefix + coverPath}\",{mediaTag.Title}");
|
|
|
+ sb.AppendLine($"#EXTINF:{mediaTag.Duration} logo=\"{prefix + coverPath}\",{mediaTag.Artist} - {mediaTag.Title}");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ sb.AppendLine($"#EXTINF:0 logo=\"{prefix + coverPath}\",{Path.GetFileNameWithoutExtension(track.Key)}");
|
|
|
}
|
|
|
|
|
|
var mediaPath = $"/media/{libName.FuckVlcAndEscape()}/{discPath.FuckVlcAndEscape()}/{subSetPath.FuckVlcAndEscape()}/{track.Key.FuckVlcAndEscape()}";
|