Hexor/mus-fuse
1
0
Fork 0
mirror of https://github.com/house-of-vanity/mus-fuse.git synced 2025-07-06 21:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added Size metadata. Fixing read method.

Browse Source
This commit is contained in:
AB
2020-04-18 04:39:06 +03:00
parent c97dfbd507
commit 2f02dd80dc
3 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@ -16,7 +16,7 @@
}, },
"args": [ "args": [
"mnt", "mnt",
"https://mus.hexor.ru" "http://mus_.hexor.ru"
], ],
"cwd": "${workspaceFolder}", "cwd": "${workspaceFolder}",
"postDebugTask": "Umount FUSE", "postDebugTask": "Umount FUSE",

2
.vscode/settings.json vendored
View File

@ -1,5 +1,5 @@
{ {
"lldb.displayFormat": "auto", "lldb.displayFormat": "auto",
"lldb.showDisassembly": "always", "lldb.showDisassembly": "never",
"lldb.dereferencePointers": true "lldb.dereferencePointers": true
} }

68
src/main.rs
View File

@ -10,8 +10,8 @@ use reqwest::blocking::Client;
use reqwest::blocking::Response; use reqwest::blocking::Response;
use reqwest::header::CONTENT_LENGTH; use reqwest::header::CONTENT_LENGTH;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::ffi::OsStr;
use std::env; use std::env;
use std::ffi::OsStr;
use time::Timespec; use time::Timespec;
//use http::Method; //use http::Method;
@ -31,6 +31,7 @@ pub struct Track {
pub format: Option<String>, pub format: Option<String>,
pub filetype: Option<String>, pub filetype: Option<String>,
pub path: Option<String>, pub path: Option<String>,
pub Size: Option<i64>,
} }
const CACHE_HEAD: i64 = 1024 * 1024; const CACHE_HEAD: i64 = 1024 * 1024;
@ -95,12 +96,27 @@ impl JsonFilesystem {
}; };
attrs.insert(1, attr); attrs.insert(1, attr);
inodes.insert("/".to_string(), 1); inodes.insert("/".to_string(), 1);
let client = Client::new();
let mut resp: Response;
for (i, track) in tree.iter().enumerate() { for (i, track) in tree.iter().enumerate() {
let basename = get_basename(track.path.as_ref()).unwrap().to_string(); let basename = get_basename(track.path.as_ref()).unwrap().to_string();
/*
let full_url = format!("{}/{}", server, track.path.as_ref().unwrap().to_string());
resp = client.head(full_url.as_str()).send().unwrap();
let content_length = resp
.headers()
.get(CONTENT_LENGTH)
.unwrap()
.to_str()
.unwrap()
.parse::<u64>()
.unwrap();
println!("{} len is {}", basename, content_length);
*/
let attr = FileAttr { let attr = FileAttr {
ino: i as u64 + 2, ino: i as u64 + 2,
//size: 1024 * 1024 * 1024 as u64, //size: 1024 * 1024 * 1024 as u64,
size: 591646132, size: track.Size.unwrap() as u64,
blocks: 0, blocks: 0,
atime: ts, atime: ts,
mtime: ts, mtime: ts,
@ -203,32 +219,29 @@ impl Filesystem for JsonFilesystem {
if content_length > offset { if content_length > offset {
print!("Content len {:?} ", content_length); print!("Content len {:?} ", content_length);
let mut end_of_chunk = offset - 1 + size as i64; let end_of_chunk = if size - 1 + offset as u32 > content_length as u32 {
let range = format!( content_length
"bytes={}-{}", } else {
offset, (size + offset as u32) as i64
if (end_of_chunk) > content_length { };
content_length let range = format!("bytes={}-{}", offset, end_of_chunk - 1);
} else {
end_of_chunk
}
);
// if it's beginning of file... // if it's beginning of file...
if (offset - 1 + size as i64) < CACHE_HEAD { if end_of_chunk < CACHE_HEAD {
// cleaning cache before. it should be less than MAX_CACHE_SIZE bytes // cleaning cache before. it should be less than MAX_CACHE_SIZE bytes
if self.buffer_head.len() as i64 * CACHE_HEAD > MAX_CACHE_SIZE { if self.buffer_head.len() as i64 * CACHE_HEAD > MAX_CACHE_SIZE {
let (key, _) = self.buffer_head.iter_mut().next().unwrap(); let (key, _) = self.buffer_head.iter_mut().next().unwrap();
let key_cpy: String = key.to_string(); let key_cpy: String = key.to_string();
self.buffer_head.remove(&key_cpy); if *key == key_cpy {
print!(" *Cache Cleaned* "); self.buffer_head.remove(&key_cpy);
print!(" *Cache Cleaned* ");
}
} }
// looking for CACHE_HEAD bytes file beginning in cache // looking for CACHE_HEAD bytes file beginning in cache
if self.buffer_head.contains_key(id.as_str()) { if self.buffer_head.contains_key(id.as_str()) {
print!("Hit head cache! "); print!("Hit head cache! ");
chunk = self.buffer_head[id.as_str()] chunk = self.buffer_head[id.as_str()][offset as usize..end_of_chunk as usize]
[offset as usize..(size + offset as u32) as usize]
.to_vec() .to_vec()
.clone(); .clone();
reply.data(&chunk); reply.data(&chunk);
@ -241,9 +254,9 @@ impl Filesystem for JsonFilesystem {
format!( format!(
"bytes=0-{}", "bytes=0-{}",
if CACHE_HEAD > content_length { if CACHE_HEAD > content_length {
content_length content_length - 1
} else { } else {
CACHE_HEAD CACHE_HEAD - 1
} }
), ),
) )
@ -251,11 +264,6 @@ impl Filesystem for JsonFilesystem {
.unwrap(); .unwrap();
let response = resp.bytes().unwrap(); let response = resp.bytes().unwrap();
self.buffer_head.insert(id.to_string(), response.to_vec()); self.buffer_head.insert(id.to_string(), response.to_vec());
end_of_chunk = if content_length < end_of_chunk {
content_length
} else {
end_of_chunk
};
chunk = response[offset as usize..end_of_chunk as usize].to_vec(); chunk = response[offset as usize..end_of_chunk as usize].to_vec();
reply.data(&chunk); reply.data(&chunk);
} }
@ -274,7 +282,7 @@ impl Filesystem for JsonFilesystem {
" Len: {}, Chunk {} - {}", " Len: {}, Chunk {} - {}",
chunk.len(), chunk.len(),
offset, offset,
offset - 1 + chunk.len() as i64 offset + chunk.len() as i64
); );
} else { } else {
println!( println!(
@ -317,14 +325,20 @@ fn main() {
let mountpoint = match env::args().nth(1) { let mountpoint = match env::args().nth(1) {
Some(path) => path, Some(path) => path,
None => { None => {
println!("Usage: {} <MOUNTPOINT> <SERVER>", env::args().nth(0).unwrap()); println!(
"Usage: {} <MOUNTPOINT> <SERVER>",
env::args().nth(0).unwrap()
);
return; return;
} }
}; };
let server = match env::args().nth(2) { let server = match env::args().nth(2) {
Some(server) => server, Some(server) => server,
None => { None => {
println!("Usage: {} <MOUNTPOINT> <SERVER>", env::args().nth(0).unwrap()); println!(
"Usage: {} <MOUNTPOINT> <SERVER>",
env::args().nth(0).unwrap()
);
return; return;
} }
}; };