Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[neo-cli] Error Message and Warning - LevelDb #3380

Merged
merged 6 commits into from
Jul 5, 2024
Merged

[neo-cli] Error Message and Warning - LevelDb #3380

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
82fb490
Fixed warnings and error message for `libleveldb` missing
cschuchardt88 Jul 1, 2024
1ca6d91
Update src/Neo.CLI/CLI/MainService.cs
shargon Jul 4, 2024
f51af27
Merge branch 'master' into fix/cli-libleveldb-message
shargon Jul 4, 2024
a5ed5fa
Merge branch 'master' into fix/cli-libleveldb-message
NGDAdmin Jul 5, 2024
a3588e2
Merge branch 'master' into fix/cli-libleveldb-message
NGDAdmin Jul 5, 2024
64eb535
Merge branch 'master' into fix/cli-libleveldb-message
NGDAdmin Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/Neo.CLI/CLI/MainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
using System.Net;
using System.Numerics;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -383,7 +382,7 @@ public async void Start(CommandLineOptions options)
}
catch (DllNotFoundException ex) when (ex.Message.Contains("libleveldb"))
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (OperatingSystem.IsWindows())
{
if (File.Exists("libleveldb.dll"))
{
Expand All @@ -392,25 +391,32 @@ public async void Start(CommandLineOptions options)
}
else
{
DisplayError("DLL not found, please get libleveldb.dll.");
DisplayError("DLL not found, please get libleveldb.dll.",
"Download from https://github.com/neo-ngd/leveldb/releases");
}
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
else if (OperatingSystem.IsLinux())
{
DisplayError("Shared library libleveldb.so not found, please get libleveldb.so.",
"Use command \"sudo apt-get install libleveldb-dev\" in terminal or download from https://github.com/neo-ngd/leveldb/releases");
}
else if (OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst())
{
DisplayError("Shared library libleveldb.dylib not found, please get libleveldb.dylib.",
"From https://github.com/neo-project/neo/releases");
"Use command \"brew install leveldb\" in terminal and download from https://github.com/neo-ngd/leveldb/releases");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's stay consistent with the above. use or instead of and

Suggested change
"Use command \"brew install leveldb\" in terminal and download from https://github.com/neo-ngd/leveldb/releases");
"Use command \"brew install leveldb\" in terminal or download from https://github.com/neo-ngd/leveldb/releases");

Copy link
Member Author

@cschuchardt88 cschuchardt88 Jul 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to do both, for Snappy compression library, brew installs it.

}
else
{
DisplayError("Neo CLI is broken, please reinstall it.",
"From https://github.com/neo-project/neo/releases");
"Download from https://github.com/neo-project/neo/releases");
}

return;
}
catch (DllNotFoundException)
{
DisplayError("Neo CLI is broken, please reinstall it.",
"From https://github.com/neo-project/neo/releases");
"Download from https://github.com/neo-project/neo/releases");
return;
}

NeoSystem.AddService(this);
Expand Down