Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
jeasonnow
2023-07-27 09:43:53 +08:00
15 changed files with 285 additions and 203 deletions

View File

@@ -1,9 +1,8 @@
use std::fs;
use crate::util::{check_file_or_append, get_download_message, MessageType, show_toast};
use tauri::{api, command, AppHandle, Manager, Window};
use tauri::api::http::{ClientBuilder, HttpRequestBuilder, ResponseType};
use crate::util::{check_file_or_append, get_download_message, show_toast, MessageType};
use std::fs::File;
use std::io::Write;
use tauri::api::http::{ClientBuilder, HttpRequestBuilder, ResponseType};
use tauri::{api, command, AppHandle, Manager, Window};
#[derive(serde::Deserialize)]
pub struct DownloadFileParams {
@@ -26,11 +25,13 @@ pub async fn download_file(app: AppHandle, params: DownloadFileParams) -> Result
let file_path = check_file_or_append(output_path.to_str().unwrap());
let client = ClientBuilder::new().build().unwrap();
let response = client.send(
HttpRequestBuilder::new("GET", &params.url)
.unwrap()
.response_type(ResponseType::Binary)
).await;
let response = client
.send(
HttpRequestBuilder::new("GET", &params.url)
.unwrap()
.response_type(ResponseType::Binary),
)
.await;
match response {
Ok(res) => {

View File

@@ -180,6 +180,11 @@ window.addEventListener('DOMContentLoaded', _event => {
visibility: hidden !important;
}
#__next > div.overflow-hidden.w-full.h-full .absolute.bottom-0.left-0.w-full > div.text-center.text-xs {
visibility: hidden !important;
height: 0px !important;
}
#react-root [data-testid="primaryColumn"] > div > div {
position: relative !important;
}

View File

@@ -8,9 +8,7 @@
"copyright": "",
"deb": {
"depends": ["curl", "wget"],
"files": {
"/usr/share/applications/com-pake-weread.desktop": "assets/com-pake-weread.desktop"
}
"files": {"/usr/share/applications/com-pake-weread.desktop": "assets/com-pake-weread.desktop"}
},
"externalBin": [],
"longDescription": "",