feat: prefix filename with league name

shonya3 · May 19, 2023 · b10ebcf · b10ebcf
1 parent 681c348
commit b10ebcf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src-tauri/lib/src/prices.rs b/src-tauri/lib/src/prices.rs
@@ -1,5 +1,5 @@
 use crate::paths;
-use divi::{error::Error, League, Prices};
+use divi::{League, Prices};
 use std::{fs, path::Path};
 
 pub const DAY_AS_SECS: u64 = 86_400;
@@ -35,7 +35,7 @@ pub async fn prices(league: &League) -> Prices {
 }
 
 //TODO: add error types
-pub async fn update(league: &League) -> Result<Prices, Error> {
+pub async fn update(league: &League) -> Result<Prices, reqwest::Error> {
     let prices = Prices::fetch(league).await?;
     let json = serde_json::to_string(&prices).unwrap();
     std::fs::write(paths::prices(league), &json).unwrap();

diff --git a/src/composables/useFileCard.ts b/src/composables/useFileCard.ts
@@ -2,10 +2,23 @@ import { computed, reactive, ref, watch } from 'vue';
 import { useSample } from './useSample';
 import { useCsvFile } from './useCsvFile';
 import { FileCardProps } from '../components/FileCard/FileCard.vue';
-import { League } from '../types';
+import { CsvExt, League, isCsvExt, leagues } from '../types';
 import { command } from '../command';
 import { csvFile } from '../lib';
 
+const prefixFilename = (name: string, league: League): CsvExt => {
+	const UNDERSCORE_GLUE = '_';
+	const res: CsvExt = isCsvExt(name) ? name : `${name}.csv`;
+
+	for (const old of leagues) {
+		if (res.startsWith(`${old}${UNDERSCORE_GLUE}`)) {
+			return res.replace(old, league) as CsvExt;
+		}
+	}
+
+	return `${league}${UNDERSCORE_GLUE}${res}`;
+};
+
 export const useFileCard = (file: File, league: League): FileCardProps => {
 	const { text: csv, name: filename, href } = useCsvFile(file);
 	const { data, error, isError } = useSample(csv, league);
@@ -18,7 +31,7 @@ export const useFileCard = (file: File, league: League): FileCardProps => {
 		valid,
 		selected,
 		sample: data,
-		filename,
+		filename: prefixFilename(filename.value, league),
 		href,
 		error,
 		isError,
@@ -47,6 +60,7 @@ export const useFileCard = (file: File, league: League): FileCardProps => {
 		() => props.league,
 		async val => {
 			props.sample = await command('league', { league: val, sample: props.sample });
+			props.filename = prefixFilename(props.filename, val);
 		}
 	);
 

diff --git a/src/stores/fileCards.ts b/src/stores/fileCards.ts
@@ -59,7 +59,7 @@ export const useFileCardsStore = defineStore('filecardsStore', {
 		},
 
 		downloadAll() {
-			this.validFiles.forEach(({ filename, href, league }) => downloadFile(`${league}_${filename}`, href));
+			this.validFiles.forEach(({ filename, href }) => downloadFile(filename, href));
 		},
 
 		deleteMergedFile() {