Add index.ts for subsonic

src/subsonic/generic.ts

@@ -10,9 +10,10 @@ import { b64Decode, b64Encode } from "../b64";
 import { assertSystem, BUrn } from "../burn";
 
 import { Album, AlbumQuery, AlbumQueryType, AlbumSummary, Artist, ArtistQuery, ArtistSummary, AuthFailure, Credentials, Genre, IdName, Rating, Result, slice2, Sortable, Track } from "../music_service";
-import Subsonic, { artistSummaryFromNDArtist, DODGY_IMAGE_NAME, NDArtist, SubsonicCredentials, SubsonicMusicLibrary, SubsonicResponse, USER_AGENT } from "../subsonic";
+import Subsonic, { DODGY_IMAGE_NAME, SubsonicCredentials, SubsonicMusicLibrary, SubsonicResponse, USER_AGENT } from "../subsonic";
 import axios from "axios";
 import { asURLSearchParams } from "../utils";
+import { artistSummaryFromNDArtist, NDArtist } from "./navidrome";
 
 
 type album = {

src/subsonic/index.ts

@@ -1,23 +1,21 @@
 import { taskEither as TE } from "fp-ts";
 import { pipe } from "fp-ts/lib/function";
 import { Md5 } from "ts-md5/dist/md5";
+import axios, { AxiosRequestConfig } from "axios";
+import randomstring from "randomstring";
+import _ from "underscore";
+
 import {
   Credentials,
   MusicService,
   MusicLibrary,
   Track,
   AuthFailure,
-  Sortable,
-  ArtistSummary,
-} from "./music_service";
-import _ from "underscore";
-
-import axios, { AxiosRequestConfig } from "axios";
-import randomstring from "randomstring";
-import { b64Encode, b64Decode } from "./b64";
-import { axiosImageFetcher, ImageFetcher } from "./images";
-import { asURLSearchParams } from "./utils";
-import { artistImageURN, NaivdromeMusicLibrary, SubsonicGenericMusicLibrary } from "./subsonic/generic";
+} from "../music_service";
+import { b64Encode, b64Decode } from "../b64";
+import { axiosImageFetcher, ImageFetcher } from "../images";
+import { asURLSearchParams } from "../utils";
+import { NaivdromeMusicLibrary, SubsonicGenericMusicLibrary } from "./generic";
 
 export const t = (password: string, s: string) =>
   Md5.hashStr(`${password}${s}`);
@@ -63,12 +61,6 @@ export function isError(
   return (subsonicResponse as SubsonicError).error !== undefined;
 }
 
-export type NDArtist = {
-  id: string;
-  name: string;
-  orderArtistName: string | undefined;
-  largeImageUrl: string | undefined;
-};
 
 
 
@@ -104,18 +96,6 @@ export interface SubsonicMusicLibrary extends MusicLibrary {
   ): TE.TaskEither<Error, string | undefined>;
 }
 
-export const artistSummaryFromNDArtist = (
-  artist: NDArtist
-): ArtistSummary & Sortable => ({
-  id: artist.id,
-  name: artist.name,
-  sortName: artist.orderArtistName || artist.name,
-  image: artistImageURN({
-    artistId: artist.id,
-    artistImageURL: artist.largeImageUrl,
-  }),
-});
-
 export class Subsonic implements MusicService {
   url: string;
   streamClientApplication: StreamClientApplication;

src/subsonic/navidrome.ts

@@ -0,0 +1,22 @@
+import { ArtistSummary, Sortable } from "../music_service";
+import { artistImageURN } from "./generic";
+
+export type NDArtist = {
+  id: string;
+  name: string;
+  orderArtistName: string | undefined;
+  largeImageUrl: string | undefined;
+};
+
+export const artistSummaryFromNDArtist = (
+  artist: NDArtist
+): ArtistSummary & Sortable => ({
+  id: artist.id,
+  name: artist.name,
+  sortName: artist.orderArtistName || artist.name,
+  image: artistImageURN({
+    artistId: artist.id,
+    artistImageURL: artist.largeImageUrl,
+  }),
+});
+