GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 22:42:25 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Read csv text in eagerly

Browse source 
This allows us to display a more useful "not utf-8" message, instead of a
generic "invalid csv" message when the metadata can't be fetched.
This commit is contained in:
Damien Elmes 2023-09-05 18:27:03 +10:00
parent ecaba5e655
commit fe8cf5ae7d
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rslib/src/import_export/text/csv/metadata.rs
View file

@ -5,11 +5,12 @@ use std::collections::HashMap;
use std::collections::HashSet; use std::collections::HashSet;
use std::io::BufRead; use std::io::BufRead;
use std::io::BufReader; use std::io::BufReader;
use std::io::Cursor;
use std::io::Read; use std::io::Read;
use std::io::Seek; use std::io::Seek;
use std::io::SeekFrom; use std::io::SeekFrom;
use anki_io::open_file; use anki_io::read_to_string;
pub use anki_proto::import_export::csv_metadata::Deck as CsvDeck; pub use anki_proto::import_export::csv_metadata::Deck as CsvDeck;
pub use anki_proto::import_export::csv_metadata::Delimiter; pub use anki_proto::import_export::csv_metadata::Delimiter;
pub use anki_proto::import_export::csv_metadata::DupeResolution; pub use anki_proto::import_export::csv_metadata::DupeResolution;
@ -45,7 +46,8 @@ impl Collection {
deck_id: Option<DeckId>, deck_id: Option<DeckId>,
is_html: Option<bool>, is_html: Option<bool>,
) -> Result<CsvMetadata> { ) -> Result<CsvMetadata> {
let mut reader = open_file(path)?; let text = read_to_string(path)?;
let mut reader = Cursor::new(text);
let meta = let meta =
self.get_reader_metadata(&mut reader, delimiter, notetype_id, deck_id, is_html)?; self.get_reader_metadata(&mut reader, delimiter, notetype_id, deck_id, is_html)?;
if meta.preview.is_empty() { if meta.preview.is_empty() {