mirror of
https://github.com/osukey/osukey.git
synced 2025-07-02 00:40:09 +09:00
Fix exported replays being wrapped in zip packages
This commit is contained in:
@ -422,15 +422,25 @@ namespace osu.Game.Database
|
|||||||
if (retrievedItem == null)
|
if (retrievedItem == null)
|
||||||
throw new ArgumentException("Specified model could not be found", nameof(item));
|
throw new ArgumentException("Specified model could not be found", nameof(item));
|
||||||
|
|
||||||
|
using (var outputStream = exportStorage.GetStream($"{getValidFilename(item.ToString())}{HandledExtensions.First()}", FileAccess.Write, FileMode.Create))
|
||||||
|
ExportModelTo(retrievedItem, outputStream);
|
||||||
|
|
||||||
|
exportStorage.OpenInNativeExplorer();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Exports an item to the given output stream.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="model">The item to export.</param>
|
||||||
|
/// <param name="outputStream">The output stream to export to.</param>
|
||||||
|
protected virtual void ExportModelTo(TModel model, Stream outputStream)
|
||||||
|
{
|
||||||
using (var archive = ZipArchive.Create())
|
using (var archive = ZipArchive.Create())
|
||||||
{
|
{
|
||||||
foreach (var file in retrievedItem.Files)
|
foreach (var file in model.Files)
|
||||||
archive.AddEntry(file.Filename, Files.Storage.GetStream(file.FileInfo.StoragePath));
|
archive.AddEntry(file.Filename, Files.Storage.GetStream(file.FileInfo.StoragePath));
|
||||||
|
|
||||||
using (var outputStream = exportStorage.GetStream($"{getValidFilename(item.ToString())}{HandledExtensions.First()}", FileAccess.Write, FileMode.Create))
|
archive.SaveTo(outputStream);
|
||||||
archive.SaveTo(outputStream);
|
|
||||||
|
|
||||||
exportStorage.OpenInNativeExplorer();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -72,6 +72,16 @@ namespace osu.Game.Scoring
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override void ExportModelTo(ScoreInfo model, Stream outputStream)
|
||||||
|
{
|
||||||
|
var file = model.Files.SingleOrDefault();
|
||||||
|
if (file == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
using (var inputStream = Files.Storage.GetStream(file.FileInfo.StoragePath))
|
||||||
|
inputStream.CopyTo(outputStream);
|
||||||
|
}
|
||||||
|
|
||||||
protected override IEnumerable<string> GetStableImportPaths(Storage storage)
|
protected override IEnumerable<string> GetStableImportPaths(Storage storage)
|
||||||
=> storage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false))
|
=> storage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false))
|
||||||
.Select(path => storage.GetFullPath(path));
|
.Select(path => storage.GetFullPath(path));
|
||||||
|
Reference in New Issue
Block a user