Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit af14cf7

Browse files
StanleyGoldmanStanleyGoldman
authored
Merge pull request #959 from github-for-unity/fixes/934-inspector-disabled
Report the correct editing status to Unity. Fixes #934
2 parents 4e09bfc + c62058c commit af14cf7

File tree

13 files changed

+215
-15
lines changed

13 files changed

+215
-15
lines changed

‎GitHub.Unity.sln‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityTests", "src\UnityExte
3737
EndProject
3838
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtensionLoader", "src\UnityExtension\Assets\Editor\GitHub.Unity\ExtensionLoader\ExtensionLoader.csproj", "{6B0EAB30-511A-44C1-87FE-D9AB7E34D115}"
3939
EndProject
40+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityShim", "src\UnityShim\UnityShim.csproj", "{F94F8AE1-C171-4A83-89E8-6557CA91A188}"
41+
EndProject
4042
Global
4143
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4244
Debug|Any CPU = Debug|Any CPU
@@ -161,6 +163,14 @@ Global
161163
{6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.dev|Any CPU.Build.0 = dev|Any CPU
162164
{6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.Release|Any CPU.ActiveCfg = Release|Any CPU
163165
{6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.Release|Any CPU.Build.0 = Release|Any CPU
166+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
167+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.Debug|Any CPU.Build.0 = Debug|Any CPU
168+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.DebugNoUnity|Any CPU.ActiveCfg = Debug|Any CPU
169+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.DebugNoUnity|Any CPU.Build.0 = Debug|Any CPU
170+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.dev|Any CPU.ActiveCfg = dev|Any CPU
171+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.dev|Any CPU.Build.0 = dev|Any CPU
172+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.Release|Any CPU.ActiveCfg = Release|Any CPU
173+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.Release|Any CPU.Build.0 = Release|Any CPU
164174
EndGlobalSection
165175
GlobalSection(SolutionProperties) = preSolution
166176
HideSolutionNode = FALSE

‎src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.asmdef‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ExtensionLoader",
3-
"references": [],
3+
"references": ["../../build/GitHub.UnityShim.dll"],
44
"includePlatforms": [
55
"Editor"
66
],

‎src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@ public bool Initialized
3030
private static string[] assemblies20 = { "System.Threading.dll", "AsyncBridge.Net35.dll", "ReadOnlyCollectionsInterfaces.dll", "GitHub.Api.dll", "GitHub.Unity.dll" };
3131
private static string[] assemblies45 = { "GitHub.Api.45.dll", "GitHub.Unity.45.dll" };
3232

33+
private const string GITHUB_UNITY_DISABLE = "GITHUB_UNITY_DISABLE";
34+
private static bool IsDisabled { get { return Environment.GetEnvironmentVariable(GITHUB_UNITY_DISABLE) == "1"; } }
35+
3336
static ExtensionLoader()
3437
{
35-
if (Environment.GetEnvironmentVariable("GITHUB_UNITY_DISABLE") == "1")
38+
if (IsDisabled)
3639
{
3740
return;
3841
}

‎src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@
5454
<ItemGroup>
5555
<Reference Include="System" />
5656
<Reference Include="System.Core" />
57+
<ProjectReference Include="..\..\..\..\..\UnityShim\UnityShim.csproj">
58+
<Project>{F94F8AE1-C171-4A83-89E8-6557CA91A188}</Project>
59+
<Name>UnityShim</Name>
60+
</ProjectReference>
5761
<Reference Include="UnityEditor">
5862
<HintPath>$(UnityDir)Managed\UnityEditor.dll</HintPath>
5963
<Private>False</Private>
@@ -65,6 +69,7 @@
6569
</ItemGroup>
6670
<ItemGroup>
6771
<Compile Include="ExtensionLoader.cs" />
72+
<Compile Include="UnityAPIWrapper.cs" />
6873
</ItemGroup>
6974
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7075
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/UnityAPIWrapper.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using UnityEditor;
2+
using UnityEngine;
3+
using System.IO;
4+
using System;
5+
6+
namespace GitHub.Unity
7+
{
8+
[InitializeOnLoad]
9+
public class UnityAPIWrapper : ScriptableSingleton<UnityAPIWrapper>
10+
{
11+
static UnityAPIWrapper()
12+
{
13+
#if UNITY_2018_2_OR_NEWER
14+
Editor.finishedDefaultHeaderGUI += editor => {
15+
UnityShim.Raise_Editor_finishedDefaultHeaderGUI(editor);
16+
};
17+
#endif
18+
}
19+
}
20+
}

‎src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.45.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@
7575
<Project>{bb6a8eda-15d8-471b-a6ed-ee551e0b3ba0}</Project>
7676
<Name>GitHub.Logging</Name>
7777
</ProjectReference>
78+
<ProjectReference Include="..\..\..\..\UnityShim\UnityShim.csproj">
79+
<Project>{F94F8AE1-C171-4A83-89E8-6557CA91A188}</Project>
80+
<Name>UnityShim</Name>
81+
</ProjectReference>
7882
</ItemGroup>
7983
<ItemGroup>
8084
<Compile Include="ApplicationCache.cs" />

‎src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.asmdef‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
22
"name": "GitHub.Unity",
3-
"references": [],
3+
"references": [
4+
],
5+
"optionalUnityReferences": [],
46
"includePlatforms": [
57
"Editor"
68
],
7-
"excludePlatforms": []
9+
"excludePlatforms": [],
10+
"allowUnsafeCode": false
811
}

‎src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@
115115
<Project>{bb6a8eda-15d8-471b-a6ed-ee551e0b3ba0}</Project>
116116
<Name>GitHub.Logging</Name>
117117
</ProjectReference>
118+
<ProjectReference Include="..\..\..\..\UnityShim\UnityShim.csproj">
119+
<Project>{F94F8AE1-C171-4A83-89E8-6557CA91A188}</Project>
120+
<Name>UnityShim</Name>
121+
</ProjectReference>
118122
</ItemGroup>
119123
<ItemGroup>
120124
<EmbeddedResource Include="IconsAndLogos\added%402x.png" />

‎src/UnityExtension/Assets/Editor/GitHub.Unity/UI/LfsLocksModificationProcessor.cs‎

Lines changed: 60 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Linq;
33
using GitHub.Logging;
44
using UnityEditor;
5+
using UnityEngine;
56

67
namespace GitHub.Unity
78
{
@@ -21,8 +22,12 @@ public static void Initialize(IEnvironment env, IPlatform plat)
2122
environment = env;
2223
platform = plat;
2324
platform.Keychain.ConnectionsChanged += UserMayHaveChanged;
25+
// we need to do this to get the initial user information up front
26+
UserMayHaveChanged();
2427

2528
repository = environment.Repository;
29+
UnityShim.Editor_finishedDefaultHeaderGUI += InspectorHeaderFinished;
30+
2631
if (repository != null)
2732
{
2833
repository.LocksChanged += RepositoryOnLocksChanged;
@@ -37,19 +42,27 @@ public static string[] OnWillSaveAssets(string[] paths)
3742

3843
public static AssetMoveResult OnWillMoveAsset(string oldPath, string newPath)
3944
{
40-
return IsLocked(oldPath) || IsLocked(newPath) ? AssetMoveResult.FailedMove : AssetMoveResult.DidNotMove;
45+
return IsLockedBySomeoneElse(oldPath) || IsLockedBySomeoneElse(newPath) ? AssetMoveResult.FailedMove : AssetMoveResult.DidNotMove;
4146
}
4247

4348
public static AssetDeleteResult OnWillDeleteAsset(string assetPath, RemoveAssetOptions option)
4449
{
45-
return IsLocked(assetPath) ? AssetDeleteResult.FailedDelete : AssetDeleteResult.DidNotDelete;
50+
return IsLockedBySomeoneElse(assetPath) ? AssetDeleteResult.FailedDelete : AssetDeleteResult.DidNotDelete;
4651
}
4752

53+
// Returns true if this file can be edited by this user
4854
public static bool IsOpenForEdit(string assetPath, out string message)
4955
{
5056
var lck = GetLock(assetPath);
51-
message = lck.HasValue ? "File is locked for editing by " + lck.Value.Owner : null;
52-
return !lck.HasValue;
57+
bool canEdit = true;
58+
if (assetPath.EndsWith(".meta"))
59+
{
60+
canEdit &= !IsLockedBySomeoneElse(lck);
61+
assetPath = assetPath.TrimEnd(".meta");
62+
}
63+
canEdit &= !IsLockedBySomeoneElse(lck);
64+
message = !canEdit ? string.Format("File is locked for editing by {0}", lck.Value.Owner.Name) : null;
65+
return canEdit;
5366
}
5467

5568
private static void RepositoryOnLocksChanged(CacheUpdateEvent cacheUpdateEvent)
@@ -66,9 +79,14 @@ private static void UserMayHaveChanged()
6679
loggedInUser = platform.Keychain.Connections.Select(x => x.Username).FirstOrDefault();
6780
}
6881

69-
private static bool IsLocked(string assetPath)
82+
private static bool IsLockedBySomeoneElse(GitLock? lck)
7083
{
71-
return GetLock(assetPath).HasValue;
84+
return lck.HasValue && !lck.Value.Owner.Name.Equals(loggedInUser);
85+
}
86+
87+
private static bool IsLockedBySomeoneElse(string assetPath)
88+
{
89+
return IsLockedBySomeoneElse(GetLock(assetPath));
7290
}
7391

7492
private static GitLock? GetLock(string assetPath)
@@ -78,9 +96,42 @@ private static bool IsLocked(string assetPath)
7896

7997
GitLock lck;
8098
var repositoryPath = environment.GetRepositoryPath(assetPath.ToNPath());
81-
if (!locks.TryGetValue(repositoryPath, out lck) || lck.Owner.Name.Equals(loggedInUser))
82-
return null;
83-
return lck;
99+
if (locks.TryGetValue(repositoryPath, out lck))
100+
return lck;
101+
return null;
102+
}
103+
104+
private static void InspectorHeaderFinished(Editor editor)
105+
{
106+
string message = "";
107+
if (!IsOpenForEdit(AssetDatabase.GetAssetPath(editor.target), out message))
108+
{
109+
var enabled = GUI.enabled;
110+
GUI.enabled = true;
111+
GUILayout.BeginVertical();
112+
{
113+
GUILayout.Space(9);
114+
GUILayout.BeginHorizontal();
115+
{
116+
GUILayout.BeginVertical(GUILayout.Width(32));
117+
{
118+
GUILayout.Label(Utility.GetIcon("big-logo.png", "big-logo@2x.png", Utility.IsDarkTheme), GUILayout.Width(32), GUILayout.Height(32));
119+
}
120+
GUILayout.EndVertical();
121+
122+
GUILayout.BeginVertical();
123+
{
124+
GUILayout.Space(9);
125+
GUILayout.Label(message, Styles.HeaderBranchLabelStyle);
126+
}
127+
GUILayout.EndVertical();
128+
}
129+
GUILayout.EndHorizontal();
130+
}
131+
GUILayout.EndVertical();
132+
GUI.enabled = enabled;
133+
}
134+
84135
}
85136
}
86137
}

‎src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private static bool ContextMenu_CanLock()
8888
{
8989
if (!EnsureInitialized())
9090
return false;
91-
if(!Repository.CurrentRemote.HasValue)
91+
if (!Repository.CurrentRemote.HasValue)
9292
return false;
9393
if (isBusy)
9494
return false;
@@ -222,7 +222,15 @@ private static void OnLocksUpdate()
222222
guidsLocks.Add(g);
223223
}
224224

225-
EditorApplication.RepaintProjectWindow();
225+
// https://github.com/github-for-unity/Unity/pull/959#discussion_r236694800
226+
// We need to repaint not only the project window, but also the inspector.
227+
// so that we can show the "this thing is locked by X" and that the IsOpenForEdit call happens
228+
// and the inspector is disabled. There's no way to refresh the editor directly
229+
// (well, there is, but it's an internal api), so this just causes Unity to repaint everything.
230+
// Nail, meet bazooka, unfortunately, but that's the only way to do it with public APIs ¯_(ツ)_/¯
231+
232+
//EditorApplication.RepaintProjectWindow();
233+
UnityEditorInternal.InternalEditorUtility.RepaintAllViews();
226234
}
227235

228236
private static void OnStatusUpdate()

0 commit comments

Comments
 (0)