thallada/BazaarRealmClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More consistent cache file names

Browse Source
This commit is contained in:
Tyler Hallada 2020-11-05 19:30:18 -05:00
parent 127a68687e
commit 2b82d09d17
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/interior_ref_list.rs
View File

@ -220,9 +220,9 @@ pub extern "C" fn update_interior_ref_list(
info!("update interior_ref_list response from api: {:?}", &resp); info!("update interior_ref_list response from api: {:?}", &resp);
let cache_dir = file_cache_dir(api_url)?; let cache_dir = file_cache_dir(api_url)?;
let body_cache_path = cache_dir.join(format!("shops_{}_interior_ref_list.json", shop_id)); let body_cache_path = cache_dir.join(format!("shop_{}_interior_ref_list.json", shop_id));
let metadata_cache_path = let metadata_cache_path =
cache_dir.join(format!("shops_{}_interior_ref_list_metadata.json", shop_id)); cache_dir.join(format!("shop_{}_interior_ref_list_metadata.json", shop_id));
let bytes = update_file_caches(&body_cache_path, &metadata_cache_path, resp)?; let bytes = update_file_caches(&body_cache_path, &metadata_cache_path, resp)?;
let json: InteriorRefList = serde_json::from_slice(&bytes)?; let json: InteriorRefList = serde_json::from_slice(&bytes)?;
Ok(json) Ok(json)
@ -378,9 +378,9 @@ pub extern "C" fn get_interior_ref_list_by_shop_id(
let client = reqwest::blocking::Client::new(); let client = reqwest::blocking::Client::new();
let cache_dir = file_cache_dir(api_url)?; let cache_dir = file_cache_dir(api_url)?;
let body_cache_path = cache_dir.join(format!("shops_{}_interior_ref_list.json", shop_id)); let body_cache_path = cache_dir.join(format!("shop_{}_interior_ref_list.json", shop_id));
let metadata_cache_path = let metadata_cache_path =
cache_dir.join(format!("shops_{}_interior_ref_list_metadata.json", shop_id)); cache_dir.join(format!("shop_{}_interior_ref_list_metadata.json", shop_id));
let mut request = client.get(url).header("Api-Key", api_key); let mut request = client.get(url).header("Api-Key", api_key);
// TODO: load metadata from in-memory LRU cache first before trying to load from file // TODO: load metadata from in-memory LRU cache first before trying to load from file
if let Ok(metadata) = load_metadata_from_file_cache(&metadata_cache_path) { if let Ok(metadata) = load_metadata_from_file_cache(&metadata_cache_path) {

8
src/merchandise_list.rs
View File

@ -205,9 +205,9 @@ pub extern "C" fn update_merchandise_list(
info!("update merchandise_list response from api: {:?}", &resp); info!("update merchandise_list response from api: {:?}", &resp);
let cache_dir = file_cache_dir(api_url)?; let cache_dir = file_cache_dir(api_url)?;
let body_cache_path = cache_dir.join(format!("shops_{}_merchandise_list.json", shop_id)); let body_cache_path = cache_dir.join(format!("shop_{}_merchandise_list.json", shop_id));
let metadata_cache_path = let metadata_cache_path =
cache_dir.join(format!("shops_{}_merchandise_list_metadata.json", shop_id)); cache_dir.join(format!("shop_{}_merchandise_list_metadata.json", shop_id));
let bytes = update_file_caches(&body_cache_path, &metadata_cache_path, resp)?; let bytes = update_file_caches(&body_cache_path, &metadata_cache_path, resp)?;
let json: MerchandiseList = serde_json::from_slice(&bytes)?; let json: MerchandiseList = serde_json::from_slice(&bytes)?;
Ok(json) Ok(json)
@ -359,9 +359,9 @@ pub extern "C" fn get_merchandise_list_by_shop_id(
let client = reqwest::blocking::Client::new(); let client = reqwest::blocking::Client::new();
let cache_dir = file_cache_dir(api_url)?; let cache_dir = file_cache_dir(api_url)?;
let body_cache_path = cache_dir.join(format!("shops_{}_merchandise_list.json", shop_id)); let body_cache_path = cache_dir.join(format!("shop_{}_merchandise_list.json", shop_id));
let metadata_cache_path = let metadata_cache_path =
cache_dir.join(format!("shops_{}_merchandise_list_metadata.json", shop_id)); cache_dir.join(format!("shop_{}_merchandise_list_metadata.json", shop_id));
let mut request = client.get(url).header("Api-Key", api_key); let mut request = client.get(url).header("Api-Key", api_key);
// TODO: load metadata from in-memory LRU cache first before trying to load from file // TODO: load metadata from in-memory LRU cache first before trying to load from file
if let Ok(metadata) = load_metadata_from_file_cache(&metadata_cache_path) { if let Ok(metadata) = load_metadata_from_file_cache(&metadata_cache_path) {