alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-30 11:22:53 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix restore backup metadata location

Browse Source
This commit is contained in:
theguymadmax
2026-03-16 10:32:09 -04:00
parent fda49a5a49
commit e8d72bf6a3
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Jellyfin.Server.Implementations/FullSystemBackup/BackupService.cs
View File

@@ -118,15 +118,21 @@ public class BackupService : IBackupService
throw new NotSupportedException($"The loaded archive '{archivePath}' is made for a newer version of Jellyfin ({manifest.ServerVersion}) and cannot be loaded in this version."); throw new NotSupportedException($"The loaded archive '{archivePath}' is made for a newer version of Jellyfin ({manifest.ServerVersion}) and cannot be loaded in this version.");
} }
void CopyDirectory(string source, string target) void CopyDirectory(string source, string target, string? exclude = null)
{ {
var fullSourcePath = NormalizePathSeparator(Path.GetFullPath(source) + Path.DirectorySeparatorChar); var fullSourcePath = NormalizePathSeparator(Path.GetFullPath(source) + Path.DirectorySeparatorChar);
var fullTargetRoot = Path.GetFullPath(target) + Path.DirectorySeparatorChar; var fullTargetRoot = Path.GetFullPath(target) + Path.DirectorySeparatorChar;
var excludePath = exclude is null ? null : $"{source}/{exclude}/";
foreach (var item in zipArchive.Entries) foreach (var item in zipArchive.Entries)
{ {
var sourcePath = NormalizePathSeparator(Path.GetFullPath(item.FullName)); var sourcePath = NormalizePathSeparator(Path.GetFullPath(item.FullName));
var targetPath = Path.GetFullPath(Path.Combine(target, Path.GetRelativePath(source, item.FullName))); var targetPath = Path.GetFullPath(Path.Combine(target, Path.GetRelativePath(source, item.FullName)));
if (excludePath is not null && item.FullName.StartsWith(excludePath, StringComparison.Ordinal))
{
continue;
}
if (!sourcePath.StartsWith(fullSourcePath, StringComparison.Ordinal) if (!sourcePath.StartsWith(fullSourcePath, StringComparison.Ordinal)
|| !targetPath.StartsWith(fullTargetRoot, StringComparison.Ordinal) || !targetPath.StartsWith(fullTargetRoot, StringComparison.Ordinal)
|| Path.EndsInDirectorySeparator(item.FullName)) || Path.EndsInDirectorySeparator(item.FullName))
@@ -142,8 +148,9 @@ public class BackupService : IBackupService
} }
CopyDirectory("Config", _applicationPaths.ConfigurationDirectoryPath); CopyDirectory("Config", _applicationPaths.ConfigurationDirectoryPath);
CopyDirectory("Data", _applicationPaths.DataPath); CopyDirectory("Data", _applicationPaths.DataPath, exclude: "metadata");
CopyDirectory("Root", _applicationPaths.RootFolderPath); CopyDirectory("Root", _applicationPaths.RootFolderPath);
CopyDirectory("Data/metadata", _applicationPaths.InternalMetadataPath);
if (manifest.Options.Database) if (manifest.Options.Database)
{ {