sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix importing archives which are nested in a single folder within a zip

Browse Source
This commit is contained in:
Dean Herbert
2019-09-19 17:35:45 +09:00
parent 0640b2eb35
commit ddff9882cf
2 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Database/ArchiveModelManager.cs
View File

@ -11,6 +11,7 @@ using JetBrains.Annotations;
using Microsoft.EntityFrameworkCore;
using osu.Framework;
using osu.Framework.Extensions;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.IO.File;
using osu.Framework.Logging;
using osu.Framework.Platform;
@ -481,12 +482,16 @@ namespace osu.Game.Database
{
var fileInfos = new List<TFileModel>();
string prefix = reader.Filenames.GetCommonPrefix();
if (!(prefix.EndsWith("/") || prefix.EndsWith("\\")))
prefix = string.Empty;
// import files to manager
foreach (string file in reader.Filenames)
using (Stream s = reader.GetStream(file))
fileInfos.Add(new TFileModel
{
Filename = FileSafety.PathStandardise(file),
Filename = FileSafety.PathStandardise(file.Substring(prefix.Length)),
FileInfo = files.Add(s)
});