G2/minidisc-cli
1
0
Fork 0
mirror of https://github.com/G2-Games/minidisc-cli.git synced 2025-04-19 11:42:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix RH1 track download

Browse source
This commit is contained in:
asivery 2023-09-28 00:51:33 +02:00
parent 1cb19a51d3
commit 014edcea57
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
minidisc-rs/src/netmd/base.rs
View file

@ -3,7 +3,7 @@ use once_cell::sync::Lazy;
use rusb::{DeviceDescriptor, DeviceHandle, Direction, GlobalContext, Recipient, RequestType}; use rusb::{DeviceDescriptor, DeviceHandle, Direction, GlobalContext, Recipient, RequestType};
use std::error::Error; use std::error::Error;
const DEFAULT_TIMEOUT: std::time::Duration = std::time::Duration::new(1, 0); const DEFAULT_TIMEOUT: std::time::Duration = std::time::Duration::new(9999999, 0);
const STANDARD_SEND: u8 = const STANDARD_SEND: u8 =
rusb::request_type(Direction::Out, RequestType::Vendor, Recipient::Interface); rusb::request_type(Direction::Out, RequestType::Vendor, Recipient::Interface);
@ -11,7 +11,7 @@ const STANDARD_RECV: u8 =
rusb::request_type(Direction::In, RequestType::Vendor, Recipient::Interface); rusb::request_type(Direction::In, RequestType::Vendor, Recipient::Interface);
const BULK_WRITE_ENDPOINT: u8 = 0x02; const BULK_WRITE_ENDPOINT: u8 = 0x02;
const BULK_READ_ENDPOINT: u8 = 0x01; const BULK_READ_ENDPOINT: u8 = 0x81;
pub const CHUNKSIZE: u32 = 0x10000; pub const CHUNKSIZE: u32 = 0x10000;
@ -110,7 +110,8 @@ impl NetMD {
if device_type.vendor_id == model.vendor_id if device_type.vendor_id == model.vendor_id
&& device_type.product_id == model.product_id && device_type.product_id == model.product_id
{ {
model.name = device_type.name.clone() model.name = device_type.name.clone();
break;
} }
} }
@ -273,7 +274,7 @@ impl NetMD {
length: u32, length: u32,
chunksize: u32, chunksize: u32,
) -> Result<Vec<u8>, Box<dyn Error>> { ) -> Result<Vec<u8>, Box<dyn Error>> {
let final_result: Vec<u8> = Vec::new(); let mut final_result: Vec<u8> = Vec::new();
let mut done = 0; let mut done = 0;
while done < length { while done < length {
@ -285,6 +286,7 @@ impl NetMD {
&mut buffer, &mut buffer,
DEFAULT_TIMEOUT, DEFAULT_TIMEOUT,
)? as u32; )? as u32;
final_result.extend_from_slice(&mut buffer);
} }
Ok(final_result) Ok(final_result)
@ -293,7 +295,7 @@ impl NetMD {
pub fn write_bulk(&self, data: &mut Vec<u8>) -> Result<usize, Box<dyn Error>> { pub fn write_bulk(&self, data: &mut Vec<u8>) -> Result<usize, Box<dyn Error>> {
let written = let written =
self.device_connection self.device_connection
.read_bulk(BULK_WRITE_ENDPOINT, data, DEFAULT_TIMEOUT)?; .write_bulk(BULK_WRITE_ENDPOINT, data, DEFAULT_TIMEOUT)?;
Ok(written) Ok(written)
} }

2
minidisc-rs/src/netmd/interface.rs
View file

@ -1230,7 +1230,7 @@ impl NetMDInterface {
], ],
)?; )?;
let reply = self.send_query(&mut query, false, false)?; let reply = self.send_query(&mut query, false, true)?;
let res = scan_query(reply, "1800 080046 f0030103 300000 1001 %w %b %d".to_string())?; let res = scan_query(reply, "1800 080046 f0030103 300000 1001 %w %b %d".to_string())?;

6
src/main.rs
View file

@ -5,13 +5,19 @@ use minidisc_rs::netmd::interface;
use rusb; use rusb;
fn main() { fn main() {
let mut die = false;
for device in rusb::devices().unwrap().iter() { for device in rusb::devices().unwrap().iter() {
if die {
break;
}
let device_desc = device.device_descriptor().unwrap(); let device_desc = device.device_descriptor().unwrap();
let new_device = match device.open() { let new_device = match device.open() {
Ok(device) => device, Ok(device) => device,
Err(_) => continue, Err(_) => continue,
}; };
die = true;
println!( println!(
"Connected to Bus {:03} Device {:03} VID: {:04x}, PID: {:04x}, {:?}", "Connected to Bus {:03} Device {:03} VID: {:04x}, PID: {:04x}, {:?}",