From 43c82515fee3dcc93e2742d6a1b759f2f4c0d696 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Wed, 4 Sep 2019 07:00:38 -0700 Subject: [PATCH] Fixed pause issue running post-build scripts, added curl diagnostics --- IDE/BeefProj.toml | 2 +- IDE/src/IDEApp.bf | 17 +++++++++++++---- IDE/src/ScriptManager.bf | 24 +++++++++++++----------- IDEHelper/IDEHelper.vcxproj.user | 2 +- IDEHelper/NetManager.cpp | 13 +++++++++---- 5 files changed, 37 insertions(+), 21 deletions(-) diff --git a/IDE/BeefProj.toml b/IDE/BeefProj.toml index 286f7cec..b6386672 100644 --- a/IDE/BeefProj.toml +++ b/IDE/BeefProj.toml @@ -27,7 +27,7 @@ TargetDirectory = "$(WorkspaceDir)/dist" TargetName = "BeefIDE_d" OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib" CLibType = "Dynamic" -DebugCommandArguments = "-proddir=C:\\Beef\\IDE\\Tests\\Test1 -test=scripts\\HotSwap_Lambdas01.txt -testNoExit" +DebugCommandArguments = "-test=scripts\\Minidump.txt -testNoExit -verbosity=Diagnostic" DebugWorkingDirectory = "c:\\Beef\\IDE\\Tests\\EmptyTest" EnvironmentVars = ["_NO_DEBUG_HEAP=1"] diff --git a/IDE/src/IDEApp.bf b/IDE/src/IDEApp.bf index af0b627f..445cb681 100644 --- a/IDE/src/IDEApp.bf +++ b/IDE/src/IDEApp.bf @@ -51,7 +51,7 @@ namespace IDE Minimal, Normal, Detailed, - Diagnostics + Diagnostic } class DeferredUserRequest @@ -6290,8 +6290,8 @@ namespace IDE mVerbosity = .Normal; else if (value == "detailed") mVerbosity = .Detailed; - //else if (value == "diagnostic") - //mVerbosity = .Diagnostic; + else if (value == "diagnostic") + mVerbosity = .Diagnostic; case "-workspace","-proddir": var relDir = scope String(value); if ((relDir.EndsWith("\\")) || relDir.EndsWith("\"")) @@ -10461,7 +10461,16 @@ namespace IDE } else cmd.Append(msg); - if ((cmd == "msg") || (cmd == "dbgEvalMsg") || (cmd == "log")) + + bool isOutput = (cmd == "msg") || (cmd == "dbgEvalMsg") || (cmd == "log"); + if (cmd == "msgLo") + { + if (mVerbosity <= .Diagnostic) + continue; + isOutput = true; + } + + if (isOutput) { if (deferredMsgType != cmd) { diff --git a/IDE/src/ScriptManager.bf b/IDE/src/ScriptManager.bf index 68bae5a2..e2437472 100644 --- a/IDE/src/ScriptManager.bf +++ b/IDE/src/ScriptManager.bf @@ -893,18 +893,20 @@ namespace IDE if (gApp.mLastActiveSourceViewPanel != null) { var sourceViewPanel = gApp.mLastActiveSourceViewPanel; + if (sourceViewPanel.HasFocus()) + { + if (sourceViewPanel.[Friend]mOldVerLoadExecutionInstance != null) + return false; + if (!sourceViewPanel.mDeferredResolveResults.IsEmpty) + return false; - if (sourceViewPanel.[Friend]mOldVerLoadExecutionInstance != null) - return false; - if (!sourceViewPanel.mDeferredResolveResults.IsEmpty) - return false; - - if (sourceViewPanel.[Friend]mWantsFastClassify) - return false; - if (sourceViewPanel.[Friend]mWantsFullClassify) - return false; - if (sourceViewPanel.[Friend]mWantsFullRefresh) - return false; + if (sourceViewPanel.[Friend]mWantsFastClassify) + return false; + if (sourceViewPanel.[Friend]mWantsFullClassify) + return false; + if (sourceViewPanel.[Friend]mWantsFullRefresh) + return false; + } } if ((gApp.mBfResolveCompiler != null) && (gApp.mBfResolveCompiler.IsPerformingBackgroundOperation())) diff --git a/IDEHelper/IDEHelper.vcxproj.user b/IDEHelper/IDEHelper.vcxproj.user index c0a7a016..ecb3bb9c 100644 --- a/IDEHelper/IDEHelper.vcxproj.user +++ b/IDEHelper/IDEHelper.vcxproj.user @@ -20,6 +20,6 @@ _NO_DEBUG_HEAP=1 - true + false \ No newline at end of file diff --git a/IDEHelper/NetManager.cpp b/IDEHelper/NetManager.cpp index 11e8c403..7edbb6f6 100644 --- a/IDEHelper/NetManager.cpp +++ b/IDEHelper/NetManager.cpp @@ -95,14 +95,14 @@ void NetRequest::Perform() // } BfLogDbg("NetManager starting get on %s\n", mURL.c_str()); + mNetManager->mDebugManager->OutputRawMessage(StrFormat("msgLo Getting '%s'\n", mURL.c_str())); mOutTempPath = mOutPath + "__partial"; mCURL = curl_easy_init(); if (mShowTracking) - { - //mNetManager->mDebugManager->OutputMessage(StrFormat("Getting '%s'\n", mURL.c_str())); + { mNetManager->mDebugManager->OutputRawMessage(StrFormat("symsrv Getting '%s'", mURL.c_str())); } @@ -125,8 +125,9 @@ void NetRequest::Perform() long response_code = 0; curl_easy_getinfo(mCURL, CURLINFO_RESPONSE_CODE, &response_code); + mNetManager->mDebugManager->OutputRawMessage(StrFormat("msgLo Result for '%s': %d\n", mURL.c_str(), response_code)); if (response_code != 200) - { + { mOutFile.Close(); // Bad result mFailed = true; @@ -139,7 +140,7 @@ void NetRequest::Perform() mNetManager->Cancel(mCancelOnSuccess); if (!mOutFile.IsOpen()) - { + { mFailed = true; return; // No data } @@ -150,7 +151,9 @@ void NetRequest::Perform() BfpFile_Rename(mOutTempPath.c_str(), mOutPath.c_str(), &renameResult); if (renameResult != BfpFileResult_Ok) + { mFailed = true; + } } #else @@ -479,6 +482,8 @@ bool NetManager::Get(const StringImpl& url, const StringImpl& destPath) delete netRequest; BfLogDbg("NetManager::Get requested %s: %d\n", url.c_str(), !netResult->mFailed); + mDebugManager->OutputRawMessage(StrFormat("msgLo Result for '%s': %d\n", url.c_str(), !netResult->mFailed)); + return (!netResult->mFailed) && (FileExists(netResult->mOutPath)); }