From 198cdfd3e0dbedad96cb290d6c37758345beac82 Mon Sep 17 00:00:00 2001
From: Ollie Taylor <13766232+OllieJT@users.noreply.github.com>
Date: Sat, 25 Feb 2023 01:04:08 +0000
Subject: [PATCH] simplify exports

---
 .github/workflows/main.yml                    |   6 +-
 src/lib/audio/_private.ts                     |  17 ++
 .../{components => audio}/audio-loader.svelte |  56 +++----
 src/lib/audio/index.ts                        | 147 ++++++++++++++++++
 src/lib/context/audio-internals.ts            |  16 --
 src/lib/context/audio.ts                      | 105 -------------
 src/lib/context/episode-progress.ts           |  87 -----------
 src/lib/context/user-preferences.ts           |  66 --------
 src/lib/index.ts                              |   8 +-
 src/lib/preferences/_private.ts               |   9 ++
 src/lib/preferences/index.ts                  |  54 +++++++
 src/lib/progress/_private.ts                  |   1 +
 src/lib/progress/index.ts                     |  81 ++++++++++
 src/lib/stores.ts                             |  47 ------
 src/lib/types.ts                              |   4 -
 src/lib/utility/use-state.ts                  |  12 +-
 src/routes/+page.svelte                       |  70 ++++++---
 src/routes/another-page/+page.svelte          |  29 +++-
 18 files changed, 422 insertions(+), 393 deletions(-)
 create mode 100644 src/lib/audio/_private.ts
 rename src/lib/{components => audio}/audio-loader.svelte (60%)
 create mode 100644 src/lib/audio/index.ts
 delete mode 100644 src/lib/context/audio-internals.ts
 delete mode 100644 src/lib/context/audio.ts
 delete mode 100644 src/lib/context/episode-progress.ts
 delete mode 100644 src/lib/context/user-preferences.ts
 create mode 100644 src/lib/preferences/_private.ts
 create mode 100644 src/lib/preferences/index.ts
 create mode 100644 src/lib/progress/_private.ts
 create mode 100644 src/lib/progress/index.ts
 delete mode 100644 src/lib/stores.ts

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1a1ead7..f6d6dbf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,8 +1,8 @@
 name: 'CI'
 on:
-  push:
-    branches-ignore:
-      - 'main'
+  pull_request:
+    branches:
+      - '**'
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/src/lib/audio/_private.ts b/src/lib/audio/_private.ts
new file mode 100644
index 0000000..efbb9e2
--- /dev/null
+++ b/src/lib/audio/_private.ts
@@ -0,0 +1,17 @@
+import type { AudioMetadata, AudioPlayerElement } from '$lib/types';
+import { writable } from 'svelte/store';
+
+// readonly - stores will update when bindings change
+export const _current_time = writable<number>(0);
+export const _element = writable<AudioPlayerElement>();
+export const _duration = writable<number>(0);
+export const _ended = writable<boolean>(false);
+export const _loading = writable<boolean>(false);
+export const _paused = writable<boolean>(true);
+
+// handlers - when store value changes, the binding will update the audio element
+export const _start_at = writable<number>(0);
+export const _autoplay = writable<boolean>(false);
+export const _muted = writable<boolean>(false);
+export const _src = writable<string>('');
+export const _metadata = writable<AudioMetadata | null>(null);
diff --git a/src/lib/components/audio-loader.svelte b/src/lib/audio/audio-loader.svelte
similarity index 60%
rename from src/lib/components/audio-loader.svelte
rename to src/lib/audio/audio-loader.svelte
index b4228fa..ba26eb2 100644
--- a/src/lib/components/audio-loader.svelte
+++ b/src/lib/audio/audio-loader.svelte
@@ -1,53 +1,53 @@
 <script lang="ts">
 	import {
-		audio_autoplay,
-		audio_current_time,
-		audio_duration,
-		audio_element,
-		audio_ended,
-		audio_loading,
-		audio_muted,
-		audio_paused,
-		audio_src,
-		audio_start_at,
-	} from '$lib/context/audio-internals';
-	import { user_preferences } from '$lib/context/user-preferences';
+		_autoplay,
+		_current_time,
+		_duration,
+		_element,
+		_ended,
+		_loading,
+		_muted,
+		_paused,
+		_src,
+		_start_at,
+	} from '$lib/audio/_private';
+	import { podcast_preferences } from '$lib/preferences';
 	import type { AudioPlayerElement } from '$lib/types';
 	import { load_podcast_state } from '$lib/utility/use-state';
 	import { onMount } from 'svelte';
 
 	// readonly values
 	let element: AudioPlayerElement;
-	let current_time = $audio_start_at;
+	let current_time = $_start_at;
 	let duration = 0;
 	let ended = true;
 	let paused = false;
 
 	// handler values
-	let volume = $user_preferences.volume;
-	let playbackRate = $user_preferences.playback_rate;
+	let volume = $podcast_preferences.volume;
+	let playbackRate = $podcast_preferences.playback_rate;
 	let muted = false;
 
 	// readonly - stores will update when bindings change
-	$: audio_element.set(element);
-	$: audio_current_time.set(current_time);
-	$: audio_duration.set(duration);
-	$: audio_ended.set(ended);
-	$: audio_paused.set(paused);
+	$: _element.set(element);
+	$: _current_time.set(current_time);
+	$: _duration.set(duration);
+	$: _ended.set(ended);
+	$: _paused.set(paused);
 
 	// handlers - when store value changes, the binding will update the audio element
-	$: volume = $user_preferences.volume;
-	$: playbackRate = $user_preferences.playback_rate;
-	$: muted = $audio_muted;
-	$: current_time = $audio_start_at;
+	$: volume = $podcast_preferences.volume;
+	$: playbackRate = $podcast_preferences.playback_rate;
+	$: muted = $_muted;
+	$: current_time = $_start_at;
 
 	onMount(load_podcast_state);
 </script>
 
 <audio
 	bind:this={element}
-	src={$audio_src}
-	autoplay={$audio_autoplay}
+	src={$_src}
+	autoplay={$_autoplay}
 	bind:currentTime={current_time}
 	bind:muted
 	bind:duration
@@ -71,6 +71,6 @@
 		// TODO: reset player state
 		// console.log('emptied', e);
 	}}
-	on:loadeddata={() => audio_loading.set(false)}
-	on:loadstart={() => audio_loading.set(true)}
+	on:loadeddata={() => _loading.set(false)}
+	on:loadstart={() => _loading.set(true)}
 />
diff --git a/src/lib/audio/index.ts b/src/lib/audio/index.ts
new file mode 100644
index 0000000..d9f5dd8
--- /dev/null
+++ b/src/lib/audio/index.ts
@@ -0,0 +1,147 @@
+import {
+	_autoplay,
+	_current_time,
+	_duration,
+	_element,
+	_ended,
+	_loading,
+	_metadata,
+	_muted,
+	_paused,
+	_src,
+	_start_at,
+} from '$lib/audio/_private';
+import { podcast_progress } from '$lib/progress';
+import type { AudioLoadData, AudioLoadOptions } from '$lib/types';
+import { secondsToTimestamp } from '$lib/utility/seconds-to-timestamp';
+import { info, warn } from '$pkg/log';
+import clamp from 'just-clamp';
+import { derived } from 'svelte/store';
+export { default as AudioLoader } from '$lib/audio/audio-loader.svelte';
+
+export const podcast_time = derived([_current_time, _ended], ([$seconds, $ended]) => ({
+	current_time: $seconds,
+	timestamp: secondsToTimestamp($seconds),
+	ended: $ended,
+}));
+
+export const podcast_data = derived(
+	[_src, _metadata],
+	([$src, $metadata]) =>
+		({
+			...$metadata,
+			src: $src,
+		} satisfies AudioLoadData),
+);
+
+export const podcast_options = derived(
+	[_start_at, _autoplay],
+	([$start_at, $autoplay]) =>
+		({
+			start_at: $start_at,
+			autoplay: $autoplay,
+		} satisfies AudioLoadOptions),
+);
+
+export const podcast_duration = { subscribe: _duration.subscribe };
+export const podcast_loading = { subscribe: _loading.subscribe };
+export const podcast_paused = { subscribe: _paused.subscribe };
+export const podcast_muted = { subscribe: _muted.subscribe };
+
+type HandleType = 'toggle' | 'set';
+
+export const podcast_audio = {
+	play(type: HandleType = 'set') {
+		info('play: ', type);
+		return _element.subscribe((el) => {
+			if (!el) return warn('no audio element');
+			if (type === 'toggle') {
+				el.paused ? el.play() : el.pause();
+			} else {
+				el.play();
+			}
+		})();
+	},
+	pause(type: HandleType = 'set') {
+		info('pause: ', type);
+		return _element.subscribe((el) => {
+			if (!el) return warn('no audio element');
+			if (type === 'toggle') {
+				el.paused ? el.play() : el.pause();
+			} else {
+				el.pause();
+			}
+		})();
+	},
+
+	mute(type: HandleType = 'set') {
+		info('mute: ', type);
+		if (type === 'toggle') {
+			_muted.update((muted) => !muted);
+		} else {
+			_muted.set(true);
+		}
+	},
+	unmute(type: HandleType = 'set') {
+		info('unmute: ', type);
+		if (type === 'toggle') {
+			_muted.update((muted) => !muted);
+		} else {
+			_muted.set(false);
+		}
+	},
+
+	load(data: AudioLoadData, opts: AudioLoadOptions) {
+		podcast_progress.stash();
+
+		const { src, ...meta } = data;
+		const progress = podcast_progress.use(src);
+		const start_at = progress?.start_at || opts.start_at || 0;
+
+		console.log('progress', progress);
+
+		info('load: ', src);
+		_autoplay.set(opts.autoplay);
+		_src.set(src);
+		_metadata.set(meta);
+		_start_at.set(start_at);
+		// opts.current_time ? seek(opts.current_time) : null;
+		//opts.autoplay && play();
+	},
+	unload() {
+		podcast_progress.stash();
+		info('unload: ');
+		_element.subscribe((el) => {
+			if (!el) return warn('no audio element');
+			el.pause();
+		})();
+		_autoplay.set(false);
+		_src.set('');
+		_metadata.set(null);
+		_start_at.set(0);
+	},
+
+	seek(seconds: number, from: 'from-start' | 'from-end' = 'from-start') {
+		info('seek: ', seconds, from);
+		return _element.subscribe((el) => {
+			if (!el) return warn('no audio element');
+			if (from === 'from-end') {
+				el.currentTime = clamp(0, el.duration, el.duration - seconds);
+			} else {
+				el.currentTime = clamp(0, el.duration, seconds);
+			}
+		})();
+	},
+
+	skip(seconds: number, type: 'forward' | 'backward' = 'forward') {
+		info('skip: ', seconds, type);
+		return _element.subscribe((el) => {
+			if (!el) return warn('no audio element');
+			if (type === 'backward') {
+				el.currentTime = clamp(0, el.duration, el.currentTime - seconds);
+			} else {
+				el.currentTime = clamp(0, el.duration, el.currentTime + seconds);
+			}
+		})();
+	},
+};
diff --git a/src/lib/context/audio-internals.ts b/src/lib/context/audio-internals.ts
deleted file mode 100644
index 3310b68..0000000
--- a/src/lib/context/audio-internals.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import type { AudioPlayerElement } from '$lib/types';
-import { writable } from 'svelte/store';
-
-// readonly - stores will update when bindings change
-export const audio_current_time = writable<number>(0);
-export const audio_element = writable<AudioPlayerElement>();
-export const audio_duration = writable<number>(0);
-export const audio_ended = writable<boolean>(false);
-export const audio_loading = writable<boolean>(false);
-export const audio_paused = writable<boolean>(true);
-
-// handlers - when store value changes, the binding will update the audio element
-export const audio_start_at = writable<number>(0);
-export const audio_autoplay = writable<boolean>(false);
-export const audio_muted = writable<boolean>(false);
-export const audio_src = writable<string>('');
diff --git a/src/lib/context/audio.ts b/src/lib/context/audio.ts
deleted file mode 100644
index 8740ee3..0000000
--- a/src/lib/context/audio.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import {
-	audio_autoplay,
-	audio_element,
-	audio_muted,
-	audio_src,
-	audio_start_at,
-} from '$lib/context/audio-internals';
-import { episode_progress } from '$lib/context/episode-progress';
-import { metadata } from '$lib/stores';
-import type { AudioLoadData, AudioLoadOptions } from '$lib/types';
-import { info, warn } from '$pkg/log';
-import clamp from 'just-clamp';
-
-type HandleType = 'toggle' | 'set';
-
-export function play(type: HandleType = 'set') {
-	info('play: ', type);
-	return audio_element.subscribe((el) => {
-		if (!el) return warn('no audio element');
-		if (type === 'toggle') {
-			el.paused ? el.play() : el.pause();
-		} else {
-			el.play();
-		}
-	})();
-}
-export function pause(type: HandleType = 'set') {
-	info('pause: ', type);
-	return audio_element.subscribe((el) => {
-		if (!el) return warn('no audio element');
-		if (type === 'toggle') {
-			el.paused ? el.play() : el.pause();
-		} else {
-			el.pause();
-		}
-	})();
-}
-
-export function mute(type: HandleType = 'set') {
-	info('mute: ', type);
-	if (type === 'toggle') {
-		audio_muted.update((muted) => !muted);
-	} else {
-		audio_muted.set(true);
-	}
-}
-export function unmute(type: HandleType = 'set') {
-	info('unmute: ', type);
-	if (type === 'toggle') {
-		audio_muted.update((muted) => !muted);
-	} else {
-		audio_muted.set(false);
-	}
-}
-
-export const load = (data: AudioLoadData, opts: AudioLoadOptions) => {
-	episode_progress.stash();
-
-	const { src, ...meta } = data;
-	const progress = episode_progress.use(src);
-	const start_at = progress?.start_at || opts.start_at || 0;
-
-	console.log('progress', progress);
-
-	info('load: ', src);
-	audio_autoplay.set(opts.autoplay);
-	audio_src.set(src);
-	metadata.set(meta);
-	audio_start_at.set(start_at);
-	// opts.current_time ? seek(opts.current_time) : null;
-	//opts.autoplay && play();
-};
-export function unload() {
-	episode_progress.stash();
-	info('unload: ');
-	pause();
-	audio_autoplay.set(false);
-	audio_src.set('');
-	metadata.set(null);
-	audio_start_at.set(0);
-}
-
-export function seek(seconds: number, from: 'from-start' | 'from-end' = 'from-start') {
-	info('seek: ', seconds, from);
-	return audio_element.subscribe((el) => {
-		if (!el) return warn('no audio element');
-		if (from === 'from-end') {
-			el.currentTime = clamp(0, el.duration, el.duration - seconds);
-		} else {
-			el.currentTime = clamp(0, el.duration, seconds);
-		}
-	})();
-}
-
-export function skip(seconds: number, type: 'forward' | 'backward' = 'forward') {
-	info('skip: ', seconds, type);
-	return audio_element.subscribe((el) => {
-		if (!el) return warn('no audio element');
-		if (type === 'backward') {
-			el.currentTime = clamp(0, el.duration, el.currentTime - seconds);
-		} else {
-			el.currentTime = clamp(0, el.duration, el.currentTime + seconds);
-		}
-	})();
-}
diff --git a/src/lib/context/episode-progress.ts b/src/lib/context/episode-progress.ts
deleted file mode 100644
index fce8bbb..0000000
--- a/src/lib/context/episode-progress.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { browser } from '$app/environment';
-import { audio_current_time, audio_src } from '$lib/context/audio-internals';
-import type { AudioLoadOptions, EpisodeProgress } from '$lib/types';
-import { error, info, warn } from '$lib/utility/package/log';
-import { get } from 'svelte/store';
-
-const episode_progress_map = new Map<string, EpisodeProgress>();
-
-function stash_episode() {
-	const src = get(audio_src);
-	if (!src) return;
-	info('saving progress: ', src);
-	episode_progress_map.set(src, { current_time: get(audio_current_time) });
-	save_all();
-}
-
-function use_episode(src: string): Pick<AudioLoadOptions, 'start_at'> | null {
-	const progress = episode_progress_map.get(src);
-
-	if (!progress) return null;
-
-	info('found saved progress: ', progress);
-
-	return { start_at: progress.current_time };
-}
-
-type SavedEpisodeProgress = EpisodeProgress & { src: string };
-const EPISODE_PROGRESS_KEY = 'EPISODE_PROGRESS' as const;
-
-function save_all() {
-	if (!browser || !localStorage) {
-		warn('localStorage not available, skipping save');
-		return;
-	}
-	const items = [...episode_progress_map];
-
-	const episodes = items.reduce((prev, [src, progress]) => {
-		return [...prev, { src, ...progress }];
-	}, [] as SavedEpisodeProgress[]);
-
-	info(`Saving progress for ${episodes.length} episodes to localStorage`, episodes);
-	localStorage.setItem(EPISODE_PROGRESS_KEY, JSON.stringify(episodes));
-}
-
-function load_all() {
-	if (!browser || !localStorage) {
-		warn('localStorage not available, skipping load');
-		return;
-	}
-	const data = localStorage.getItem(EPISODE_PROGRESS_KEY);
-
-	if (!data) {
-		info('No saved episode progress found');
-		return;
-	}
-
-	const episodes = JSON.parse(data) as SavedEpisodeProgress[];
-
-	try {
-		episodes.forEach(({ src, ...progress }) => {
-			episode_progress_map.set(src, progress);
-		});
-		info(`Loaded ${episode_progress_map.size} episodes progress from localStorage`);
-	} catch (e) {
-		error('Error loading episode progress', e);
-		return;
-	}
-}
-
-function clear_all() {
-	episode_progress_map.clear();
-	save_all();
-}
-
-export const episode_progress = {
-	episodes: {
-		get: episode_progress_map.get,
-		includes: episode_progress_map.has,
-		forEach: episode_progress_map.forEach,
-		map: [...episode_progress_map].map,
-	},
-	stash: stash_episode,
-	use: use_episode,
-	save_all,
-	load_all,
-	clear_all,
-};
diff --git a/src/lib/context/user-preferences.ts b/src/lib/context/user-preferences.ts
deleted file mode 100644
index 1295a9a..0000000
--- a/src/lib/context/user-preferences.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { browser } from '$app/environment';
-import type { UserPreferences } from '$lib/types';
-import { info, warn } from '$lib/utility/package/log';
-import clamp from 'just-clamp';
-import { writable } from 'svelte/store';
-
-const default_user_preferences = {
-	playback_rate: 1,
-	volume: 1,
-} satisfies UserPreferences;
-
-const user_preference_store = writable<UserPreferences>(default_user_preferences);
-
-function clamp_preferences(prefs: UserPreferences) {
-	return {
-		playback_rate: clamp(prefs.playback_rate, 0.5, 5),
-		volume: clamp(prefs.volume, 0, 1),
-	};
-}
-
-function set_preference(prefs: Partial<UserPreferences>) {
-	user_preference_store.update((prev) => clamp_preferences({ ...prev, ...prefs }));
-	save();
-}
-const USER_PREFERENCE_KEY = 'USER_PREFERENCE' as const;
-
-function save() {
-	if (!browser || !localStorage) {
-		warn('localStorage not available, skipping save');
-		return;
-	}
-	return user_preference_store.subscribe((prefs) => {
-		info(`Saving user preferences to localStorage`, prefs);
-		localStorage.setItem(USER_PREFERENCE_KEY, JSON.stringify(prefs));
-	})();
-}
-
-function load() {
-	if (!browser || !localStorage) {
-		warn('localStorage not available, skipping load');
-		return;
-	}
-	const data = localStorage.getItem(USER_PREFERENCE_KEY);
-
-	if (!data) {
-		info('No saved user preferences found');
-		return;
-	}
-
-	const preferences = JSON.parse(data) as UserPreferences;
-	set_preference(preferences);
-	info(`Loaded user preferences from localStorage`, preferences);
-}
-
-function clear() {
-	user_preference_store.set(default_user_preferences);
-	save();
-}
-
-export const user_preferences = {
-	subscribe: user_preference_store.subscribe,
-	set: set_preference,
-	save,
-	load,
-	clear,
-};
diff --git a/src/lib/index.ts b/src/lib/index.ts
index 94d0b89..0133f35 100644
--- a/src/lib/index.ts
+++ b/src/lib/index.ts
@@ -1,6 +1,4 @@
-export { default as AudioLoader } from '$lib/components/audio-loader.svelte';
-export * from '$lib/context/audio';
-export * from '$lib/context/episode-progress';
-export * from '$lib/context/user-preferences';
-export * from '$lib/stores';
+export * from '$lib/audio';
+export * from '$lib/preferences';
+export * from '$lib/progress';
 export * from '$lib/utility';
diff --git a/src/lib/preferences/_private.ts b/src/lib/preferences/_private.ts
new file mode 100644
index 0000000..f5c5d92
--- /dev/null
+++ b/src/lib/preferences/_private.ts
@@ -0,0 +1,9 @@
+import type { UserPreferences } from '$lib/types';
+import { writable } from 'svelte/store';
+
+export const _default_user_preferences = {
+	playback_rate: 1,
+	volume: 1,
+} satisfies UserPreferences;
+
+export const _user_preferences = writable<UserPreferences>(_default_user_preferences);
diff --git a/src/lib/preferences/index.ts b/src/lib/preferences/index.ts
new file mode 100644
index 0000000..f0219a1
--- /dev/null
+++ b/src/lib/preferences/index.ts
@@ -0,0 +1,54 @@
+import { browser } from '$app/environment';
+import { _default_user_preferences, _user_preferences } from '$lib/preferences/_private';
+import type { UserPreferences } from '$lib/types';
+import { info, warn } from '$lib/utility/package/log';
+import clamp from 'just-clamp';
+
+function clamp_preferences(prefs: UserPreferences) {
+	return {
+		playback_rate: clamp(prefs.playback_rate, 0.5, 5),
+		volume: clamp(prefs.volume, 0, 1),
+	};
+}
+const USER_PREFERENCE_KEY = 'USER_PREFERENCE' as const;
+
+function set(prefs: Partial<UserPreferences>) {
+	_user_preferences.update((prev) => clamp_preferences({ ...prev, ...prefs }));
+	save();
+}
+function save() {
+	if (!browser || !localStorage) {
+		warn('localStorage not available, skipping save');
+		return;
+	}
+	return _user_preferences.subscribe((prefs) => {
+		info(`Saving user preferences to localStorage`, prefs);
+		localStorage.setItem(USER_PREFERENCE_KEY, JSON.stringify(prefs));
+	})();
+}
+
+export const podcast_preferences = {
+	subscribe: _user_preferences.subscribe,
+	set,
+	save,
+	load() {
+		if (!browser || !localStorage) {
+			warn('localStorage not available, skipping load');
+			return;
+		}
+		const data = localStorage.getItem(USER_PREFERENCE_KEY);
+
+		if (!data) {
+			info('No saved user preferences found');
+			return;
+		}
+
+		const preferences = JSON.parse(data) as UserPreferences;
+		set(preferences);
+		info(`Loaded user preferences from localStorage`, preferences);
+	},
+	clear() {
+		_user_preferences.set(_default_user_preferences);
+		save();
+	},
+};
diff --git a/src/lib/progress/_private.ts b/src/lib/progress/_private.ts
new file mode 100644
index 0000000..650101c
--- /dev/null
+++ b/src/lib/progress/_private.ts
@@ -0,0 +1 @@
+export const _episode_progress_map = new Map<string, number>();
diff --git a/src/lib/progress/index.ts b/src/lib/progress/index.ts
new file mode 100644
index 0000000..f072b78
--- /dev/null
+++ b/src/lib/progress/index.ts
@@ -0,0 +1,81 @@
+import { browser } from '$app/environment';
+import { _current_time, _src } from '$lib/audio/_private';
+import { _episode_progress_map } from '$lib/progress/_private';
+import type { AudioLoadOptions } from '$lib/types';
+import { error, info, warn } from '$lib/utility/package/log';
+import { get } from 'svelte/store';
+
+type SavedEpisodeProgress = { src: string; current_time: number };
+const EPISODE_PROGRESS_KEY = 'EPISODE_PROGRESS' as const;
+
+function save_all() {
+	if (!browser || !localStorage) {
+		warn('localStorage not available, skipping save');
+		return;
+	}
+	const items = [..._episode_progress_map];
+
+	const episodes = items.reduce((prev, [src, current_time]) => {
+		return [...prev, { src, current_time }];
+	}, [] as SavedEpisodeProgress[]);
+
+	info(`Saving progress for ${episodes.length} episodes to localStorage`, episodes);
+	localStorage.setItem(EPISODE_PROGRESS_KEY, JSON.stringify(episodes));
+}
+
+export const podcast_progress = {
+	episodes: {
+		set: (src: string, current_time: number) => _episode_progress_map.set(src, current_time),
+		get: _episode_progress_map.get,
+		includes: _episode_progress_map.has,
+		forEach: _episode_progress_map.forEach,
+		count: _episode_progress_map.size,
+		data: [..._episode_progress_map],
+	},
+	stash() {
+		const src = get(_src);
+		if (!src) return;
+		info('saving progress: ', src);
+		podcast_progress.episodes.set(src, get(_current_time));
+		save_all();
+	},
+	use(src: string): Pick<AudioLoadOptions, 'start_at'> | null {
+		const start_at = _episode_progress_map.get(src);
+
+		if (!start_at) return null;
+
+		info('found saved progress: ', src, start_at);
+
+		return { start_at: start_at };
+	},
+	save_all,
+
+	load_all() {
+		if (!browser || !localStorage) {
+			warn('localStorage not available, skipping load');
+			return;
+		}
+		const data = localStorage.getItem(EPISODE_PROGRESS_KEY);
+
+		if (!data) {
+			info('No saved episode progress found');
+			return;
+		}
+
+		const episodes = JSON.parse(data) as SavedEpisodeProgress[];
+
+		try {
+			episodes.forEach(({ src, current_time }) => {
+				podcast_progress.episodes.set(src, current_time);
+			});
+			info(`Loaded ${_episode_progress_map.size} episodes progress from localStorage`);
+		} catch (e) {
+			error('Error loading episode progress', e);
+			return;
+		}
+	},
+	clear_all() {
+		_episode_progress_map.clear();
+		save_all();
+	},
+};
diff --git a/src/lib/stores.ts b/src/lib/stores.ts
deleted file mode 100644
index 1ffcef3..0000000
--- a/src/lib/stores.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import {
-	audio_autoplay,
-	audio_current_time,
-	audio_duration,
-	audio_ended,
-	audio_loading,
-	audio_muted,
-	audio_paused,
-	audio_src,
-	audio_start_at,
-} from '$lib/context/audio-internals';
-import { user_preferences } from '$lib/context/user-preferences';
-import type { AudioLoadData, AudioLoadOptions, AudioMetadata } from '$lib/types';
-import { secondsToTimestamp } from '$lib/utility/seconds-to-timestamp';
-import { derived, writable } from 'svelte/store';
-
-export const time = derived([audio_current_time, audio_ended], ([$seconds, $ended]) => ({
-	current_time: $seconds,
-	timestamp: secondsToTimestamp($seconds),
-	ended: $ended,
-}));
-
-export const metadata = writable<AudioMetadata | null>(null);
-
-export const data = derived(
-	[audio_src, metadata],
-	([$src, $metadata]) =>
-		({
-			...$metadata,
-			src: $src,
-		} satisfies AudioLoadData),
-);
-
-export const options = derived(
-	[audio_start_at, audio_autoplay],
-	([$start_at, $autoplay]) =>
-		({
-			start_at: $start_at,
-			autoplay: $autoplay,
-		} satisfies AudioLoadOptions),
-);
-
-export const duration = { subscribe: audio_duration.subscribe };
-export const loading = { subscribe: audio_loading.subscribe };
-export const paused = { subscribe: audio_paused.subscribe };
-export const muted = { subscribe: audio_muted.subscribe };
-export const references = { subscribe: user_preferences.subscribe };
diff --git a/src/lib/types.ts b/src/lib/types.ts
index e40f61c..00a42c5 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -14,10 +14,6 @@ export interface AudioLoadOptions {
 	start_at?: number;
 }
 
-export interface EpisodeProgress {
-	current_time: number;
-}
-
 export interface UserPreferences {
 	playback_rate: number;
 	volume: number;
diff --git a/src/lib/utility/use-state.ts b/src/lib/utility/use-state.ts
index 3812747..8dea168 100644
--- a/src/lib/utility/use-state.ts
+++ b/src/lib/utility/use-state.ts
@@ -1,12 +1,12 @@
-import { episode_progress } from '$lib/context/episode-progress';
-import { user_preferences } from '$lib/context/user-preferences';
+import { podcast_preferences } from '$lib/preferences';
+import { podcast_progress } from '$lib/progress';
 
 export function save_podcast_state() {
-	episode_progress.save_all();
-	user_preferences.save();
+	podcast_progress.save_all();
+	podcast_preferences.save();
 }
 
 export function load_podcast_state() {
-	episode_progress.load_all();
-	user_preferences.load();
+	podcast_progress.load_all();
+	podcast_preferences.load();
 }
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index d659fe4..1ed2243 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,5 +1,17 @@
 <script lang="ts">
-	import { audio, episode_progress, save_podcast_state, user_preferences } from '$lib';
+	import {
+		podcast_audio,
+		podcast_data,
+		podcast_duration,
+		podcast_loading,
+		podcast_muted,
+		podcast_options,
+		podcast_paused,
+		podcast_preferences,
+		podcast_progress,
+		podcast_time,
+		save_podcast_state,
+	} from '$lib';
 	import type { AudioLoadData } from '$lib/types';
 
 	const sources = {
@@ -16,61 +28,77 @@
 	} satisfies Record<string, AudioLoadData>;
 
 	let current_time = 0;
-	$: current_time = $audio.current_time;
+	$: current_time = $podcast_time.current_time;
 </script>
 
-<pre>{JSON.stringify($audio, null, 3)}</pre>
+<pre>{JSON.stringify(
+		{
+			podcast_time,
+			podcast_data,
+			podcast_options,
+			podcast_duration,
+			podcast_loading,
+			podcast_paused,
+			podcast_muted,
+			podcast_preferences,
+			podcast_progress,
+		},
+		null,
+		3,
+	)}</pre>
 
 <h1>Demo</h1>
 <a href="/another-page">Another Page</a>
-<button type="button" on:click={episode_progress.save_all}>Save progress</button>
-<button type="button" on:click={user_preferences.save}>Save preferences</button>
+<button type="button" on:click={podcast_progress.save_all}>Save progress</button>
+<button type="button" on:click={podcast_preferences.save}>Save preferences</button>
 <button type="button" on:click={save_podcast_state}>Save state (all)</button>
 
 <h5>Load Audio</h5>
 <button
 	type="button"
-	on:click={() => audio.load(sources['syntax'], { autoplay: true, start_at: 45 })}>Syntax</button
+	on:click={() => podcast_audio.load(sources['syntax'], { autoplay: true, start_at: 45 })}
+	>Syntax</button
 >
-<button type="button" on:click={() => audio.load(sources['knomii'], { autoplay: false })}
+<button type="button" on:click={() => podcast_audio.load(sources['knomii'], { autoplay: false })}
 	>Knomii</button
 >
-<button type="button" on:click={() => audio.unload()}>None</button>
+<button type="button" on:click={() => podcast_audio.unload()}>None</button>
 
 <h5>Custom audio controls</h5>
 
 <h6>Play / Pause Actions</h6>
 
-<button type="button" on:click={() => audio.play()}>Play</button>
-<button type="button" on:click={() => audio.pause()}>Pause</button>
-<button type="button" on:click={() => audio.pause('toggle')}>Toggle</button>
+<button type="button" on:click={() => podcast_audio.play()}>Play</button>
+<button type="button" on:click={() => podcast_audio.pause()}>Pause</button>
+<button type="button" on:click={() => podcast_audio.pause('toggle')}>Toggle</button>
 
 <h6>Audio Actions</h6>
 
-<button type="button" on:click={() => audio.mute()}>Mute</button>
-<button type="button" on:click={() => audio.unmute()}>Unmute</button>
-<button type="button" on:click={() => audio.mute('toggle')}>Toggle</button>
+<button type="button" on:click={() => podcast_audio.mute()}>Mute</button>
+<button type="button" on:click={() => podcast_audio.unmute()}>Unmute</button>
+<button type="button" on:click={() => podcast_audio.mute('toggle')}>Toggle</button>
 
 <h6>Seeking</h6>
 
 <input
 	type="range"
 	min={0}
-	max={$audio.duration}
+	max={$podcast_duration}
 	style="width:100%"
 	bind:value={current_time}
-	on:change={(e) => audio.seek(parseInt(e.currentTarget.value))}
+	on:change={(e) => podcast_audio.seek(parseInt(e.currentTarget.value))}
 />
 
-<button type="button" on:click={() => audio.seek(30)}>Go to 30s from start </button>
-<button type="button" on:click={() => audio.seek(30, 'from-end')}>Go to 30s from end</button>
-<button type="button" on:click={() => audio.skip(10, 'forward')}>Skip 10s</button>
-<button type="button" on:click={() => audio.skip(10, 'backward')}>Rewind 10s</button>
+<button type="button" on:click={() => podcast_audio.seek(30)}>Go to 30s from start </button>
+<button type="button" on:click={() => podcast_audio.seek(30, 'from-end')}>Go to 30s from end</button
+>
+<button type="button" on:click={() => podcast_audio.skip(10, 'forward')}>Skip 10s</button>
+<button type="button" on:click={() => podcast_audio.skip(10, 'backward')}>Rewind 10s</button>
 
 <h6>Playback Rate</h6>
 
 {#each [0.5, 1, 2, 3] as rate}
-	<button type="button" on:click={() => user_preferences.set({ playback_rate: rate })}
+	<button type="button" on:click={() => podcast_preferences.set({ playback_rate: rate })}
 		>{rate}x</button
 	>
 {/each}
diff --git a/src/routes/another-page/+page.svelte b/src/routes/another-page/+page.svelte
index 1cad0d5..5df0f3f 100644
--- a/src/routes/another-page/+page.svelte
+++ b/src/routes/another-page/+page.svelte
@@ -1,12 +1,31 @@
 <script lang="ts">
-	import { audio } from '$lib';
-
-	let current_time = 0;
-	$: current_time = $audio.current_time;
+	import {
+		podcast_data,
+		podcast_duration,
+		podcast_loading,
+		podcast_muted,
+		podcast_options,
+		podcast_paused,
+		podcast_preferences,
+		podcast_time,
+	} from '$lib';
 </script>
 
 <h1>Demo</h1>
 
 <a href="/">Demo</a>
 
-<pre>{JSON.stringify($audio, null, 3)}</pre>
+<pre>{JSON.stringify(
+		{
+			podcast_time,
+			podcast_data,
+			podcast_options,
+			podcast_duration,
+			podcast_loading,
+			podcast_paused,
+			podcast_muted,
+			podcast_preferences,
+		},
+		null,
+		3,
+	)}</pre>