Merge pull request #961 from jellyfin/release-10.2.z

Release 10.2.1
pull/962/head
Joshua M. Boniface 6 years ago committed by GitHub
commit d4ded281aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -9,7 +9,7 @@ RUN dotnet publish \
--output /jellyfin \
Jellyfin.Server
FROM jrottenberg/ffmpeg:4.0-vaapi as ffmpeg
FROM jellyfin/ffmpeg as ffmpeg
FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
# libfontconfig1 is required for Skia
RUN apt-get update \

@ -175,25 +175,52 @@ namespace Emby.Naming.Video
return videos;
}
var list = new List<VideoInfo>();
var folderName = Path.GetFileName(Path.GetDirectoryName(videos[0].Files[0].Path));
if (!string.IsNullOrEmpty(folderName) && folderName.Length > 1)
{
var ordered = videos.OrderBy(i => i.Name);
return ordered.GroupBy(v => new {v.Name, v.Year}).Select(group => new VideoInfo
if (videos.All(i => i.Files.Count == 1 && IsEligibleForMultiVersion(folderName, i.Files[0].Path)))
{
Name = folderName,
Year = group.First().Year,
Files = group.First().Files,
AlternateVersions = group.Skip(1).Select(i => i.Files[0]).ToList(),
Extras = group.First().Extras.Concat(group.Skip(1).SelectMany(i => i.Extras)).ToList()
});
if (HaveSameYear(videos))
{
var ordered = videos.OrderBy(i => i.Name).ToList();
list.Add(ordered[0]);
list[0].AlternateVersions = ordered.Skip(1).Select(i => i.Files[0]).ToList();
list[0].Name = folderName;
list[0].Extras.AddRange(ordered.Skip(1).SelectMany(i => i.Extras));
return list;
}
}
}
return videos;
}
private bool HaveSameYear(List<VideoInfo> videos)
{
return videos.Select(i => i.Year ?? -1).Distinct().Count() < 2;
}
private bool IsEligibleForMultiVersion(string folderName, string testFilename)
{
testFilename = Path.GetFileNameWithoutExtension(testFilename) ?? string.Empty;
if (testFilename.StartsWith(folderName, StringComparison.OrdinalIgnoreCase))
{
testFilename = testFilename.Substring(folderName.Length).Trim();
return string.IsNullOrEmpty(testFilename) ||
testFilename.StartsWith("-") ||
string.IsNullOrWhiteSpace(Regex.Replace(testFilename, @"\[([^]]*)\]", string.Empty)) ;
}
return false;
}
private List<VideoFileInfo> GetExtras(IEnumerable<VideoFileInfo> remainingFiles, List<string> baseNames)
{
foreach (var name in baseNames.ToList())

@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("10.2.0")]
[assembly: AssemblyFileVersion("10.2.0")]
[assembly: AssemblyVersion("10.2.1")]
[assembly: AssemblyFileVersion("10.2.1")]

@ -1,3 +1,19 @@
jellyfin (10.2.1-1) unstable; urgency=medium
* jellyfin:
* PR920 Fix cachedir missing from Docker container
* PR924 Use the movie name instead of folder name
* PR933 Semi-revert to prefer old movie grouping behaviour
* PR948 Revert movie matching (supercedes PR933, PR924, PR739)
* PR960 Use jellyfin/ffmpeg image
* jellyfin-web:
* PR136 Re-add OpenSubtitles configuration page
* PR137 Replace HeaderEmbyServer with HeaderJellyfinServer on plugincatalog
* PR138 Remove left-over JS for Customize Home Screen
* PR141 Exit fullscreen automatically after video playback ends
-- Jellyfin Packaging Team <packaging@jellyfin.org> Wed, 20 Feb 2019 11:36:16 -0500
jellyfin (10.2.0-2) unstable; urgency=medium
* jellyfin:

@ -7,8 +7,8 @@
%endif
Name: jellyfin
Version: 10.2.0
Release: 2%{?dist}
Version: 10.2.1
Release: 1%{?dist}
Summary: The Free Software Media Browser
License: GPLv2
URL: https://jellyfin.media
@ -140,6 +140,18 @@ fi
%systemd_postun_with_restart jellyfin.service
%changelog
* Wed Feb 20 2019 Jellyfin Packaging Team <packaging@jellyfin.org>
- jellyfin:
- PR920 Fix cachedir missing from Docker container
- PR924 Use the movie name instead of folder name
- PR933 Semi-revert to prefer old movie grouping behaviour
- PR948 Revert movie matching (supercedes PR933, PR924, PR739)
- PR960 Use jellyfin/ffmpeg image
- jellyfin-web:
- PR136 Re-add OpenSubtitles configuration page
- PR137 Replace HeaderEmbyServer with HeaderJellyfinServer on plugincatalog
- PR138 Remove left-over JS for Customize Home Screen
- PR141 Exit fullscreen automatically after video playback ends
* Fri Feb 15 2019 Jellyfin Packaging Team <packaging@jellyfin.org>
- jellyfin:
- PR452 Use EF Core for Activity database

Loading…
Cancel
Save