Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 12:32:20 +02:00
Code Activity

Merge pull request #1358 from disarray2077/http_error

Browse source 
Improve open error for files from network
This commit is contained in:
Brian Fiete 2022-01-07 14:58:49 +01:00 • committed by GitHub
commit 88183dbae7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 81 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

56
IDE/src/ui/SourceViewPanel.bf
View file

@ -3121,13 +3121,19 @@ namespace IDE.ui
void FileOpenFailed()
{
bool fileFromNetwork = mOldVerLoadCmd?.StartsWith("http", .OrdinalIgnoreCase) == true;
mLoadFailed = true;
//mLastFileTextVersion = mEditWidget.Content.mData.mCurTextVersionId;
mPanelHeader = new PanelHeader();
String fileName = scope String();
Path.GetFileName(mFilePath, fileName);
String headerStr = scope String();
headerStr.AppendF("Source file '{0}' is unavailable. Requested path is '{1}'", fileName, mFilePath);
headerStr.AppendF("Source file '{0}' is unavailable. ", fileName);
if (fileFromNetwork)
headerStr.Append("Failed to retrieve from network.");
else
headerStr.AppendF("Requested path is '{0}'", mFilePath);
mPanelHeader.Label = headerStr;
if (!sPreviousVersionWarningShown)
{
@ -3162,19 +3168,30 @@ namespace IDE.ui
});
}
var button = mPanelHeader.AddButton("Retry");
button.mOnMouseClick.Add(new (evt) =>
{
Reload();
});
if (fileFromNetwork)
{
var button = mPanelHeader.AddButton("Retry");
button.mOnMouseClick.Add(new (evt) =>
{
LoadOldVer();
});
}
else
{
var button = mPanelHeader.AddButton("Retry");
button.mOnMouseClick.Add(new (evt) =>
{
Reload();
});
button = mPanelHeader.AddButton("Auto Find");
button.mOnMouseClick.Add(new (evt) =>
{
AutoFind();
});
}
button = mPanelHeader.AddButton("Auto Find");
button.mOnMouseClick.Add(new (evt) =>
{
AutoFind();
});
button = mPanelHeader.AddButton("Browse...");
var button = mPanelHeader.AddButton("Browse...");
button.mOnMouseClick.Add(new (evt) =>
{
BrowseForFile();
@ -5719,7 +5736,18 @@ namespace IDE.ui
if (result != .NotDone)
{
if (result == .Failed)
gApp.OutputErrorLine("Failed to retrieve source from {}", mOldVerLoadCmd);
{
String errorMsg = scope .();
errorMsg.AppendF("Failed to retrieve source from {}", mOldVerLoadCmd);
String errorReason = scope .();
mOldVerHTTPRequest.GetLastError(errorReason);
if (!errorReason.IsEmpty)
errorMsg.AppendF(" ({})", errorReason);
gApp.OutputErrorLine(errorMsg);
}
CheckAdjustFile();
RetryLoad();