fix: use path_macro in tests/codegen for cross-platform paths

codegen/Cargo.toml

@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-rustypipe = {path = "../"}
+rustypipe = { path = "../" }
 reqwest = "0.11.11"
-tokio = {version = "1.20.0", features = ["macros", "rt-multi-thread"]}
+tokio = { version = "1.20.0", features = ["macros", "rt-multi-thread"] }
 futures = "0.3.21"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.82"
@@ -20,3 +20,4 @@ once_cell = "1.12.0"
 fancy-regex = "0.10.0"
 indicatif = "0.17.0"
 num_enum = "0.5.7"
+path_macro = "1.0.0"

codegen/src/collect_album_types.rs

@@ -1,6 +1,7 @@
 use std::{collections::BTreeMap, fs::File, io::BufReader, path::Path};
 
 use futures::stream::{self, StreamExt};
+use path_macro::path;
 use rustypipe::{
     client::{ClientType, RustyPipe, RustyPipeQuery, YTContext},
     model::AlbumType,
@@ -11,8 +12,7 @@ use serde::{Deserialize, Serialize};
 use crate::util::{self, TextRuns};
 
 pub async fn collect_album_types(project_root: &Path, concurrency: usize) {
-    let mut json_path = project_root.to_path_buf();
-    json_path.push("testfiles/dict/album_type_samples.json");
+    let json_path = path!(project_root / "testfiles" / "dict" / "album_type_samples.json");
 
     let album_types = [
         (AlbumType::Album, "MPREb_nlBWQROfvjo"),
@@ -49,8 +49,7 @@ pub async fn collect_album_types(project_root: &Path, concurrency: usize) {
 }
 
 pub fn write_samples_to_dict(project_root: &Path) {
-    let mut json_path = project_root.to_path_buf();
-    json_path.push("testfiles/dict/album_type_samples.json");
+    let json_path = path!(project_root / "testfiles" / "dict" / "album_type_samples.json");
 
     let json_file = File::open(json_path).unwrap();
     let collected: BTreeMap<Language, BTreeMap<AlbumType, String>> =

codegen/src/collect_large_numbers.rs

@@ -5,6 +5,7 @@ use anyhow::{Context, Result};
 use fancy_regex::Regex;
 use futures::{stream, StreamExt};
 use once_cell::sync::Lazy;
+use path_macro::path;
 use reqwest::{header, Client};
 use rustypipe::param::{locale::LANGUAGES, Language};
 use serde::Deserialize;
@@ -30,11 +31,9 @@ type CollectedNumbers = BTreeMap<Language, BTreeMap<u8, (String, u64)>>;
 /// outputs view counts both in approximated and exact format, so we can use
 /// the exact counts to figure out the tokens.
 pub async fn collect_large_numbers(project_root: &Path, concurrency: usize) {
-    let mut json_path = project_root.to_path_buf();
-    json_path.push("testfiles/dict/large_number_samples.json");
-
-    let mut json_path_all = project_root.to_path_buf();
-    json_path_all.push("testfiles/dict/large_number_samples_all.json");
+    let json_path = path!(project_root / "testfiles" / "dict" / "large_number_samples.json");
+    let json_path_all =
+        path!(project_root / "testfiles" / "dict" / "large_number_samples_all.json");
 
     let channels = [
         "UCq-Fj5jknLsUf-MWSy4_brA", // 10e8 (225M)
@@ -117,8 +116,7 @@ pub fn write_samples_to_dict(project_root: &Path) {
     "M": 6
     */
 
-    let mut json_path = project_root.to_path_buf();
-    json_path.push("testfiles/dict/large_number_samples.json");
+    let json_path = path!(project_root / "testfiles" / "dict" / "large_number_samples.json");
 
     let json_file = File::open(json_path).unwrap();
     let collected_nums: CollectedNumbers =

codegen/src/collect_playlist_dates.rs

@@ -7,6 +7,7 @@ use std::{
 };
 
 use futures::{stream, StreamExt};
+use path_macro::path;
 use rustypipe::{
     client::RustyPipe,
     param::{locale::LANGUAGES, Language},
@@ -62,8 +63,7 @@ enum DateCase {
 /// Because the relative dates change with time, the first three playlists
 /// have to checked and eventually changed before running the program.
 pub async fn collect_dates(project_root: &Path, concurrency: usize) {
-    let mut json_path = project_root.to_path_buf();
-    json_path.push("testfiles/dict/playlist_samples.json");
+    let json_path = path!(project_root / "testfiles" / "dict" / "playlist_samples.json");
 
     // These are the sample playlists
     let cases = [
@@ -116,8 +116,7 @@ pub async fn collect_dates(project_root: &Path, concurrency: usize) {
 /// The ND (no digit) tokens (today, tomorrow) of some languages cannot be
 /// parsed automatically and require manual work.
 pub fn write_samples_to_dict(project_root: &Path) {
-    let mut json_path = project_root.to_path_buf();
-    json_path.push("testfiles/dict/playlist_samples.json");
+    let json_path = path!(project_root / "testfiles" / "dict" / "playlist_samples.json");
 
     let json_file = File::open(json_path).unwrap();
     let collected_dates: CollectedDates =

codegen/src/util.rs

@@ -1,9 +1,17 @@
-use std::{collections::BTreeMap, fs::File, io::BufReader, path::Path, str::FromStr};
+use std::{
+    collections::BTreeMap,
+    fs::File,
+    io::BufReader,
+    path::{Path, PathBuf},
+    str::FromStr,
+};
 
+use once_cell::sync::Lazy;
+use path_macro::path;
 use rustypipe::{model::AlbumType, param::Language};
 use serde::{Deserialize, Serialize};
 
-const DICT_PATH: &str = "testfiles/dict/dictionary.json";
+static DICT_PATH: Lazy<PathBuf> = Lazy::new(|| path!("testfiles" / "dict" / "dictionary.json"));
 
 type Dictionary = BTreeMap<Language, DictEntry>;
 
@@ -62,15 +70,13 @@ pub struct Text {
 }
 
 pub fn read_dict(project_root: &Path) -> Dictionary {
-    let mut json_path = project_root.to_path_buf();
-    json_path.push(DICT_PATH);
+    let json_path = path!(project_root / *DICT_PATH);
     let json_file = File::open(json_path).unwrap();
     serde_json::from_reader(BufReader::new(json_file)).unwrap()
 }
 
 pub fn write_dict(project_root: &Path, dict: &Dictionary) {
-    let mut json_path = project_root.to_path_buf();
-    json_path.push(DICT_PATH);
+    let json_path = path!(project_root / *DICT_PATH);
     let json_file = File::create(json_path).unwrap();
     serde_json::to_writer_pretty(json_file, dict).unwrap();
 }