jie/wisun_download
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复Warning

Browse Source
This commit is contained in:
JIe
2024-12-11 14:13:19 +08:00
parent 410a2ad5e1
commit 969e2c2d5e
4 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/inspectionProfiles/Project_Default.xml generated
View File

@@ -1,6 +1,11 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
<Languages>
<language minSize="168" name="Rust" />
</Languages>
</inspection_tool>
<inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoredPackages">
<value>

29
src/download_wrapper.rs
View File

@@ -1,7 +1,7 @@
use std::fmt::Display;
use crate::download_wrapper::DownloadError::JlinkNotFindError;
use anyhow::Error;
use std::fs;
use std::path::{Path, PathBuf};
use std::path::PathBuf;
use std::process::Command;
use std::io::Write;
@@ -20,13 +20,14 @@ pub enum DownloadType {
Rail,
}
impl ToString for DownloadType {
fn to_string(&self) -> String {
match self {
impl Display for DownloadType {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let str = match self {
DownloadType::Bootloader => "BootLoader".to_string(),
DownloadType::App => "App".to_string(),
DownloadType::Rail => "Rail".to_string(),
}
};
write!(f, "{}", str)
}
}
@@ -142,10 +143,10 @@ impl DownloadWrapper {
} else {
let Some(label) = label else { return Err(DownloadError::NoLabel) };
match self.save_log(label, result_str.clone()) {
Ok(res) => {
Ok(_) => {
Ok(result_str)
}
Err(e) => {
Err(_) => {
Err(DownloadError::DownloadBootloaderError)
}
}
@@ -193,10 +194,10 @@ impl DownloadWrapper {
} else {
let Some(label) = label else { return Err(DownloadError::NoLabel) };
match self.save_log(label, result_str.clone()) {
Ok(res) => {
Ok(_) => {
Ok(result_str)
}
Err(e) => {
Err(_) => {
Err(DownloadError::DownloadBootloaderError)
}
}
@@ -250,28 +251,28 @@ impl DownloadWrapper {
#[test]
fn test_erase_device() {
let dw = DownloadWrapper::new();
let result = dw.erase();
let result = dw.erase(Some("111".to_string()));
assert_eq!(result.is_ok(), true);
}
#[test]
fn test_download_bootloader() {
let dw = DownloadWrapper::new();
let result = dw.download(DownloadType::Bootloader);
let result = dw.download(DownloadType::Bootloader, Some("111".to_string()));
assert_eq!(result.is_ok(), true);
}
#[test]
fn test_download_app() {
let dw = DownloadWrapper::new();
let result = dw.download(DownloadType::App);
let result = dw.download(DownloadType::App, Some("111".to_string()));
assert_eq!(result.is_ok(), true);
}
#[test]
fn test_download_rail() {
let dw = DownloadWrapper::new();
let result = dw.download(DownloadType::Rail);
let result = dw.download(DownloadType::Rail, Some("111".to_string()));
assert_eq!(result.is_ok(), true);
}
}

18
src/main.rs
View File

@@ -12,7 +12,7 @@ use iced::widget::text_editor::Edit;
use iced::widget::{
button, checkbox, column, container, progress_bar, radio, row, text_editor, text_input,
};
use iced::{event, time, window, Background, Border, Color, Element, Event, Length, Subscription, Task};
use iced::{event, time, window, Border, Color, Element, Event, Length, Subscription, Task};
use serde_json::Map;
use std::any::Any;
use std::fs;
@@ -210,10 +210,10 @@ impl MainWindow {
}
Message::WindowEvent(event) => {
//println!("{:?}", event);
if let Event::Window(window::Event::Opened { position, size }) = event {
if let Event::Window(window::Event::Opened { position: _position, size: _size }) = event {
println!("Opened");
self.read_config();
return Task::none();
return Task::none()
};
if let Event::Window(window::Event::CloseRequested) = event {
println!("Request Close");
@@ -336,14 +336,14 @@ impl MainWindow {
}
}
add_log("正在检查JLink连接".to_string());
if let Err(e) = download_wrapper.check_jlink() {
if let Err(_) = download_wrapper.check_jlink() {
add_log("JLink检查失败, 请检查是否安装驱动或连接是否异常".to_string());
sender.send(Message::DownloadEnd((label, false))).unwrap();
return;
}
add_log("JLink检查成功".to_string());
add_log("正在检查设备连接".to_string());
if let Err(e) = download_wrapper.check_device() {
if let Err(_) = download_wrapper.check_device() {
add_log("设备检查失败, 请检查设备是否连接".to_string());
sender.send(Message::DownloadEnd((label, false))).unwrap();
return;
@@ -353,14 +353,14 @@ impl MainWindow {
DownloadType::Bootloader => {}
DownloadType::App => {
add_log("正在擦除Flash".to_string());
if let Err(e) = download_wrapper.erase(Some(label.clone())) {
if let Err(_) = download_wrapper.erase(Some(label.clone())) {
add_log("擦除失败".to_string());
sender.send(Message::DownloadEnd((label, false))).unwrap();
return;
}
add_log("擦除成功".to_string());
add_log("正在下载BootLoader".to_string());
if let Err(e) =
if let Err(_) =
download_wrapper.download(DownloadType::Bootloader, Some(label.clone()))
{
add_log("下载BootLoader失败".to_string());
@@ -369,7 +369,7 @@ impl MainWindow {
}
add_log("下载BootLoader成功".to_string());
add_log("正在下载App".to_string());
if let Err(e) = download_wrapper.download(download_type, Some(label.clone())) {
if let Err(_) = download_wrapper.download(download_type, Some(label.clone())) {
add_log("下载App失败".to_string());
sender.send(Message::DownloadEnd((label, false))).unwrap();
return;
@@ -378,7 +378,7 @@ impl MainWindow {
}
DownloadType::Rail => {
add_log("正在下载Rail".to_string());
if let Err(e) = download_wrapper.download(download_type, Some(label.clone())) {
if let Err(_) = download_wrapper.download(download_type, Some(label.clone())) {
add_log("下载Rail失败".to_string());
sender.send(Message::DownloadEnd((label, false))).unwrap();
return;

1
src/mes_service.rs
View File

@@ -101,7 +101,6 @@ impl MesService {
#[cfg(test)]
mod test {
use crate::download_wrapper::DownloadType;
use crate::mes_service::MesService;
#[test]