diff --git a/CHANGELOG.md b/CHANGELOG.md index d5afe384..4638fa9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## `1.1.5` (2022-02-23) + +### Bug Fixes +- Fix panic when query sector size + ## `1.1.4` (2022-02-13) ### Bug Fixes diff --git a/Cargo.lock b/Cargo.lock index 8341c701..52f86114 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2011,7 +2011,7 @@ dependencies = [ [[package]] name = "serverbee-deploy" -version = "1.1.4" +version = "1.1.5" dependencies = [ "anyhow", "auto-launch", @@ -2034,7 +2034,7 @@ dependencies = [ [[package]] name = "serverbee-web" -version = "1.1.4" +version = "1.1.5" dependencies = [ "actix", "actix-codec", diff --git a/README.md b/README.md index 878d3045..72cbc40b 100644 --- a/README.md +++ b/README.md @@ -46,11 +46,11 @@ From [Release Page](https://github.com/ZingerLittleBee/server_bee-backend/releas ```bash # tips: download the corresponding version according to the system architecture # macOS -wget https://github.com/ZingerLittleBee/server_bee-backend/releases/download/v1.1.3/serverbee-deploy-x86_64-apple-darwin.zip +wget https://github.com/ZingerLittleBee/server_bee-backend/releases/download/v1.1.5/serverbee-deploy-x86_64-apple-darwin.zip unzip serverbee-deploy-x86_64-apple-darwin.zip # Linux -wget https://github.com/ZingerLittleBee/server_bee-backend/releases/download/v1.1.3/serverbee-deploy-x86_64-unknown-linux-musl.zip +wget https://github.com/ZingerLittleBee/server_bee-backend/releases/download/v1.1.5/serverbee-deploy-x86_64-unknown-linux-musl.zip unzip serverbee-deploy-x86_64-unknown-linux-musl.zip # default port is 9527 diff --git a/README.zh-CN.md b/README.zh-CN.md index fe291479..ce73e73d 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -45,11 +45,11 @@ iOS 应用 [ServerBee](https://apps.apple.com/us/app/serverbee/id6443553714) 的 ```bash # 注意根据系统架构下载对应版本 # macOS -wget https://github.com/ZingerLittleBee/server_bee-backend/releases/download/v1.1.3/serverbee-deploy-x86_64-apple-darwin.zip +wget https://github.com/ZingerLittleBee/server_bee-backend/releases/download/v1.1.5/serverbee-deploy-x86_64-apple-darwin.zip unzip serverbee-deploy-x86_64-apple-darwin.zip # Linux -wget https://github.com/ZingerLittleBee/server_bee-backend/releases/download/v1.1.3/serverbee-deploy-x86_64-unknown-linux-musl.zip +wget https://github.com/ZingerLittleBee/server_bee-backend/releases/download/v1.1.5/serverbee-deploy-x86_64-unknown-linux-musl.zip unzip serverbee-deploy-x86_64-unknown-linux-musl.zip # 默认端口是 9527 diff --git a/deploy/Cargo.toml b/deploy/Cargo.toml index 8aa62523..9fdd5d98 100644 --- a/deploy/Cargo.toml +++ b/deploy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serverbee-deploy" -version = "1.1.4" +version = "1.1.5" edition = "2021" [features] diff --git a/web/Cargo.toml b/web/Cargo.toml index 053f06d1..e0244145 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serverbee-web" -version = "1.1.4" +version = "1.1.5" edition = "2021" [features] diff --git a/web/src/system_info.rs b/web/src/system_info.rs index e2fb1069..43870bc0 100644 --- a/web/src/system_info.rs +++ b/web/src/system_info.rs @@ -142,15 +142,32 @@ impl SystemInfo { io::Read, }; let mut map = HashMap::new(); - let block_paths = read_dir("/sys/block").unwrap(); - for path in block_paths { - let path = path.unwrap().path(); - let mut file = File::open(path.join("queue/hw_sector_size")).unwrap(); + + let block_paths; + + let read_block = read_dir("/sys/block"); + + if read_block.is_ok() { + block_paths = read_block.unwrap(); + } else { + return map; + } + + for block_path in block_paths { + let path = block_path.unwrap().path(); + let mut file = if let Ok(file) = File::open(path.join("queue/hw_sector_size")) { + file + } else { + continue; + }; let mut sector_size = String::new(); - file.read_to_string(&mut sector_size).unwrap(); + match file.read_to_string(&mut sector_size) { + Ok(_) => {}, + Err(_) => continue + } map.insert( path.file_name().unwrap().to_str().unwrap().to_string(), - sector_size.trim().parse::().unwrap(), + sector_size.trim().parse::().unwrap_or(512), ); } map