fix: csv writer consider special chars (#16)

* Close #14, csv writer consider special chars

* fix CI

.github/workflows/release.yml

@@ -42,3 +42,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RUSTTARGET: ${{ matrix.target }}
           EXTRA_FILES: "README.org"
+
+      - name: Publish on crates.io
+        run: cargo publish
+        env:
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "onehistory"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
-authors = ["Jiacai Liu <jiacai2050+1history@gmail.com>"]
+authors = ["Jiacai Liu <dev@liujiacai.net>"]
 description = "All your history in one file"
 homepage = "https://github.com/1History/1History"
 repository = "https://github.com/1History/1History"
@@ -28,4 +28,5 @@ minijinja = { version = "0.12.0",  features = ["builtins", "urlencode"]}
 glob = "0.3.0"
 chrono = "0.4"
 regex = "1"
-indicatif = "0.16.2"
+indicatif = "0.16.2"
+csv = "1.2.1"

src/database.rs

@@ -24,7 +24,7 @@ pub(crate) struct Database {
 
 impl Database {
     pub fn open(sqlite_datafile: String) -> Result<Database> {
-        let conn = Connection::open(&sqlite_datafile)?;
+        let conn = Connection::open(sqlite_datafile)?;
         let db = Self {
             conn: Mutex::new(conn),
             persist_batch: DEFAULT_BATCH_NUM,
@@ -122,7 +122,7 @@ INSERT INTO onehistory_visits (item_id, visit_time, visit_type)
             visit_type,
         } in batch
         {
-            match tx.execute(sql, &[&item_id, &visit_time, &visit_type]) {
+            match tx.execute(sql, [&item_id, &visit_time, &visit_type]) {
                 Ok(ret) => affected += ret,
                 Err(e) => {
                     if let sqlError::SqliteFailure(ffi_err, _msg) = &e {

src/export.rs

@@ -1,9 +1,6 @@
 use anyhow::{Context, Result};
 use log::{debug, info};
-use std::{
-    fs::OpenOptions,
-    io::{BufWriter, Write},
-};
+use std::{fs::OpenOptions, io::BufWriter};
 
 use crate::{
     database::Database,
@@ -21,22 +18,18 @@ pub fn export_csv(csv_file: String, db_file: String) -> Result<()> {
         .truncate(true)
         .open(&csv_file)
         .context(csv_file.clone())?;
-    let mut buf_writer = BufWriter::new(f);
+    let mut csv_writer = csv::Writer::from_writer(BufWriter::new(f));
 
-    buf_writer.write_all(b"time,title,url,visit_type\n")?;
+    csv_writer.write_record(["time", "title", "url", "visit_type"])?;
     let visits = db.select_visits(start, end, None)?;
     let len = visits.len();
     for visit in visits {
-        buf_writer.write_all(
-            format!(
-                "{},{},{},{}\n",
-                unixepoch_as_ymdhms(visit.visit_time),
-                visit.title.replace(',', ""),
-                visit.url,
-                visit.visit_type
-            )
-            .as_bytes(),
-        )?;
+        csv_writer.write_record(vec![
+            unixepoch_as_ymdhms(visit.visit_time),
+            visit.title,
+            visit.url,
+            visit.visit_type.to_string(),
+        ])?;
     }
     info!("Export {len} histories in {csv_file}.");
 

src/source.rs

@@ -14,7 +14,7 @@ pub struct Source {
 impl Source {
     pub fn open(path: &str) -> Result<Source> {
         let flags = OpenFlags::SQLITE_OPEN_READ_WRITE;
-        let conn = Connection::open_with_flags(&path, flags).context(path.to_string())?;
+        let conn = Connection::open_with_flags(path, flags).context(path.to_string())?;
         let name = Self::detect_name(&conn).context(format!("detect {path}"))?;
         Ok(Source {
             path: path.to_string(),

src/web.rs

@@ -87,7 +87,7 @@ impl Server {
                 ymd_ts => start,
                 visit_details => visit_details,
                 version => clap::crate_version!(),
-                keyword => keyword.unwrap_or_else(|| "".to_string()),
+                keyword => keyword.unwrap_or_default(),
             ))
             .map_err(|e| ServerError::from(Error::from(e)))?;
 
@@ -145,7 +145,7 @@ impl Server {
                 daily_counts => daily_counts,
                 title_top100 => title_top100,
                 domain_top100 => domain_top100,
-                keyword => keyword.unwrap_or_else(|| "".to_string()),
+                keyword => keyword.unwrap_or_default(),
                 version => clap::crate_version!(),
             ))
             .map_err(|e| ServerError::from(Error::from(e)))?;