main - remote-2023-08-20T02:24:11 now-2023-08-20T18:40:38
This commit is contained in:
Adversary
commit
4cf5c80442
161 changed files with 12176 additions and 0 deletions
|
|
@ -0,0 +1,200 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Threading.Tasks;
|
||||
using Serilog;
|
||||
using Serilog.Sinks.Unity3D;
|
||||
using UnityEditor;
|
||||
using UnityEngine;
|
||||
using VRC.PackageManagement.Core;
|
||||
using VRC.PackageManagement.Core.Types;
|
||||
using VRC.PackageManagement.Core.Types.Packages;
|
||||
using Version = VRC.PackageManagement.Core.Types.VPMVersion.Version;
|
||||
|
||||
namespace VRC.PackageManagement.Resolver
|
||||
{
|
||||
|
||||
[InitializeOnLoad]
|
||||
public class Resolver
|
||||
{
|
||||
private const string _projectLoadedKey = "PROJECT_LOADED";
|
||||
|
||||
private static string _projectDir;
|
||||
public static string ProjectDir
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_projectDir != null)
|
||||
{
|
||||
return _projectDir;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
_projectDir = new DirectoryInfo(Assembly.GetExecutingAssembly().Location).Parent.Parent.Parent
|
||||
.FullName;
|
||||
return _projectDir;
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static Resolver()
|
||||
{
|
||||
SetupLogging();
|
||||
if (!SessionState.GetBool(_projectLoadedKey, false))
|
||||
{
|
||||
#pragma warning disable 4014
|
||||
CheckResolveNeeded();
|
||||
#pragma warning restore 4014
|
||||
}
|
||||
}
|
||||
|
||||
private static void SetupLogging()
|
||||
{
|
||||
VRCLibLogger.SetLoggerDirectly(
|
||||
new LoggerConfiguration()
|
||||
.MinimumLevel.Information()
|
||||
.WriteTo.Unity3D()
|
||||
.CreateLogger()
|
||||
);
|
||||
}
|
||||
|
||||
private static async Task CheckResolveNeeded()
|
||||
{
|
||||
SessionState.SetBool(_projectLoadedKey, true);
|
||||
|
||||
//Wait for project to finish compiling
|
||||
while (EditorApplication.isCompiling || EditorApplication.isUpdating)
|
||||
{
|
||||
await Task.Delay(250);
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
|
||||
if (string.IsNullOrWhiteSpace(ProjectDir))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (VPMProjectManifest.ResolveIsNeeded(ProjectDir))
|
||||
{
|
||||
Debug.Log($"Resolve needed.");
|
||||
var result = EditorUtility.DisplayDialog("VRChat Package Management",
|
||||
$"This project requires some VRChat Packages which are not in the project yet.\n\nPress OK to download and install them.",
|
||||
"OK", "Show Me What's Missing");
|
||||
if (result)
|
||||
{
|
||||
ResolveStatic(ProjectDir);
|
||||
}
|
||||
else
|
||||
{
|
||||
ResolverWindow.ShowWindow();
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
// Unity says we can't open windows from this function so it throws an exception but also works fine.
|
||||
}
|
||||
}
|
||||
|
||||
public static bool VPMManifestExists()
|
||||
{
|
||||
return VPMProjectManifest.Exists(ProjectDir, out _);
|
||||
}
|
||||
|
||||
public static void CreateManifest()
|
||||
{
|
||||
VPMProjectManifest.Load(ProjectDir);
|
||||
ResolverWindow.Refresh();
|
||||
}
|
||||
|
||||
public static void ResolveManifest()
|
||||
{
|
||||
ResolveStatic(ProjectDir);
|
||||
}
|
||||
|
||||
public static void ResolveStatic(string dir)
|
||||
{
|
||||
// Todo: calculate and show actual progress
|
||||
EditorUtility.DisplayProgressBar($"Getting all VRChat Packages", "Downloading and Installing...", 0.5f);
|
||||
VPMProjectManifest.Resolve(ProjectDir);
|
||||
EditorUtility.ClearProgressBar();
|
||||
ForceRefresh();
|
||||
}
|
||||
|
||||
public static List<string> GetAllVersionsOf(string id)
|
||||
{
|
||||
var project = new UnityProject(ProjectDir);
|
||||
|
||||
var versions = new List<string>();
|
||||
foreach (var provider in Repos.GetAll)
|
||||
{
|
||||
var packagesWithVersions = provider.GetAllWithVersions();
|
||||
|
||||
foreach (var packageVersionList in packagesWithVersions)
|
||||
{
|
||||
foreach (var package in packageVersionList.Value.VersionsDescending)
|
||||
{
|
||||
if (package.Id != id)
|
||||
continue;
|
||||
if (Version.TryParse(package.Version, out var result))
|
||||
{
|
||||
if (!versions.Contains(package.Version))
|
||||
versions.Add(package.Version);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Sort packages in project to the top
|
||||
var sorted = from entry in versions orderby project.VPMProvider.HasPackage(entry) descending select entry;
|
||||
|
||||
return sorted.ToList<string>();
|
||||
}
|
||||
|
||||
public static List<string> GetAffectedPackageList(IVRCPackage package)
|
||||
{
|
||||
List<string> list = new List<string>();
|
||||
|
||||
var project = new UnityProject(ProjectDir);
|
||||
|
||||
if (Repos.GetAllDependencies(package, out Dictionary<string, string> dependencies, null))
|
||||
{
|
||||
foreach (KeyValuePair<string, string> item in dependencies)
|
||||
{
|
||||
project.VPMProvider.Refresh();
|
||||
if (project.VPMProvider.GetPackage(item.Key, item.Value) == null)
|
||||
{
|
||||
IVRCPackage d = Repos.GetPackageWithVersionMatch(item.Key, item.Value);
|
||||
if (d != null)
|
||||
{
|
||||
list.Add(d.Id + " " + d.Version + "\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public static void ForceRefresh ()
|
||||
{
|
||||
MethodInfo method = typeof( UnityEditor.PackageManager.Client ).GetMethod( "Resolve", BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.DeclaredOnly );
|
||||
if( method != null )
|
||||
method.Invoke( null, null );
|
||||
|
||||
AssetDatabase.Refresh();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f872e3586f8b4f06bab3c9facd14f6e6
|
||||
timeCreated: 1659048476
|
||||
|
|
@ -0,0 +1,292 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using UnityEditor;
|
||||
using UnityEditor.UIElements;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UIElements;
|
||||
using VRC.PackageManagement.Core;
|
||||
using VRC.PackageManagement.Core.Types;
|
||||
using VRC.PackageManagement.Core.Types.Packages;
|
||||
using Version = VRC.PackageManagement.Core.Types.VPMVersion.Version;
|
||||
|
||||
namespace VRC.PackageManagement.Resolver
|
||||
{
|
||||
public class ResolverWindow : EditorWindow
|
||||
{
|
||||
// VisualElements
|
||||
private static VisualElement _rootView;
|
||||
private static Button _refreshButton;
|
||||
private static Button _createButton;
|
||||
private static Button _resolveButton;
|
||||
private static Box _manifestInfo;
|
||||
private static Label _manifestLabel;
|
||||
private static bool _isUpdating;
|
||||
private static Color _colorPositive = Color.green;
|
||||
private static Color _colorNegative = new Color(1, 0.3f, 0.3f);
|
||||
|
||||
|
||||
[MenuItem("VRChat SDK/Utilities/Package Resolver")]
|
||||
public static void ShowWindow()
|
||||
{
|
||||
ResolverWindow wnd = GetWindow<ResolverWindow>();
|
||||
wnd.titleContent = new GUIContent("Package Resolver");
|
||||
}
|
||||
|
||||
public static void Refresh()
|
||||
{
|
||||
if (_rootView == null || string.IsNullOrWhiteSpace(Resolver.ProjectDir)) return;
|
||||
|
||||
_manifestInfo.SetEnabled(!_isUpdating);
|
||||
_refreshButton.SetEnabled(!_isUpdating);
|
||||
_manifestLabel.text = (_isUpdating ? "Working ..." : "Required Packages");
|
||||
_manifestInfo.Clear();
|
||||
_manifestInfo.Add(_manifestLabel);
|
||||
|
||||
bool needsResolve = VPMProjectManifest.ResolveIsNeeded(Resolver.ProjectDir);
|
||||
string resolveStatus = needsResolve ? "Please press \"Resolve\" to Download them." : "All of them are in the project.";
|
||||
|
||||
// check for vpm dependencies
|
||||
if (!Resolver.VPMManifestExists())
|
||||
{
|
||||
TextElement noManifestText = new TextElement();
|
||||
noManifestText.text = "No VPM Manifest";
|
||||
noManifestText.style.color = _colorNegative;
|
||||
_manifestInfo.Add(noManifestText);
|
||||
}
|
||||
else
|
||||
{
|
||||
var manifest = VPMProjectManifest.Load(Resolver.ProjectDir);
|
||||
var project = new UnityProject(Resolver.ProjectDir);
|
||||
|
||||
// Here is where we detect if all dependencies are installed
|
||||
var allDependencies = (manifest.locked != null && manifest.locked.Count > 0)
|
||||
? manifest.locked
|
||||
: manifest.dependencies;
|
||||
|
||||
foreach (var pair in allDependencies)
|
||||
{
|
||||
var id = pair.Key;
|
||||
var version = pair.Value.version;
|
||||
IVRCPackage package = project.VPMProvider.GetPackage(id, version);
|
||||
_manifestInfo.Add(CreateDependencyRow(id, version, project, (package != null)));
|
||||
}
|
||||
|
||||
}
|
||||
_resolveButton.SetEnabled(needsResolve);
|
||||
Resolver.ForceRefresh();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Unity calls the CreateGUI method automatically when the window needs to display
|
||||
/// </summary>
|
||||
private void CreateGUI()
|
||||
{
|
||||
_rootView = rootVisualElement;
|
||||
_rootView.name = "root-view";
|
||||
_rootView.styleSheets.Add((StyleSheet)Resources.Load("ResolverWindowStyle"));
|
||||
|
||||
// Main Container
|
||||
var container = new Box()
|
||||
{
|
||||
name = "buttons"
|
||||
};
|
||||
_rootView.Add(container);
|
||||
|
||||
// Create Button
|
||||
if (!Resolver.VPMManifestExists())
|
||||
{
|
||||
_createButton = new Button(Resolver.CreateManifest)
|
||||
{
|
||||
text = "Create",
|
||||
name = "create-button-base"
|
||||
};
|
||||
container.Add(_createButton);
|
||||
}
|
||||
else
|
||||
{
|
||||
_resolveButton = new Button(Resolver.ResolveManifest)
|
||||
{
|
||||
text = "Resolve All",
|
||||
name = "resolve-button-base"
|
||||
};
|
||||
container.Add(_resolveButton);
|
||||
}
|
||||
|
||||
// Manifest Info
|
||||
_manifestInfo = new Box()
|
||||
{
|
||||
name = "manifest-info",
|
||||
};
|
||||
_manifestLabel = (new Label("Required Packages") { name = "manifest-header" });
|
||||
|
||||
_rootView.Add(_manifestInfo);
|
||||
|
||||
// Refresh Button
|
||||
var refreshBox = new Box();
|
||||
_refreshButton = new Button(Refresh)
|
||||
{
|
||||
text = "Refresh",
|
||||
name = "refresh-button-base"
|
||||
};
|
||||
refreshBox.Add(_refreshButton);
|
||||
_rootView.Add(refreshBox);
|
||||
|
||||
Refresh();
|
||||
}
|
||||
|
||||
private static VisualElement CreateDependencyRow(string id, string version, UnityProject project, bool havePackage)
|
||||
{
|
||||
// Table
|
||||
|
||||
VisualElement row = new Box() { name = "package-box" };
|
||||
VisualElement column1 = new Box() { name = "package-box" };
|
||||
VisualElement column2 = new Box() { name = "package-box" };
|
||||
VisualElement column3 = new Box() { name = "package-box" };
|
||||
VisualElement column4 = new Box() { name = "package-box" };
|
||||
|
||||
column1.style.minWidth = 200;
|
||||
column2.style.minWidth = 100;
|
||||
column3.style.minWidth = 100;
|
||||
column4.style.minWidth = 100;
|
||||
|
||||
row.Add(column1);
|
||||
row.Add(column2);
|
||||
row.Add(column3);
|
||||
row.Add(column4);
|
||||
|
||||
// Package Name + Status
|
||||
|
||||
TextElement text = new TextElement { text = $"{id} {version} " };
|
||||
|
||||
column1.Add(text);
|
||||
|
||||
if (!havePackage)
|
||||
{
|
||||
TextElement missingText = new TextElement { text = "MISSING" };
|
||||
missingText.style.color = _colorNegative;
|
||||
missingText.style.display = (_isUpdating ? DisplayStyle.None : DisplayStyle.Flex);
|
||||
column2.Add(missingText);
|
||||
}
|
||||
|
||||
// Version Popup
|
||||
|
||||
var choices = new List<string>();
|
||||
foreach (string n in Resolver.GetAllVersionsOf(id))
|
||||
{
|
||||
choices.Add(n);
|
||||
}
|
||||
|
||||
var popupField = new PopupField<string>(choices, 0);
|
||||
popupField.value = choices[0];
|
||||
popupField.style.display = (_isUpdating ? DisplayStyle.None : DisplayStyle.Flex);
|
||||
|
||||
column3.Add(popupField);
|
||||
|
||||
// Button
|
||||
|
||||
Button updateButton = new Button() { text = "Update" };
|
||||
if (havePackage)
|
||||
RefreshUpdateButton(updateButton, version, choices[0]);
|
||||
else
|
||||
RefreshMissingButton(updateButton);
|
||||
|
||||
updateButton.clicked += (() =>
|
||||
{
|
||||
IVRCPackage package = Repos.GetPackageWithVersionMatch(id, popupField.value);
|
||||
|
||||
// Check and warn on Dependencies if Updating or Downgrading
|
||||
if (Version.TryParse(version, out var currentVersion) &&
|
||||
Version.TryParse(popupField.value, out var newVersion))
|
||||
{
|
||||
Dictionary<string, string> dependencies = new Dictionary<string, string>();
|
||||
StringBuilder dialogMsg = new StringBuilder();
|
||||
List<string> affectedPackages = Resolver.GetAffectedPackageList(package);
|
||||
for (int v = 0; v < affectedPackages.Count; v++)
|
||||
{
|
||||
dialogMsg.Append(affectedPackages[v]);
|
||||
}
|
||||
|
||||
if (affectedPackages.Count > 1)
|
||||
{
|
||||
dialogMsg.Insert(0, "This will update multiple packages:\n\n");
|
||||
dialogMsg.AppendLine("\nAre you sure?");
|
||||
if (EditorUtility.DisplayDialog("Package Has Dependencies", dialogMsg.ToString(), "OK", "Cancel"))
|
||||
OnUpdatePackageClicked(project, package);
|
||||
}
|
||||
else
|
||||
{
|
||||
OnUpdatePackageClicked(project, package);
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
column4.Add(updateButton);
|
||||
|
||||
popupField.RegisterCallback<ChangeEvent<string>>((evt) =>
|
||||
{
|
||||
if (havePackage)
|
||||
RefreshUpdateButton(updateButton, version, evt.newValue);
|
||||
else
|
||||
RefreshMissingButton(updateButton);
|
||||
});
|
||||
|
||||
return row;
|
||||
}
|
||||
|
||||
private static void RefreshUpdateButton(Button button, string currentVersion, string highestAvailableVersion)
|
||||
{
|
||||
if (currentVersion == highestAvailableVersion)
|
||||
{
|
||||
button.style.display = DisplayStyle.None;
|
||||
}
|
||||
else
|
||||
{
|
||||
button.style.display = (_isUpdating ? DisplayStyle.None : DisplayStyle.Flex);
|
||||
if (Version.TryParse(currentVersion, out var currentVersionObject) &&
|
||||
Version.TryParse(highestAvailableVersion, out var highestAvailableVersionObject))
|
||||
{
|
||||
if (currentVersionObject < highestAvailableVersionObject)
|
||||
{
|
||||
SetButtonColor(button, _colorPositive);
|
||||
button.text = "Update";
|
||||
}
|
||||
else
|
||||
{
|
||||
SetButtonColor(button, _colorNegative);
|
||||
button.text = "Downgrade";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static void RefreshMissingButton(Button button)
|
||||
{
|
||||
button.text = "Resolve";
|
||||
SetButtonColor(button, Color.white);
|
||||
button.style.display = (_isUpdating ? DisplayStyle.None : DisplayStyle.Flex);
|
||||
}
|
||||
|
||||
private static void SetButtonColor(Button button, Color color)
|
||||
{
|
||||
button.style.color = color;
|
||||
color.a = 0.25f;
|
||||
button.style.borderRightColor =
|
||||
button.style.borderLeftColor =
|
||||
button.style.borderTopColor =
|
||||
button.style.borderBottomColor =
|
||||
color;
|
||||
}
|
||||
|
||||
private static async void OnUpdatePackageClicked(UnityProject project, IVRCPackage package)
|
||||
{
|
||||
_isUpdating = true;
|
||||
Refresh();
|
||||
await Task.Delay(500);
|
||||
await Task.Run(() => project.UpdateVPMPackage(package));
|
||||
_isUpdating = false;
|
||||
Refresh();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 32d2636186ee0834fa1dc2287750dd32
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Loading…
Add table
Add a link
Reference in a new issue