diff --git a/maple-rs/src/db.rs b/maple-rs/src/db.rs index 8f535ea..2123bde 100644 --- a/maple-rs/src/db.rs +++ b/maple-rs/src/db.rs @@ -1,3 +1,4 @@ +use rekordcrate::pdb::PageError; use rekordcrate::pdb::RowGroup; use rekordcrate::pdb::Artwork; use rekordcrate::pdb::ArtworkId; @@ -56,7 +57,7 @@ pub struct Database { const PAGE_SIZE: u16 = 4096; impl Database { - pub fn export(self, path: &Path) -> Result<(), binrw::Error> { + pub fn export(self, path: &Path) -> Result<(), PageError> { let pages = Table::from_rows(PageType::Tracks, 1, PAGE_SIZE, self.tracks.values().cloned().map(Row::Track))?; println!("{:?}", pages.len()); println!("{:?}", pages.last()); diff --git a/maple-rs/src/main.rs b/maple-rs/src/main.rs index 4f8d76d..be76add 100644 --- a/maple-rs/src/main.rs +++ b/maple-rs/src/main.rs @@ -3,6 +3,7 @@ mod db; extern crate walkdir; use rekordcrate::pdb::Page; +use rekordcrate::pdb::PageError; use rekordcrate::pdb::PageIndex; use rekordcrate::pdb::Row::PlaylistEntry; use rekordcrate::pdb::string::DeviceSQLString; @@ -19,8 +20,8 @@ use std::{fs::exists, path::Path}; use db::Database; // Example -fn main() -> rekordcrate::Result<()> { - let db = Database::load_from_pdb("ntr.pdb")?; +fn main() -> Result<(), PageError> { + let db = Database::load_from_pdb("ntr.pdb").unwrap(); println!("tracks: {}, playlists: {}", db.tracks.len(), db.nodes.len()); println!("tables: {:?}", db.header); println!("tables: {:?}", db.header.tables);