Pull up IChartDetail
.
This commit is contained in:
@@ -46,12 +46,16 @@ namespace Cryville.Crtr.Browsing.Actions {
|
||||
}
|
||||
|
||||
public IEnumerable<IResourceAction> GetActions(Type type) {
|
||||
if (type == null) return Enumerable.Empty<IResourceAction>();
|
||||
List<IResourceAction> actions;
|
||||
if (!_actions.TryGetValue(type, out actions)) {
|
||||
actions = new List<IResourceAction>();
|
||||
}
|
||||
IEnumerable<IResourceAction> result = actions;
|
||||
if (type != typeof(object)) result = result.Concat(GetActions(type.BaseType));
|
||||
if (type != typeof(object))
|
||||
result = result
|
||||
.Concat(GetActions(type.BaseType))
|
||||
.Concat(type.GetInterfaces().SelectMany(i => GetActions(i)));
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
@@ -5,16 +5,16 @@ using System.Collections.Generic;
|
||||
using Object = UnityEngine.Object;
|
||||
|
||||
namespace Cryville.Crtr.Browsing.Actions {
|
||||
internal class OpenConfigAction : ResourceAction<ChartDetail> {
|
||||
internal class OpenConfigAction : ResourceAction<IChartDetail> {
|
||||
public override string Name { get { return "Config"; } }
|
||||
|
||||
public override int Priority { get { return -50; } }
|
||||
|
||||
static readonly Dictionary<string, int> _rulesetTabs = new Dictionary<string, int>();
|
||||
|
||||
public override void Invoke(Uri uri, ChartDetail resource) {
|
||||
public override void Invoke(Uri uri, IChartDetail resource) {
|
||||
var master = ResourceBrowserMaster.Instance;
|
||||
var ruleset = resource.Meta.ruleset;
|
||||
var ruleset = resource.RulesetId;
|
||||
int tabId;
|
||||
if (_rulesetTabs.TryGetValue(ruleset, out tabId) && master.TryOpenTab(tabId))
|
||||
return;
|
||||
|
@@ -4,13 +4,13 @@ using System.IO;
|
||||
using UnityEngine.SceneManagement;
|
||||
|
||||
namespace Cryville.Crtr.Browsing.Actions {
|
||||
internal class PlayChartAction : ResourceAction<ChartDetail> {
|
||||
internal class PlayChartAction : ResourceAction<IChartDetail> {
|
||||
public override string Name { get { return "Play"; } }
|
||||
public override int Priority { get { return -100; } }
|
||||
|
||||
public override void Invoke(Uri uri, ChartDetail resource) {
|
||||
Settings.Default.LoadRuleset = Path.Combine(resource.Meta.ruleset, ".umgr");
|
||||
Settings.Default.LoadRulesetConfig = resource.Meta.ruleset + ".json";
|
||||
public override void Invoke(Uri uri, IChartDetail resource) {
|
||||
Settings.Default.LoadRuleset = Path.Combine(resource.RulesetId, ".umgr");
|
||||
Settings.Default.LoadRulesetConfig = resource.RulesetId + ".json";
|
||||
Settings.Default.LoadChart = uri.LocalPath;
|
||||
#if UNITY_5_3_OR_NEWER
|
||||
SceneManager.LoadScene("Play", LoadSceneMode.Additive);
|
||||
@@ -19,7 +19,7 @@ namespace Cryville.Crtr.Browsing.Actions {
|
||||
#endif
|
||||
Master.Instance.HideMenu();
|
||||
#if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
|
||||
DiscordController.Instance.SetPlaying(string.Format("{0} - {1}", resource.Meta.song.name, resource.Meta.name), resource.Meta.length);
|
||||
DiscordController.Instance.SetPlaying(string.Format("{0} - {1}", resource.SongName, resource.Name), resource.Length.TotalSeconds);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
10
Assets/Cryville/Crtr/Browsing/IChartDetail.cs
Normal file
10
Assets/Cryville/Crtr/Browsing/IChartDetail.cs
Normal file
@@ -0,0 +1,10 @@
|
||||
using System;
|
||||
|
||||
namespace Cryville.Crtr.Browsing {
|
||||
internal interface IChartDetail {
|
||||
string RulesetId { get; }
|
||||
string Name { get; }
|
||||
string SongName { get; }
|
||||
TimeSpan Length { get; }
|
||||
}
|
||||
}
|
11
Assets/Cryville/Crtr/Browsing/IChartDetail.cs.meta
Normal file
11
Assets/Cryville/Crtr/Browsing/IChartDetail.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 117e1aa46a380524096d0b6bea97c3d4
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
8
Assets/Cryville/Crtr/Browsing/Legacy.meta
Normal file
8
Assets/Cryville/Crtr/Browsing/Legacy.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ee929ca432bd0ff41bee174081ef16df
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@@ -4,24 +4,29 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Cryville.Crtr.Browsing {
|
||||
public class ChartDetail : IResourceMeta {
|
||||
namespace Cryville.Crtr.Browsing.Legacy {
|
||||
public class LegacyChartDetail : IChartDetail, IResourceMeta {
|
||||
public AsyncDelivery<Texture2D> Cover { get; set; }
|
||||
public ChartMeta Meta { get; set; }
|
||||
|
||||
public string RulesetId { get { return Meta.ruleset; } }
|
||||
public string Name { get { return Meta.name; } }
|
||||
public string SongName { get { return Meta.song.name; } }
|
||||
public TimeSpan Length { get { return TimeSpan.FromSeconds(Meta.length); } }
|
||||
|
||||
public IEnumerable<MetaProperty> Properties {
|
||||
get {
|
||||
if (Meta == null) yield break;
|
||||
yield return new MetaProperty("Name", new Dictionary<string, object> {
|
||||
{ "", string.Format("{0} - {1}", Meta.song.name, Meta.name) },
|
||||
{ "short", Meta.name },
|
||||
{ "distinct-primary", Meta.song.name },
|
||||
{ "distinct-secondary", Meta.name },
|
||||
{ "", string.Format("{0} - {1}", SongName, Name) },
|
||||
{ "short", Name },
|
||||
{ "distinct-primary", SongName },
|
||||
{ "distinct-secondary", Name },
|
||||
});
|
||||
yield return new MetaProperty("Image", Cover);
|
||||
yield return new MetaProperty("Song.Author", Meta.song.author);
|
||||
yield return new MetaProperty("Author", Meta.author);
|
||||
yield return new MetaProperty("Length", TimeSpan.FromSeconds(Meta.length));
|
||||
yield return new MetaProperty("Length", Length);
|
||||
yield return new MetaProperty("NoteCount", Meta.note_count);
|
||||
}
|
||||
}
|
@@ -11,8 +11,8 @@ using System.IO;
|
||||
using System.Linq;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Cryville.Crtr.Browsing {
|
||||
internal class LegacyResourceManager : IPathedResourceManager<ChartDetail> {
|
||||
namespace Cryville.Crtr.Browsing.Legacy {
|
||||
internal class LegacyResourceManager : IPathedResourceManager<LegacyChartDetail> {
|
||||
readonly string _rootPath;
|
||||
DirectoryInfo _cd;
|
||||
readonly FileSystemWatcher _watcher = new FileSystemWatcher();
|
||||
@@ -98,7 +98,7 @@ namespace Cryville.Crtr.Browsing {
|
||||
ItemChanged?.Invoke();
|
||||
}
|
||||
|
||||
public ChartDetail this[int index] {
|
||||
public LegacyChartDetail this[int index] {
|
||||
get {
|
||||
var item = _filteredItems[index];
|
||||
ChartMeta meta = null;
|
||||
@@ -118,7 +118,7 @@ namespace Cryville.Crtr.Browsing {
|
||||
}
|
||||
}
|
||||
}
|
||||
return new ChartDetail {
|
||||
return new LegacyChartDetail {
|
||||
Cover = cover,
|
||||
Meta = meta,
|
||||
};
|
@@ -1,5 +1,6 @@
|
||||
using Cryville.Common.Unity;
|
||||
using Cryville.Crtr.Browsing.Actions;
|
||||
using Cryville.Crtr.Browsing.Legacy;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
|
Reference in New Issue
Block a user