Fixed filename timestamp

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.25.12",
+	"version": "0.25.15",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",

src/cache.ts

@@ -1,5 +1,5 @@
 import {Table} from './database.ts';
-import {deepCopy, JSONSanitize} from './objects.ts';
+import {deepCopy, includes, JSONSanitize} from './objects.ts';
 
 export type CacheOptions = {
 	/** Delete keys automatically after x amount of seconds */
@@ -34,7 +34,12 @@ export class Cache<K extends string | number | symbol, T> {
 		if(options.storageKey && !options.storage && typeof(Storage) !== 'undefined') options.storage = localStorage;
 		if(options.storage) {
 			if(options.storage instanceof Table) {
-				(async () => (await options.storage?.getAll()).forEach((v: any) => this.add(v)))()
+				(async () => (await options.storage?.getAll()).forEach((v: any) => {
+					if(v) {
+						try { this.add(v) }
+						catch { }
+					}
+				}))()
 			} else if(options.storageKey) {
 				const stored = options.storage?.getItem(options.storageKey);
 				if(stored != null) try { Object.assign(this.store, JSON.parse(stored)); } catch { }
@@ -55,6 +60,7 @@ export class Cache<K extends string | number | symbol, T> {
 
 	private getKey(value: T): K {
 		if(!this.key) throw new Error('No key defined');
+		if(value[this.key] === undefined) throw new Error(`${this.key.toString()} Doesn't exist on ${JSON.stringify(value, null, 2)}`);
 		return <K>value[this.key];
 	}
 
@@ -143,6 +149,16 @@ export class Cache<K extends string | number | symbol, T> {
 		return this;
 	}
 
+	/**
+	 * Find the first cached item to match a filter
+	 * @param {Partial<T>} filter Partial item to match
+	 * @param {Boolean} expired Include expired items, defaults to false
+	 * @returns {T | undefined} Cached item or undefined if nothing matched
+	 */
+	find(filter: Partial<T>, expired?: boolean): T | undefined {
+		return <T>Object.values(this.store).find((row: any) => (expired || !row._expired) && includes(row, filter));
+	}
+
 	/**
 	 * Get item from the cache
 	 * @param {K} key Key to lookup

src/files.ts

@@ -77,7 +77,7 @@ export function fileText(file: any): Promise<string | null> {
  */
 export function timestampFilename(name?: string, date: Date | number | string = new Date()) {
 	if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
-	const timestamp = formatDate('YYYY-MM-DD_HH:mm:ss', date);
+	const timestamp = formatDate('YYYY-MM-DD_HH-mm', date);
 	return name ? name.replace('{{TIMESTAMP}}', timestamp) : timestamp;
 }