mirror of
https://github.com/MeexReay/sRAC.git
synced 2025-06-24 02:22:57 +03:00
move load_ functions to ctx module
This commit is contained in:
parent
9fc712db85
commit
25bb2ca451
33
src/ctx.rs
33
src/ctx.rs
@ -1,7 +1,7 @@
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
error::Error,
|
||||
fs::OpenOptions,
|
||||
fs::{self, OpenOptions},
|
||||
io::{Cursor, Read, Write},
|
||||
net::IpAddr,
|
||||
sync::{
|
||||
@ -17,7 +17,36 @@ use log::info;
|
||||
use md5::{Digest, Md5};
|
||||
use rand::{Rng, distr::Alphanumeric};
|
||||
|
||||
use crate::{Args, load_accounts, load_messages};
|
||||
use crate::Args;
|
||||
|
||||
fn load_accounts(accounts_file: Option<String>) -> Vec<Account> {
|
||||
if let Some(accounts_file) = accounts_file.clone() {
|
||||
if fs::exists(&accounts_file).expect("error checking accounts file") {
|
||||
fs::read(&accounts_file)
|
||||
.expect("error reading accounts file")
|
||||
.split(|o| *o == b'\n')
|
||||
.filter(|o| !o.is_empty())
|
||||
.map(|o| Account::from_bytes(o.to_vec()))
|
||||
.collect()
|
||||
} else {
|
||||
Vec::new()
|
||||
}
|
||||
} else {
|
||||
Vec::new()
|
||||
}
|
||||
}
|
||||
|
||||
fn load_messages(messages_file: Option<String>) -> Vec<u8> {
|
||||
if let Some(messages_file) = messages_file.clone() {
|
||||
if fs::exists(&messages_file).expect("error checking messages file") {
|
||||
fs::read(&messages_file).expect("error reading messages file")
|
||||
} else {
|
||||
Vec::new()
|
||||
}
|
||||
} else {
|
||||
Vec::new()
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Context {
|
||||
pub args: Arc<Args>,
|
||||
|
36
src/main.rs
36
src/main.rs
@ -1,46 +1,14 @@
|
||||
use std::{fs, sync::Arc};
|
||||
use std::sync::Arc;
|
||||
|
||||
use clap::Parser;
|
||||
use log::info;
|
||||
|
||||
use crate::{
|
||||
ctx::{Account, Context},
|
||||
proto::run_listener,
|
||||
};
|
||||
use crate::{ctx::Context, proto::run_listener};
|
||||
|
||||
pub mod ctx;
|
||||
pub mod logic;
|
||||
pub mod proto;
|
||||
|
||||
fn load_accounts(accounts_file: Option<String>) -> Vec<Account> {
|
||||
if let Some(accounts_file) = accounts_file.clone() {
|
||||
if fs::exists(&accounts_file).expect("error checking accounts file") {
|
||||
fs::read(&accounts_file)
|
||||
.expect("error reading accounts file")
|
||||
.split(|o| *o == b'\n')
|
||||
.filter(|o| !o.is_empty())
|
||||
.map(|o| Account::from_bytes(o.to_vec()))
|
||||
.collect()
|
||||
} else {
|
||||
Vec::new()
|
||||
}
|
||||
} else {
|
||||
Vec::new()
|
||||
}
|
||||
}
|
||||
|
||||
fn load_messages(messages_file: Option<String>) -> Vec<u8> {
|
||||
if let Some(messages_file) = messages_file.clone() {
|
||||
if fs::exists(&messages_file).expect("error checking messages file") {
|
||||
fs::read(&messages_file).expect("error reading messages file")
|
||||
} else {
|
||||
Vec::new()
|
||||
}
|
||||
} else {
|
||||
Vec::new()
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(version)]
|
||||
pub struct Args {
|
||||
|
Loading…
x
Reference in New Issue
Block a user