diff --git a/README.md b/README.md index b20ed4f..3f638e9 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ You can now open http://localhost:8000 in your browser to view the landing page. Try doing some code changes and see how the page automatically reloads. For a production server you should set the `PORT` environment variable to your preferred port and `DENO_DEPLOYMENT_ID` to the current git revision. -Alternatively you can run the [predefined task](deno.json) which automatically sets `DENO_DEPLOYMENT_ID` and runs `src/server/main.ts` with all permissions: +Alternatively you can run the [predefined task](deno.json) which automatically sets `DENO_DEPLOYMENT_ID` and runs `server/main.ts` with all permissions: ```sh deno task server diff --git a/src/cli.ts b/cli.ts similarity index 94% rename from src/cli.ts rename to cli.ts index e91dd74..3c70378 100644 --- a/src/cli.ts +++ b/cli.ts @@ -1,5 +1,5 @@ import { getMergedReleaseByGTIN, getReleaseByUrl } from './lookup.ts'; -import { createReleaseSeed } from './MusicBrainz/seeding.ts'; +import { createReleaseSeed } from './musicbrainz/seeding.ts'; import { parse } from 'std/flags/mod.ts'; import type { GTIN, HarmonyRelease } from './harmonizer/types.ts'; diff --git a/deno.json b/deno.json index ff01af5..b315a3f 100644 --- a/deno.json +++ b/deno.json @@ -25,10 +25,10 @@ "utils/": "https://deno.land/x/es_utils@v0.1.3/" }, "tasks": { - "cli": "deno run --allow-net src/cli.ts", - "dev": "deno run -A --watch=src/server/static/,src/server/routes/ src/server/dev.ts", - "build": "deno run -A src/server/dev.ts build", - "server": "DENO_DEPLOYMENT_ID=$(git rev-parse HEAD) deno run -A src/server/main.ts" + "cli": "deno run --allow-net cli.ts", + "dev": "deno run -A --watch=server/static/,server/routes/ server/dev.ts", + "build": "deno run -A server/dev.ts build", + "server": "DENO_DEPLOYMENT_ID=$(git rev-parse HEAD) deno run -A server/main.ts" }, "lint": { "rules": { diff --git a/src/harmonizer/merge.ts b/harmonizer/merge.ts similarity index 100% rename from src/harmonizer/merge.ts rename to harmonizer/merge.ts diff --git a/src/harmonizer/properties.ts b/harmonizer/properties.ts similarity index 100% rename from src/harmonizer/properties.ts rename to harmonizer/properties.ts diff --git a/src/harmonizer/types.ts b/harmonizer/types.ts similarity index 98% rename from src/harmonizer/types.ts rename to harmonizer/types.ts index db4ee33..94953a3 100644 --- a/src/harmonizer/types.ts +++ b/harmonizer/types.ts @@ -1,6 +1,6 @@ import { immutableReleaseProperties, immutableTrackProperties } from './properties.ts'; -import type { Packaging, ReleaseStatus } from '../MusicBrainz/typeId.ts'; +import type { Packaging, ReleaseStatus } from '../musicbrainz/type_id.ts'; import type { PartialDate } from '../utils/date.ts'; import type { ScriptFrequency } from '../utils/script.ts'; diff --git a/src/lookup.ts b/lookup.ts similarity index 100% rename from src/lookup.ts rename to lookup.ts diff --git a/src/MusicBrainz/releaseCountries.ts b/musicbrainz/release_countries.ts similarity index 100% rename from src/MusicBrainz/releaseCountries.ts rename to musicbrainz/release_countries.ts diff --git a/src/MusicBrainz/seeding.ts b/musicbrainz/seeding.ts similarity index 97% rename from src/MusicBrainz/seeding.ts rename to musicbrainz/seeding.ts index ad13bbb..f122685 100644 --- a/src/MusicBrainz/seeding.ts +++ b/musicbrainz/seeding.ts @@ -1,9 +1,9 @@ -import { determineReleaseEventCountries } from './releaseCountries.ts'; -import { urlTypeIds } from './typeId.ts'; +import { determineReleaseEventCountries } from './release_countries.ts'; +import { urlTypeIds } from './type_id.ts'; import { preferArray } from 'utils/array/scalar.js'; import { flatten } from 'utils/object/flatten.js'; -import type { Packaging, ReleaseGroupType, ReleaseStatus, UrlLinkTypeId } from './typeId.ts'; +import type { Packaging, ReleaseGroupType, ReleaseStatus, UrlLinkTypeId } from './type_id.ts'; import type { ArtistCreditName, CountryCode, HarmonyRelease, LinkType, ReleaseInfo } from '../harmonizer/types.ts'; import type { PartialDate } from '../utils/date.ts'; import type { ScriptCode } from '../utils/script.ts'; diff --git a/src/MusicBrainz/typeId.ts b/musicbrainz/type_id.ts similarity index 100% rename from src/MusicBrainz/typeId.ts rename to musicbrainz/type_id.ts diff --git a/src/providers.ts b/providers.ts similarity index 100% rename from src/providers.ts rename to providers.ts diff --git a/src/providers/Deezer.ts b/providers/Deezer.ts similarity index 100% rename from src/providers/Deezer.ts rename to providers/Deezer.ts diff --git a/src/providers/abstract.ts b/providers/abstract.ts similarity index 100% rename from src/providers/abstract.ts rename to providers/abstract.ts diff --git a/src/providers/iTunes.ts b/providers/iTunes.ts similarity index 100% rename from src/providers/iTunes.ts rename to providers/iTunes.ts diff --git a/src/providers/regions/Deezer.ts b/providers/regions/Deezer.ts similarity index 100% rename from src/providers/regions/Deezer.ts rename to providers/regions/Deezer.ts diff --git a/src/server/components/ArtistCredit.tsx b/server/components/ArtistCredit.tsx similarity index 100% rename from src/server/components/ArtistCredit.tsx rename to server/components/ArtistCredit.tsx diff --git a/src/server/components/Button.tsx b/server/components/Button.tsx similarity index 100% rename from src/server/components/Button.tsx rename to server/components/Button.tsx diff --git a/src/server/components/CoverImage.tsx b/server/components/CoverImage.tsx similarity index 100% rename from src/server/components/CoverImage.tsx rename to server/components/CoverImage.tsx diff --git a/src/server/components/Footer.tsx b/server/components/Footer.tsx similarity index 100% rename from src/server/components/Footer.tsx rename to server/components/Footer.tsx diff --git a/src/server/components/ISRC.tsx b/server/components/ISRC.tsx similarity index 100% rename from src/server/components/ISRC.tsx rename to server/components/ISRC.tsx diff --git a/src/server/components/InputWithOverlay.tsx b/server/components/InputWithOverlay.tsx similarity index 100% rename from src/server/components/InputWithOverlay.tsx rename to server/components/InputWithOverlay.tsx diff --git a/src/server/components/MessageBox.tsx b/server/components/MessageBox.tsx similarity index 100% rename from src/server/components/MessageBox.tsx rename to server/components/MessageBox.tsx diff --git a/src/server/components/Release.tsx b/server/components/Release.tsx similarity index 97% rename from src/server/components/Release.tsx rename to server/components/Release.tsx index adf8c54..c73c838 100644 --- a/src/server/components/Release.tsx +++ b/server/components/Release.tsx @@ -5,7 +5,7 @@ import { TextWithLineBreaks } from './TextWithLineBreaks.tsx'; import { Tracklist } from './Tracklist.tsx'; import RegionList from '../islands/RegionList.tsx'; -import { determineReleaseEventCountries } from '../../MusicBrainz/releaseCountries.ts'; +import { determineReleaseEventCountries } from '../../musicbrainz/release_countries.ts'; import { formatPartialDate } from '../../utils/date.ts'; import { formatLanguageConfidence, formatScriptFrequency, regionName } from '../../utils/locale.ts'; import { flagEmoji } from '../../utils/regions.ts'; diff --git a/src/server/components/ReleaseLookup.tsx b/server/components/ReleaseLookup.tsx similarity index 100% rename from src/server/components/ReleaseLookup.tsx rename to server/components/ReleaseLookup.tsx diff --git a/src/server/components/ReleaseSeeder.tsx b/server/components/ReleaseSeeder.tsx similarity index 90% rename from src/server/components/ReleaseSeeder.tsx rename to server/components/ReleaseSeeder.tsx index 0234812..bfe1bc9 100644 --- a/src/server/components/ReleaseSeeder.tsx +++ b/server/components/ReleaseSeeder.tsx @@ -1,7 +1,7 @@ import InputWithOverlay from './InputWithOverlay.tsx'; import IconDatabaseImport from 'tabler-icons/database-import.tsx'; -import { createReleaseSeed, targetUrl } from '../../MusicBrainz/seeding.ts'; +import { createReleaseSeed, targetUrl } from '../../musicbrainz/seeding.ts'; import { preferArray } from 'utils/array/scalar.js'; import type { HarmonyRelease } from '../../harmonizer/types.ts'; diff --git a/src/server/components/TextWithLineBreaks.tsx b/server/components/TextWithLineBreaks.tsx similarity index 100% rename from src/server/components/TextWithLineBreaks.tsx rename to server/components/TextWithLineBreaks.tsx diff --git a/src/server/components/Tracklist.tsx b/server/components/Tracklist.tsx similarity index 100% rename from src/server/components/Tracklist.tsx rename to server/components/Tracklist.tsx diff --git a/src/server/dev.ts b/server/dev.ts similarity index 100% rename from src/server/dev.ts rename to server/dev.ts diff --git a/src/server/fresh.gen.ts b/server/fresh.gen.ts similarity index 100% rename from src/server/fresh.gen.ts rename to server/fresh.gen.ts diff --git a/src/server/islands/RegionList.tsx b/server/islands/RegionList.tsx similarity index 100% rename from src/server/islands/RegionList.tsx rename to server/islands/RegionList.tsx diff --git a/src/server/main.ts b/server/main.ts similarity index 100% rename from src/server/main.ts rename to server/main.ts diff --git a/src/server/routes/_app.tsx b/server/routes/_app.tsx similarity index 100% rename from src/server/routes/_app.tsx rename to server/routes/_app.tsx diff --git a/src/server/routes/index.tsx b/server/routes/index.tsx similarity index 100% rename from src/server/routes/index.tsx rename to server/routes/index.tsx diff --git a/src/server/routes/release.tsx b/server/routes/release.tsx similarity index 100% rename from src/server/routes/release.tsx rename to server/routes/release.tsx diff --git a/src/server/static/harmony.css b/server/static/harmony.css similarity index 100% rename from src/server/static/harmony.css rename to server/static/harmony.css diff --git a/src/utils/date.ts b/utils/date.ts similarity index 100% rename from src/utils/date.ts rename to utils/date.ts diff --git a/src/utils/errors.ts b/utils/errors.ts similarity index 100% rename from src/utils/errors.ts rename to utils/errors.ts diff --git a/tests/utils/gtin.test.ts b/utils/gtin.test.ts similarity index 95% rename from tests/utils/gtin.test.ts rename to utils/gtin.test.ts index c5e5962..dcf5891 100644 --- a/tests/utils/gtin.test.ts +++ b/utils/gtin.test.ts @@ -1,9 +1,9 @@ -import { checkDigit, ensureValidGTIN, isEqualGTIN, isValidGTIN } from '../../src/utils/gtin.ts'; +import { checkDigit, ensureValidGTIN, isEqualGTIN, isValidGTIN } from './gtin.ts'; import { assert, assertFalse, assertStrictEquals, assertThrows } from 'std/testing/asserts.ts'; import { describe, it } from 'std/testing/bdd.ts'; -import type { FunctionSpec, ParameterSpec, ThrowSpec } from '../spec.ts'; +import type { FunctionSpec, ParameterSpec, ThrowSpec } from './test_spec.ts'; describe('GTIN validator', () => { const passingCases: ParameterSpec = [ diff --git a/src/utils/gtin.ts b/utils/gtin.ts similarity index 100% rename from src/utils/gtin.ts rename to utils/gtin.ts diff --git a/src/utils/locale.ts b/utils/locale.ts similarity index 100% rename from src/utils/locale.ts rename to utils/locale.ts diff --git a/src/utils/plural.ts b/utils/plural.ts similarity index 100% rename from src/utils/plural.ts rename to utils/plural.ts diff --git a/src/utils/regions.ts b/utils/regions.ts similarity index 100% rename from src/utils/regions.ts rename to utils/regions.ts diff --git a/src/utils/script.ts b/utils/script.ts similarity index 100% rename from src/utils/script.ts rename to utils/script.ts diff --git a/tests/spec.ts b/utils/test_spec.ts similarity index 100% rename from tests/spec.ts rename to utils/test_spec.ts diff --git a/src/utils/time.ts b/utils/time.ts similarity index 100% rename from src/utils/time.ts rename to utils/time.ts