Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Adapt resource manager to URI and list pattern.

Browse Source
This commit is contained in:
PopSlime
2023-11-13 00:26:18 +08:00
parent 9fcf6f3379
commit 8c11be48cf
4 changed files with 62 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Cryville/Crtr/Browsing/IResourceManager.cs
View File

@@ -2,14 +2,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Cryville.Crtr.Browsing { namespace Cryville.Crtr.Browsing {
public interface IResourceManager<T> { public interface IResourceManager<T> : IReadOnlyList<T> {
int ItemCount { get; } Uri GetItemUri(int id);
ResourceItemMeta GetItemMeta(int id); bool ImportItemFrom(Uri uri);
T GetItemDetail(int id);
string GetItemPath(int id);
bool ImportItemFrom(string path);
string[] GetSupportedFormats(); string[] GetSupportedFormats();
IReadOnlyDictionary<string, string> GetPresetPaths(); IReadOnlyDictionary<string, string> GetPresetPaths();

114
Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs
View File

@@ -6,6 +6,7 @@ using Cryville.Crtr.Extensions.Umg;
using Cryville.Crtr.UI; using Cryville.Crtr.UI;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@@ -18,7 +19,7 @@ namespace Cryville.Crtr.Browsing {
private DirectoryInfo cd; private DirectoryInfo cd;
private DirectoryInfo[] items = new DirectoryInfo[0]; private DirectoryInfo[] items = new DirectoryInfo[0];
public string[] CurrentDirectory { get; private set; } public string[] CurrentDirectory { get; private set; }
public int ItemCount { get { return items.Length; } } public int Count { get { return items.Length; } }
static bool _init; static bool _init;
@@ -46,80 +47,52 @@ namespace Cryville.Crtr.Browsing {
ChangeDirectory(nd); ChangeDirectory(nd);
} }
public void ReturnToDirectory(int id) { public void ReturnToDirectory(int index) {
string[] nd = new string[id + 1]; string[] nd = new string[index + 1];
Array.Copy(CurrentDirectory, nd, id + 1); Array.Copy(CurrentDirectory, nd, index + 1);
ChangeDirectory(nd); ChangeDirectory(nd);
} }
public ResourceItemMeta GetItemMeta(int id) { public ChartDetail this[int index] {
var item = items[id]; get {
var meta = new ChartMeta(); var item = items[index];
string name = item.Name; ChartMeta meta = null;
string desc = "(Unknown)"; var metaFile = new FileInfo(Path.Combine(item.FullName, ".umgc"));
var metaFile = new FileInfo(item.FullName + "/.umgc"); if (metaFile.Exists) {
if (metaFile.Exists) { using (var reader = new StreamReader(metaFile.FullName)) {
using (var reader = new StreamReader(metaFile.FullName)) { meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd()); }
name = meta.song.name;
desc = meta.name;
} }
} AsyncDelivery<Texture2D> cover = null;
AsyncDelivery<Texture2D> cover = null; if (meta.cover != null && meta.cover != "") {
if (meta.cover != null && meta.cover != "") { var coverFile = item.GetFiles(meta.cover);
var coverFile = item.GetFiles(meta.cover); if (coverFile.Length > 0) {
if (coverFile.Length > 0) { cover = new AsyncDelivery<Texture2D>();
cover = new AsyncDelivery<Texture2D>(); var task = new LoadTextureTask(PlatformConfig.FileProtocolPrefix + coverFile[0].FullName, cover.Deliver);
var task = new LoadTextureTask(PlatformConfig.FileProtocolPrefix + coverFile[0].FullName, cover.Deliver); cover.CancelSource = task.Cancel;
cover.CancelSource = task.Cancel; Game.NetworkTaskWorker.SubmitNetworkTask(task);
Game.NetworkTaskWorker.SubmitNetworkTask(task); }
} }
return new ChartDetail {
Cover = cover,
Meta = meta,
};
} }
return new ResourceItemMeta {
IsDirectory = false,
Icon = cover,
Name = name,
DescriptionMain = desc,
};
} }
public ChartDetail GetItemDetail(int id) { public Uri GetItemUri(int id) {
var item = items[id]; var item = items[id];
var meta = new ChartMeta(); var meta = new ChartMeta();
var metaFile = new FileInfo(item.FullName + "/.umgc"); var metaFile = new FileInfo(Path.Combine(item.FullName, ".umgc"));
if (metaFile.Exists) {
using (var reader = new StreamReader(metaFile.FullName)) {
meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
}
}
AsyncDelivery<Texture2D> cover = null;
if (meta.cover != null && meta.cover != "") {
var coverFile = item.GetFiles(meta.cover);
if (coverFile.Length > 0) {
cover = new AsyncDelivery<Texture2D>();
var task = new LoadTextureTask(PlatformConfig.FileProtocolPrefix + coverFile[0].FullName, cover.Deliver);
cover.CancelSource = task.Cancel;
Game.NetworkTaskWorker.SubmitNetworkTask(task);
}
}
return new ChartDetail {
Cover = cover,
Meta = meta,
};
}
public string GetItemPath(int id) {
var item = items[id];
var meta = new ChartMeta();
var metaFile = new FileInfo(item.FullName + "/.umgc");
using (var reader = new StreamReader(metaFile.FullName)) { using (var reader = new StreamReader(metaFile.FullName)) {
meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd()); meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
} }
return string.Format("{0}/{1}.json", items[id].Name, meta.data); return new Uri(Path.Combine(items[id].Name, string.Format("{0}.json", meta.data)));
} }
public bool ImportItemFrom(string path) { public bool ImportItemFrom(Uri uri) {
var file = new FileInfo(path); if (!uri.IsFile) throw new NotSupportedException();
var file = new FileInfo(uri.LocalPath);
IEnumerable<ResourceConverter> converters; IEnumerable<ResourceConverter> converters;
if (!ExtensionManager.TryGetConverters(file.Extension, out converters)) return false; if (!ExtensionManager.TryGetConverters(file.Extension, out converters)) return false;
foreach (var converter in converters) { foreach (var converter in converters) {
@@ -195,6 +168,27 @@ namespace Cryville.Crtr.Browsing {
return false; return false;
} }
Enumerator GetEnumerator() { return new Enumerator(this); }
IEnumerator<ChartDetail> IEnumerable<ChartDetail>.GetEnumerator() { return GetEnumerator(); }
IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); }
public struct Enumerator : IEnumerator<ChartDetail> {
readonly LegacyResourceManager _list;
public ChartDetail Current => throw new NotImplementedException();
object IEnumerator.Current => Current;
public Enumerator(LegacyResourceManager list) { _list = list; }
public void Dispose() { }
public bool MoveNext() {
throw new NotImplementedException();
}
public void Reset() {
throw new NotImplementedException();
}
}
void LogAndPopup(int level, string format, params object[] args) { void LogAndPopup(int level, string format, params object[] args) {
var msg = string.Format(format, args); var msg = string.Format(format, args);
Logger.Log("main", level, "Resource", msg); Logger.Log("main", level, "Resource", msg);

8
Assets/Cryville/Crtr/Browsing/UI/PathedResourceBrowser.cs
View File

@@ -31,7 +31,7 @@ namespace Cryville.Crtr.Browsing.UI {
} }
void OnItemChanged() { void OnItemChanged() {
ItemContainer.ItemCount = ResourceManager.ItemCount; ItemContainer.ItemCount = ResourceManager.Count;
_selectedItems.Clear(); _selectedItems.Clear();
_items.Clear(); _items.Clear();
} }
@@ -40,7 +40,7 @@ namespace Cryville.Crtr.Browsing.UI {
var bi = obj.GetComponent<BrowserItem>(); var bi = obj.GetComponent<BrowserItem>();
_items[id] = bi; _items[id] = bi;
try { try {
var item = ResourceManager.GetItemMeta(id); var item = ResourceManager[id];
bi.Load(id, item, _selectedItems.Contains(id)); bi.Load(id, item, _selectedItems.Contains(id));
} }
catch (Exception) { catch (Exception) {
@@ -58,7 +58,7 @@ namespace Cryville.Crtr.Browsing.UI {
_selectedItems.Clear(); _selectedItems.Clear();
_items[id].OnSelect(); _items[id].OnSelect();
_selectedItems.Add(id); _selectedItems.Add(id);
Master.ShowDetail(id, ResourceManager.GetItemDetail(id)); Master.ShowDetail(id, ResourceManager[id]);
} }
public void OnPathClicked(int id) { public void OnPathClicked(int id) {
@@ -71,7 +71,7 @@ namespace Cryville.Crtr.Browsing.UI {
private void OnAddDialogClosed() { private void OnAddDialogClosed() {
if (_dialog.FileName == null) return; if (_dialog.FileName == null) return;
if (ResourceManager.ImportItemFrom(_dialog.FileName)) { if (ResourceManager.ImportItemFrom(new Uri(_dialog.FileName))) {
Popup.Create("Import succeeded"); Popup.Create("Import succeeded");
OnPathClicked(ResourceManager.CurrentDirectory.Length - 1); OnPathClicked(ResourceManager.CurrentDirectory.Length - 1);
} }

2
Assets/Cryville/Crtr/Browsing/UI/ResourceBrowserMaster.cs
View File

@@ -89,7 +89,7 @@ namespace Cryville.Crtr.Browsing.UI {
void SetDataSettings(int id, ChartDetail detail) { void SetDataSettings(int id, ChartDetail detail) {
Settings.Default.LoadRuleset = detail.Meta.ruleset + "/.umgr"; Settings.Default.LoadRuleset = detail.Meta.ruleset + "/.umgr";
Settings.Default.LoadRulesetConfig = detail.Meta.ruleset + ".json"; Settings.Default.LoadRulesetConfig = detail.Meta.ruleset + ".json";
Settings.Default.LoadChart = m_mainBrowser.ResourceManager.GetItemPath(id); Settings.Default.LoadChart = m_mainBrowser.ResourceManager.GetItemUri(id).LocalPath;
} }
} }
} }