Skip to content

Commit

Permalink
refine import screen + add futures to perform import
Browse files Browse the repository at this point in the history
  • Loading branch information
@yeastplume
yeastplume committed Mar 5, 2024
1 parent dd84840 commit 891c85c
Show file tree
Hide file tree
Showing 7 changed files with 267 additions and 208 deletions.
320 changes: 161 additions & 159 deletions crates/core/src/error.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,199 +4,201 @@ use grin_wallet_controller;

#[derive(thiserror::Error, Debug)]
pub enum GrinWalletInterfaceError {
#[error(transparent)]
WalletController(#[from] grin_wallet_controller::Error),
#[error(transparent)]
WalletLibWallet(#[from] grin_wallet_libwallet::Error),
#[error("Owner API not Instantiated")]
OwnerAPINotInstantiated,
#[error("Foreign API not Instantiated")]
ForeignAPINotInstantiated,
#[error("Invalid Slatepack Address")]
InvalidSlatepackAddress,
#[error("Can't load slatepack file at {file}")]
InvalidSlatepackFile{file: String},
#[error("Invalid Tx Log State")]
InvalidTxLogState,
#[error("Invalid Invoice Proof")]
InvalidInvoiceProof,
#[error(transparent)]
WalletController(#[from] grin_wallet_controller::Error),
#[error(transparent)]
WalletLibWallet(#[from] grin_wallet_libwallet::Error),
#[error("Owner API not Instantiated")]
OwnerAPINotInstantiated,
#[error("Foreign API not Instantiated")]
ForeignAPINotInstantiated,
#[error("Invalid Slatepack Address")]
InvalidSlatepackAddress,
#[error("Can't load slatepack file at {file}")]
InvalidSlatepackFile { file: String },
#[error("Invalid Tx Log State")]
InvalidTxLogState,
#[error("Invalid Invoice Proof")]
InvalidInvoiceProof,
#[error("Can't read wallet config file at {file}")]
ConfigReadError { file: String },
}

#[derive(thiserror::Error, Debug)]
pub enum FilesystemError {
#[error(transparent)]
Io(#[from] std::io::Error),
#[error(transparent)]
SerdeYaml(#[from] serde_yaml::Error),
#[error(transparent)]
Zip(#[from] zip::result::ZipError),
#[error(transparent)]
WalkDir(#[from] walkdir::Error),
#[error("File doesn't exist: {path:?}")]
FileDoesntExist { path: PathBuf },
#[cfg(target_os = "macos")]
#[error("Could not file bin name {bin_name} in archive")]
BinMissingFromTar { bin_name: String },
#[error("Failed to normalize path slashes for {path:?}")]
NormalizingPathSlash { path: PathBuf },
#[error("Could not strip prefix {prefix:?} from {from:?}")]
StripPrefix { prefix: String, from: String },
#[error(transparent)]
Io(#[from] std::io::Error),
#[error(transparent)]
SerdeYaml(#[from] serde_yaml::Error),
#[error(transparent)]
Zip(#[from] zip::result::ZipError),
#[error(transparent)]
WalkDir(#[from] walkdir::Error),
#[error("File doesn't exist: {path:?}")]
FileDoesntExist { path: PathBuf },
#[cfg(target_os = "macos")]
#[error("Could not file bin name {bin_name} in archive")]
BinMissingFromTar { bin_name: String },
#[error("Failed to normalize path slashes for {path:?}")]
NormalizingPathSlash { path: PathBuf },
#[error("Could not strip prefix {prefix:?} from {from:?}")]
StripPrefix { prefix: String, from: String },
}

#[derive(thiserror::Error, Debug)]
pub enum CacheError {
#[error("No repository information to create cache entry from addon {title}")]
AddonMissingRepo { title: String },
#[error(transparent)]
Filesystem(#[from] FilesystemError),
#[error("No repository information to create cache entry from addon {title}")]
AddonMissingRepo { title: String },
#[error(transparent)]
Filesystem(#[from] FilesystemError),
}

#[derive(thiserror::Error, Debug)]
pub enum DownloadError {
#[error("Body len != content len: {body_length} != {content_length}")]
ContentLength {
content_length: u64,
body_length: u64,
},
#[error("Invalid status code {code} for url {url}")]
InvalidStatusCode {
code: isahc::http::StatusCode,
url: String,
},
#[error("No new release binary available for {bin_name}")]
MissingSelfUpdateRelease { bin_name: String },
#[error("Catalog failed to download")]
CatalogFailed,
#[error("Self update for linux only works from AppImage")]
SelfUpdateLinuxNonAppImage,
#[error(transparent)]
Isahc(#[from] isahc::Error),
#[error(transparent)]
Http(#[from] isahc::http::Error),
#[error(transparent)]
Var(#[from] std::env::VarError),
#[error(transparent)]
SerdeJson(#[from] serde_json::Error),
#[error(transparent)]
Filesystem(#[from] FilesystemError),
#[error("Body len != content len: {body_length} != {content_length}")]
ContentLength {
content_length: u64,
body_length: u64,
},
#[error("Invalid status code {code} for url {url}")]
InvalidStatusCode {
code: isahc::http::StatusCode,
url: String,
},
#[error("No new release binary available for {bin_name}")]
MissingSelfUpdateRelease { bin_name: String },
#[error("Catalog failed to download")]
CatalogFailed,
#[error("Self update for linux only works from AppImage")]
SelfUpdateLinuxNonAppImage,
#[error(transparent)]
Isahc(#[from] isahc::Error),
#[error(transparent)]
Http(#[from] isahc::http::Error),
#[error(transparent)]
Var(#[from] std::env::VarError),
#[error(transparent)]
SerdeJson(#[from] serde_json::Error),
#[error(transparent)]
Filesystem(#[from] FilesystemError),
}

impl From<std::io::Error> for DownloadError {
fn from(e: std::io::Error) -> Self {
DownloadError::Filesystem(FilesystemError::Io(e))
}
fn from(e: std::io::Error) -> Self {
DownloadError::Filesystem(FilesystemError::Io(e))
}
}

#[derive(thiserror::Error, Debug)]
pub enum RepositoryError {
#[error("No repository set for addon")]
AddonNoRepository,
#[error("Failed to parse curse id as u32: {id}")]
CurseIdConversion { id: String },
#[error("File id must be provided for curse changelog request")]
CurseChangelogFileId,
#[error("No package found for curse id {id}")]
CurseMissingPackage { id: String },
#[error("No package found for WowI id {id}")]
WowIMissingPackage { id: String },
#[error("No package found for Hub id {id}")]
HubMissingPackage { id: String },
#[error("Git repo must be created with `from_source_url`")]
GitWrongConstructor,
#[error("Invalid url {url}")]
GitInvalidUrl { url: String },
#[error("No valid host in {url}")]
GitMissingHost { url: String },
#[error("Invalid host {host}, only github.com and gitlab.com are supported")]
GitInvalidHost { host: String },
#[error("Author not present in {url}")]
GitMissingAuthor { url: String },
#[error("Repo not present in {url}")]
GitMissingRepo { url: String },
#[error("No release at {url}")]
GitMissingRelease { url: String },
#[error("Tag name must be specified for git changelog")]
GitChangelogTagName,
#[error(transparent)]
Download(#[from] DownloadError),
#[error(transparent)]
Filesystem(#[from] FilesystemError),
#[error(transparent)]
Uri(#[from] isahc::http::uri::InvalidUri),
#[error(transparent)]
SerdeJson(#[from] serde_json::Error),
#[error("No repository set for addon")]
AddonNoRepository,
#[error("Failed to parse curse id as u32: {id}")]
CurseIdConversion { id: String },
#[error("File id must be provided for curse changelog request")]
CurseChangelogFileId,
#[error("No package found for curse id {id}")]
CurseMissingPackage { id: String },
#[error("No package found for WowI id {id}")]
WowIMissingPackage { id: String },
#[error("No package found for Hub id {id}")]
HubMissingPackage { id: String },
#[error("Git repo must be created with `from_source_url`")]
GitWrongConstructor,
#[error("Invalid url {url}")]
GitInvalidUrl { url: String },
#[error("No valid host in {url}")]
GitMissingHost { url: String },
#[error("Invalid host {host}, only github.com and gitlab.com are supported")]
GitInvalidHost { host: String },
#[error("Author not present in {url}")]
GitMissingAuthor { url: String },
#[error("Repo not present in {url}")]
GitMissingRepo { url: String },
#[error("No release at {url}")]
GitMissingRelease { url: String },
#[error("Tag name must be specified for git changelog")]
GitChangelogTagName,
#[error(transparent)]
Download(#[from] DownloadError),
#[error(transparent)]
Filesystem(#[from] FilesystemError),
#[error(transparent)]
Uri(#[from] isahc::http::uri::InvalidUri),
#[error(transparent)]
SerdeJson(#[from] serde_json::Error),
}

impl From<std::io::Error> for RepositoryError {
fn from(e: std::io::Error) -> Self {
RepositoryError::Filesystem(FilesystemError::Io(e))
}
fn from(e: std::io::Error) -> Self {
RepositoryError::Filesystem(FilesystemError::Io(e))
}
}

impl From<isahc::Error> for RepositoryError {
fn from(e: isahc::Error) -> Self {
RepositoryError::Download(DownloadError::Isahc(e))
}
fn from(e: isahc::Error) -> Self {
RepositoryError::Download(DownloadError::Isahc(e))
}
}

#[derive(thiserror::Error, Debug)]
pub enum ParseError {
#[error("Addon directory not found: {path:?}")]
MissingAddonDirectory { path: PathBuf },
#[error("No folders passed to addon")]
BuildAddonEmptyFolders,
#[error("No parent directory for {dir:?}")]
NoParentDirectory { dir: PathBuf },
#[error("Invalid UTF8 path: {path:?}")]
InvalidUtf8Path { path: PathBuf },
#[error("Path is not a file or doesn't exist: {path:?}")]
InvalidFile { path: PathBuf },
#[error("Invalid extension for path: {path:?}")]
InvalidExt { path: PathBuf },
#[error("Extension not in file parsing regex: {ext}")]
ParsingRegexMissingExt { ext: String },
#[error("Inclusion regex error for group {group} on pos {pos}, line: {line}")]
InclusionRegexError {
group: usize,
pos: usize,
line: String,
},
#[error(transparent)]
StripPrefix(#[from] std::path::StripPrefixError),
#[error(transparent)]
GlobPattern(#[from] glob::PatternError),
#[error(transparent)]
Glob(#[from] glob::GlobError),
#[error(transparent)]
FancyRegex(#[from] fancy_regex::Error),
#[error(transparent)]
Download(#[from] DownloadError),
#[error(transparent)]
Filesystem(#[from] FilesystemError),
#[error(transparent)]
Cache(#[from] CacheError),
#[error("Addon directory not found: {path:?}")]
MissingAddonDirectory { path: PathBuf },
#[error("No folders passed to addon")]
BuildAddonEmptyFolders,
#[error("No parent directory for {dir:?}")]
NoParentDirectory { dir: PathBuf },
#[error("Invalid UTF8 path: {path:?}")]
InvalidUtf8Path { path: PathBuf },
#[error("Path is not a file or doesn't exist: {path:?}")]
InvalidFile { path: PathBuf },
#[error("Invalid extension for path: {path:?}")]
InvalidExt { path: PathBuf },
#[error("Extension not in file parsing regex: {ext}")]
ParsingRegexMissingExt { ext: String },
#[error("Inclusion regex error for group {group} on pos {pos}, line: {line}")]
InclusionRegexError {
group: usize,
pos: usize,
line: String,
},
#[error(transparent)]
StripPrefix(#[from] std::path::StripPrefixError),
#[error(transparent)]
GlobPattern(#[from] glob::PatternError),
#[error(transparent)]
Glob(#[from] glob::GlobError),
#[error(transparent)]
FancyRegex(#[from] fancy_regex::Error),
#[error(transparent)]
Download(#[from] DownloadError),
#[error(transparent)]
Filesystem(#[from] FilesystemError),
#[error(transparent)]
Cache(#[from] CacheError),
}

impl From<std::io::Error> for ParseError {
fn from(e: std::io::Error) -> Self {
ParseError::Filesystem(FilesystemError::Io(e))
}
fn from(e: std::io::Error) -> Self {
ParseError::Filesystem(FilesystemError::Io(e))
}
}

#[derive(thiserror::Error, Debug)]
pub enum ThemeError {
#[error(transparent)]
InvalidUri(#[from] isahc::http::uri::InvalidUri),
#[error(transparent)]
UrlEncoded(#[from] serde_urlencoded::de::Error),
#[error(transparent)]
SerdeYaml(#[from] serde_yaml::Error),
#[error(transparent)]
SerdeJson(#[from] serde_json::Error),
#[error(transparent)]
Io(#[from] std::io::Error),
#[error("Url is missing theme from query")]
MissingQuery,
#[error("Theme already exists with name: {name}")]
NameCollision { name: String },
#[error(transparent)]
InvalidUri(#[from] isahc::http::uri::InvalidUri),
#[error(transparent)]
UrlEncoded(#[from] serde_urlencoded::de::Error),
#[error(transparent)]
SerdeYaml(#[from] serde_yaml::Error),
#[error(transparent)]
SerdeJson(#[from] serde_json::Error),
#[error(transparent)]
Io(#[from] std::io::Error),
#[error("Url is missing theme from query")]
MissingQuery,
#[error("Theme already exists with name: {name}")]
NameCollision { name: String },
}
12 changes: 11 additions & 1 deletion crates/core/src/wallet/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// Should eventually feature async calls that work via local wallet or remote owner API
use grin_wallet::cmd::wallet_args::inst_wallet;
use grin_wallet_api::{Foreign, Owner};
use grin_wallet_config::{self, GlobalWalletConfig};
use grin_wallet_config;
use grin_wallet_controller::command::InitArgs;
use grin_wallet_impls::DefaultLCProvider;
use grin_wallet_libwallet::{NodeClient, WalletInst, WalletLCProvider};
Expand All @@ -26,6 +26,8 @@ pub use grin_wallet_libwallet::{
SlatepackAddress, StatusMessage, TxLogEntry, TxLogEntryType, WalletInfo,
};

pub use grin_wallet_config::GlobalWalletConfig;

pub use grin_wallet_libwallet::contract::types::{
ContractNewArgsAPI, ContractRevokeArgsAPI, ContractSetupArgsAPI, ProofArgs,
};
Expand Down Expand Up @@ -134,6 +136,14 @@ pub fn parse_abs_tx_amount_fee(tx: &TxLogEntry, subtract_fee_from_amt: bool) ->
)
}

pub fn get_wallet_config(path: &str) -> Result<GlobalWalletConfig, GrinWalletInterfaceError> {
let res = GlobalWalletConfig::new(path);
match res {
Ok(c) => Ok(c),
Err(e) => Err(GrinWalletInterfaceError::ConfigReadError { file: path.into() }),
}
}

impl<L, C> WalletInterface<L, C>
where
L: WalletLCProvider<'static, C, grin_keychain::keychain::ExtKeychain>,
Expand Down
Loading

0 comments on commit 891c85c

Please sign in to comment.