Removed unused result string from PairResult. Check for assets folder when opening Unity project. Improved logging.
This commit is contained in:
Родитель
2c52d1690c
Коммит
2641fc83cf
|
@ -60,7 +60,6 @@ namespace MonoDevelop.UnityMode.UnityRestClient
|
||||||
unityprocessid = -1;
|
unityprocessid = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string result { get; set; }
|
|
||||||
public int unityprocessid { get; set; }
|
public int unityprocessid { get; set; }
|
||||||
public string unityproject { get; set; }
|
public string unityproject { get; set; }
|
||||||
}
|
}
|
||||||
|
|
|
@ -89,6 +89,13 @@ namespace MonoDevelop.UnityMode
|
||||||
|
|
||||||
public static void OpenUnityProject(string projectPath)
|
public static void OpenUnityProject(string projectPath)
|
||||||
{
|
{
|
||||||
|
if(!System.IO.Directory.Exists(System.IO.Path.Combine(projectPath, "Assets")))
|
||||||
|
{
|
||||||
|
MessageService.GenericAlert(new GenericMessage("Not a Unity project directory. Assets folder not found.", projectPath));
|
||||||
|
ShutdownAndUnpair();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var restServiceSettings = UnityRestServiceSettings.Load (projectPath);
|
var restServiceSettings = UnityRestServiceSettings.Load (projectPath);
|
||||||
|
|
||||||
if(restServiceSettings == null)
|
if(restServiceSettings == null)
|
||||||
|
@ -122,12 +129,12 @@ namespace MonoDevelop.UnityMode
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
pairResult = RestClient.Pair(monoDevelopRestServiceUrl, BrandingService.ApplicationName + " " + BuildInfo.VersionLabel);
|
pairResult = RestClient.Pair(monoDevelopRestServiceUrl, BrandingService.ApplicationName + " " + BuildInfo.VersionLabel);
|
||||||
LoggingService.LogInfo("Unity Pair Request Result: " + pairResult.result);
|
LoggingService.LogInfo("Unity Pair response. Project:" + pairResult.unityproject + " Process ID: " + pairResult.unityprocessid);
|
||||||
}
|
}
|
||||||
catch(Exception e)
|
catch(Exception e)
|
||||||
{
|
{
|
||||||
MessageService.GenericAlert(new GenericMessage("Unable to connect to Unity instance. Is Unity running?"));
|
MessageService.GenericAlert(new GenericMessage("Unable to connect to Unity instance. Is Unity running?"));
|
||||||
LoggingService.LogInfo("Unity Pair Request (" + unityRestServiceUrl + ") Exception: " + e);
|
LoggingService.LogWarning("Unity Pair Request (" + unityRestServiceUrl + ")", e);
|
||||||
ShutdownAndUnpair();
|
ShutdownAndUnpair();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -180,8 +187,9 @@ namespace MonoDevelop.UnityMode
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
LoggingService.LogInfo("Sending Unity AssetDatabase request");
|
LoggingService.LogInfo("Starting Unity Project refresh");
|
||||||
|
|
||||||
|
LoggingService.LogInfo("Sending Unity AssetDatabase request");
|
||||||
var assetDatabase = RestClient.GetUnityAssetDatabase();
|
var assetDatabase = RestClient.GetUnityAssetDatabase();
|
||||||
assetDatabase.Hint = hint;
|
assetDatabase.Hint = hint;
|
||||||
UnityAssetDatabase = assetDatabase;
|
UnityAssetDatabase = assetDatabase;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче