Merge pull request #4170 from BaronGreenback/VersioningImprovement

Plugin versioning - amended for plugins without meta.json
This commit is contained in:
dkanada 2020-09-23 20:06:35 +09:00 committed by GitHub
commit 236dfe3ed8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1086,9 +1086,20 @@ namespace Emby.Server.Implementations
} }
else else
{ {
// No metafile, so lets see if the folder is versioned.
metafile = dir.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)[^1]; metafile = dir.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)[^1];
// Add it under the path name and version 0.0.0.1.
versions.Add((new Version(0, 0, 0, 1), metafile, dir)); int versionIndex = dir.LastIndexOf('_');
if (versionIndex != -1 && Version.TryParse(dir.Substring(versionIndex + 1), out Version ver))
{
// Versioned folder.
versions.Add((ver, metafile, dir));
}
else
{
// Un-versioned folder - Add it under the path name and version 0.0.0.1.
versions.Add((new Version(0, 0, 0, 1), metafile, dir));
}
} }
} }
catch catch