vixalien · vixalien · Apr 16, 2023 · Apr 16, 2023
diff --git a/mod.ts b/mod.ts
@@ -1,9 +1 @@
-export * from "./setup.ts";
-
-export * from "./mixins/browsing.ts";
-export * from "./mixins/explore.ts";
-export * from "./mixins/library.ts";
-export * from "./mixins/playlist.ts";
-export * from "./mixins/queue.ts";
-export * from "./mixins/search.ts";
-export * from "./mixins/uploads.ts";
+export * from "./src/mod.ts";
diff --git a/auth.ts → src/auth.ts b/auth.ts → src/auth.ts
@@ -1,4 +1,4 @@
-import CONSTANTS from "./constants-ng.json" assert { type: "json" };
+import CONSTANTS from "../constants-ng.json" assert { type: "json" };
 import { RequestClient } from "./request.ts";
 import { use_proxy, wait } from "./util.ts";
 import { Store } from "./store.ts";

diff --git a/client.ts → src/client.ts b/client.ts → src/client.ts
@@ -1,5 +1,5 @@
 import { RequiresLoginEvent } from "./auth.ts";
-import { get_album, get_album_browse_id, get_option, setup } from "./mod.ts";
+import { get_artist, get_option, setup } from "./mod.ts";
 import { FetchClient, RequestInit } from "./request.ts";
 import { DenoFileStore } from "./store.ts";
 import { debug } from "./util.ts";
@@ -118,13 +118,7 @@ auth.addEventListener("requires-login", (event) => {
 // console.log(await data.text());
 // });
 
-const id = await get_album_browse_id(
- "OLAK5uy_nF6-ijLz9eO-DMZzhzneNclNBj74Jvjgo",
-);
-
-console.log("album browse id", id);
-
-get_album(id!)
+get_artist("UCzARU-Ev3-yyu3LovaxxaaA")
  // get_playlist("PLCwfwQhurMOukOqbFmYRidZ81ng_2iSUE")
  // .then((data) => {
  // return get_queue(null, data.playlistId, { autoplay: true });

diff --git a/continuations.ts → src/continuations.ts b/continuations.ts → src/continuations.ts
diff --git a/deps.ts → src/deps.ts b/deps.ts → src/deps.ts
diff --git a/errors.ts → src/errors.ts b/errors.ts → src/errors.ts
diff --git a/locales/README.md → src/locales/README.md b/locales/README.md → src/locales/README.md
diff --git a/locales/get.ts → src/locales/get.ts b/locales/get.ts → src/locales/get.ts
diff --git a/locales/strings.ts → src/locales/strings.ts b/locales/strings.ts → src/locales/strings.ts
diff --git a/mixins/_request.ts → src/mixins/_request.ts b/mixins/_request.ts → src/mixins/_request.ts
diff --git a/mixins/browsing.ts → src/mixins/browsing.ts b/mixins/browsing.ts → src/mixins/browsing.ts
diff --git a/mixins/explore.ts → src/mixins/explore.ts b/mixins/explore.ts → src/mixins/explore.ts
diff --git a/mixins/library.ts → src/mixins/library.ts b/mixins/library.ts → src/mixins/library.ts
diff --git a/mixins/playlist.ts → src/mixins/playlist.ts b/mixins/playlist.ts → src/mixins/playlist.ts
diff --git a/mixins/queue.ts → src/mixins/queue.ts b/mixins/queue.ts → src/mixins/queue.ts
diff --git a/mixins/search.ts → src/mixins/search.ts b/mixins/search.ts → src/mixins/search.ts
diff --git a/mixins/uploads.ts → src/mixins/uploads.ts b/mixins/uploads.ts → src/mixins/uploads.ts
diff --git a/mixins/utils.ts → src/mixins/utils.ts b/mixins/utils.ts → src/mixins/utils.ts
diff --git a/src/mod.ts b/src/mod.ts
@@ -0,0 +1,9 @@
+export * from "./setup.ts";
+
+export * from "./mixins/browsing.ts";
+export * from "./mixins/explore.ts";
+export * from "./mixins/library.ts";
+export * from "./mixins/playlist.ts";
+export * from "./mixins/queue.ts";
+export * from "./mixins/search.ts";
+export * from "./mixins/uploads.ts";
diff --git a/nav.ts → src/nav.ts b/nav.ts → src/nav.ts
diff --git a/parsers/albums.ts → src/parsers/albums.ts b/parsers/albums.ts → src/parsers/albums.ts
diff --git a/parsers/browsing.ts → src/parsers/browsing.ts b/parsers/browsing.ts → src/parsers/browsing.ts
@@ -1,4 +1,4 @@
-import STRINGS from "../locales/strings.json" assert { type: "json" };
+import STRINGS from "../../locales/strings.json" assert { type: "json" };
 
 import {
  BADGE_LABEL,

diff --git a/parsers/explore.ts → src/parsers/explore.ts b/parsers/explore.ts → src/parsers/explore.ts
diff --git a/parsers/library.ts → src/parsers/library.ts b/parsers/library.ts → src/parsers/library.ts
diff --git a/parsers/playlists.ts → src/parsers/playlists.ts b/parsers/playlists.ts → src/parsers/playlists.ts
diff --git a/parsers/queue.ts → src/parsers/queue.ts b/parsers/queue.ts → src/parsers/queue.ts
diff --git a/parsers/search.ts → src/parsers/search.ts b/parsers/search.ts → src/parsers/search.ts
diff --git a/parsers/songs.ts → src/parsers/songs.ts b/parsers/songs.ts → src/parsers/songs.ts
diff --git a/parsers/types.d.ts → src/parsers/types.d.ts b/parsers/types.d.ts → src/parsers/types.d.ts
diff --git a/parsers/uploads.ts → src/parsers/uploads.ts b/parsers/uploads.ts → src/parsers/uploads.ts
diff --git a/parsers/util.ts → src/parsers/util.ts b/parsers/util.ts → src/parsers/util.ts
diff --git a/request.ts → src/request.ts b/request.ts → src/request.ts
diff --git a/setup.ts → src/setup.ts b/setup.ts → src/setup.ts
diff --git a/store.ts → src/store.ts b/store.ts → src/store.ts
diff --git a/util.ts → src/util.ts b/util.ts → src/util.ts
diff --git a/tests/util.ts b/tests/util.ts
@@ -1,11 +1,13 @@
-import { auth, init } from "../mod.ts";
-import { DenoFileStore } from "../store.ts";
+import { get_option, setup } from "../mod.ts";
+import { DenoFileStore } from "../src/store.ts";
 
 export * from "./asserts.ts";
 export * from "./deps.ts";
 export * from "../mod.ts";
 
-export const setup = async () => {
+const auth = get_option("auth");
+
+export const auth_flow = async () => {
  const css = {
  normal: "font-weight: normal",
  bold: "font-weight: bold",
@@ -38,11 +40,11 @@ export const setup = async () => {
 };
 
 export const init_client = () => {
- const client = init({
+ const client = setup({
  store: new DenoFileStore("store/muse-store.json"),
  });
 
- setup();
+ auth_flow();
 
  return client;
 };