gabehf
/
Koito
mirror of https://github.com/gabehf/Koito.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: gabehf:fed2c5b95684964481539216fa7aa2ed8f830dba
Branches Tags
gabehf:main
gabehf:feat/login-gate
gabehf:dev
gabehf:feat/custom-artist-sep
..
compare: gabehf:c77481fd5950f6102ece3d131f99083fdaaa2756
Branches Tags
gabehf:main
gabehf:feat/login-gate
gabehf:dev
gabehf:feat/custom-artist-sep

No commits in common. 'fed2c5b95684964481539216fa7aa2ed8f830dba' and 'c77481fd5950f6102ece3d131f99083fdaaa2756' have entirely different histories.
fed2c5b956 ... c77481fd59

8 changed files with 127 additions and 192 deletions
Show Stats

1
.gitignore vendored
Unescape View File

@ -1 +0,0 @@
test_config_dir

2
client/app/components/LastPlays.tsx
Unescape View File

@ -72,8 +72,6 @@ export default function LastPlays(props: Props) {
return <p className="error">Error: {error.message}</p>; return <p className="error">Error: {error.message}</p>;
} }
if (!data.items) return;
const listens = items ?? data.items; const listens = items ?? data.items;
let params = ""; let params = "";

93
client/app/components/TopAlbums.tsx
Unescape View File

@ -1,63 +1,42 @@
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query"
import ArtistLinks from "./ArtistLinks"; import ArtistLinks from "./ArtistLinks"
import { import { getTopAlbums, getTopTracks, imageUrl, type getItemsArgs } from "api/api"
getTopAlbums, import { Link } from "react-router"
getTopTracks, import TopListSkeleton from "./skeletons/TopListSkeleton"
imageUrl, import TopItemList from "./TopItemList"
type getItemsArgs,
} from "api/api";
import { Link } from "react-router";
import TopListSkeleton from "./skeletons/TopListSkeleton";
import TopItemList from "./TopItemList";
interface Props { interface Props {
limit: number; limit: number,
period: string; period: string,
artistId?: Number; artistId?: Number
} }
export default function TopAlbums(props: Props) { export default function TopAlbums (props: Props) {
const { isPending, isError, data, error } = useQuery({
queryKey: [
"top-albums",
{
limit: props.limit,
period: props.period,
artistId: props.artistId,
page: 0,
},
],
queryFn: ({ queryKey }) => getTopAlbums(queryKey[1] as getItemsArgs),
});
if (isPending) { const { isPending, isError, data, error } = useQuery({
return ( queryKey: ['top-albums', {limit: props.limit, period: props.period, artistId: props.artistId, page: 0 }],
<div className="w-[300px]"> queryFn: ({ queryKey }) => getTopAlbums(queryKey[1] as getItemsArgs),
<h2>Top Albums</h2> })
<p>Loading...</p>
</div>
);
}
if (isError) {
return <p className="error">Error:{error.message}</p>;
}
if (!data.items) return;
return ( if (isPending) {
<div> return (
<h2 className="hover:underline"> <div className="w-[300px]">
<Link <h2>Top Albums</h2>
to={`/chart/top-albums?period=${props.period}${ <p>Loading...</p>
props.artistId ? `&artist_id=${props.artistId}` : "" </div>
}`} )
> }
Top Albums if (isError) {
</Link> return <p className="error">Error:{error.message}</p>
</h2> }
<div className="max-w-[300px]">
<TopItemList type="album" data={data} /> return (
{data.items.length < 1 ? "Nothing to show" : ""} <div>
</div> <h2 className="hover:underline"><Link to={`/chart/top-albums?period=${props.period}${props.artistId ? `&artist_id=${props.artistId}` : ''}`}>Top Albums</Link></h2>
</div> <div className="max-w-[300px]">
); <TopItemList type="album" data={data} />
} {data.items.length < 1 ? 'Nothing to show' : ''}
</div>
</div>
)
}

81
client/app/components/TopArtists.tsx
Unescape View File

@ -1,50 +1,43 @@
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query"
import ArtistLinks from "./ArtistLinks"; import ArtistLinks from "./ArtistLinks"
import { getTopArtists, imageUrl, type getItemsArgs } from "api/api"; import { getTopArtists, imageUrl, type getItemsArgs } from "api/api"
import { Link } from "react-router"; import { Link } from "react-router"
import TopListSkeleton from "./skeletons/TopListSkeleton"; import TopListSkeleton from "./skeletons/TopListSkeleton"
import TopItemList from "./TopItemList"; import TopItemList from "./TopItemList"
interface Props { interface Props {
limit: number; limit: number,
period: string; period: string,
artistId?: Number; artistId?: Number
albumId?: Number; albumId?: Number
} }
export default function TopArtists(props: Props) { export default function TopArtists (props: Props) {
const { isPending, isError, data, error } = useQuery({
queryKey: [
"top-artists",
{ limit: props.limit, period: props.period, page: 0 },
],
queryFn: ({ queryKey }) => getTopArtists(queryKey[1] as getItemsArgs),
});
if (isPending) { const { isPending, isError, data, error } = useQuery({
return ( queryKey: ['top-artists', {limit: props.limit, period: props.period, page: 0 }],
<div className="w-[300px]"> queryFn: ({ queryKey }) => getTopArtists(queryKey[1] as getItemsArgs),
<h2>Top Artists</h2> })
<p>Loading...</p>
</div>
);
}
if (isError) {
return <p className="error">Error:{error.message}</p>;
}
if (!data.items) return;
return ( if (isPending) {
<div> return (
<h2 className="hover:underline"> <div className="w-[300px]">
<Link to={`/chart/top-artists?period=${props.period}`}> <h2>Top Artists</h2>
Top Artists <p>Loading...</p>
</Link> </div>
</h2> )
<div className="max-w-[300px]"> }
<TopItemList type="artist" data={data} /> if (isError) {
{data.items.length < 1 ? "Nothing to show" : ""} return <p className="error">Error:{error.message}</p>
</div> }
</div>
); return (
} <div>
<h2 className="hover:underline"><Link to={`/chart/top-artists?period=${props.period}`}>Top Artists</Link></h2>
<div className="max-w-[300px]">
<TopItemList type="artist" data={data} />
{data.items.length < 1 ? 'Nothing to show' : ''}
</div>
</div>
)
}

95
client/app/components/TopTracks.tsx
Unescape View File

@ -1,63 +1,50 @@
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query"
import ArtistLinks from "./ArtistLinks"; import ArtistLinks from "./ArtistLinks"
import { getTopTracks, imageUrl, type getItemsArgs } from "api/api"; import { getTopTracks, imageUrl, type getItemsArgs } from "api/api"
import { Link } from "react-router"; import { Link } from "react-router"
import TopListSkeleton from "./skeletons/TopListSkeleton"; import TopListSkeleton from "./skeletons/TopListSkeleton"
import { useEffect } from "react"; import { useEffect } from "react"
import TopItemList from "./TopItemList"; import TopItemList from "./TopItemList"
interface Props { interface Props {
limit: number; limit: number,
period: string; period: string,
artistId?: Number; artistId?: Number
albumId?: Number; albumId?: Number
} }
const TopTracks = (props: Props) => { const TopTracks = (props: Props) => {
const { isPending, isError, data, error } = useQuery({
queryKey: [
"top-tracks",
{
limit: props.limit,
period: props.period,
artist_id: props.artistId,
album_id: props.albumId,
page: 0,
},
],
queryFn: ({ queryKey }) => getTopTracks(queryKey[1] as getItemsArgs),
});
if (isPending) { const { isPending, isError, data, error } = useQuery({
return ( queryKey: ['top-tracks', {limit: props.limit, period: props.period, artist_id: props.artistId, album_id: props.albumId, page: 0}],
<div className="w-[300px]"> queryFn: ({ queryKey }) => getTopTracks(queryKey[1] as getItemsArgs),
<h2>Top Tracks</h2> })
<p>Loading...</p>
</div>
);
}
if (isError) {
return <p className="error">Error:{error.message}</p>;
}
if (!data.items) return;
let params = ""; if (isPending) {
params += props.artistId ? `&artist_id=${props.artistId}` : ""; return (
params += props.albumId ? `&album_id=${props.albumId}` : ""; <div className="w-[300px]">
<h2>Top Tracks</h2>
<p>Loading...</p>
</div>
)
}
if (isError) {
return <p className="error">Error:{error.message}</p>
}
let params = ''
params += props.artistId ? `&artist_id=${props.artistId}` : ''
params += props.albumId ? `&album_id=${props.albumId}` : ''
return ( return (
<div> <div>
<h2 className="hover:underline"> <h2 className="hover:underline"><Link to={`/chart/top-tracks?period=${props.period}${params}`}>Top Tracks</Link></h2>
<Link to={`/chart/top-tracks?period=${props.period}${params}`}> <div className="max-w-[300px]">
Top Tracks <TopItemList type="track" data={data}/>
</Link> {data.items.length < 1 ? 'Nothing to show' : ''}
</h2> </div>
<div className="max-w-[300px]"> </div>
<TopItemList type="track" data={data} /> )
{data.items.length < 1 ? "Nothing to show" : ""} }
</div>
</div>
);
};
export default TopTracks; export default TopTracks

3
docs/src/content/docs/reference/configuration.md
Unescape View File

@ -26,9 +26,6 @@ If the environment variable is defined without **and** with the suffix at the sa
##### KOITO_DEFAULT_THEME ##### KOITO_DEFAULT_THEME
- Default: `yuu` - Default: `yuu`
- Description: The lowercase name of the default theme to be used by the client. Overridden if a user picks a theme in the theme switcher. - Description: The lowercase name of the default theme to be used by the client. Overridden if a user picks a theme in the theme switcher.
##### KOITO_LOGIN_GATE
- Default: `false`
- Description: When `true`, Koito will not show any statistics unless the user is logged in.
##### KOITO_BIND_ADDR ##### KOITO_BIND_ADDR
- Description: The address to bind to. The default blank value is equivalent to `0.0.0.0`. - Description: The address to bind to. The default blank value is equivalent to `0.0.0.0`.
##### KOITO_LISTEN_PORT ##### KOITO_LISTEN_PORT

32
engine/routes.go
Unescape View File

@ -36,25 +36,19 @@ func bindRoutes(
r.Route("/apis/web/v1", func(r chi.Router) { r.Route("/apis/web/v1", func(r chi.Router) {
r.Get("/config", handlers.GetCfgHandler()) r.Get("/config", handlers.GetCfgHandler())
r.Get("/artist", handlers.GetArtistHandler(db))
r.Group(func(r chi.Router) { r.Get("/artists", handlers.GetArtistsForItemHandler(db))
if cfg.LoginGate() { r.Get("/album", handlers.GetAlbumHandler(db))
r.Use(middleware.ValidateSession(db)) r.Get("/track", handlers.GetTrackHandler(db))
} r.Get("/top-tracks", handlers.GetTopTracksHandler(db))
r.Get("/artist", handlers.GetArtistHandler(db)) r.Get("/top-albums", handlers.GetTopAlbumsHandler(db))
r.Get("/artists", handlers.GetArtistsForItemHandler(db)) r.Get("/top-artists", handlers.GetTopArtistsHandler(db))
r.Get("/album", handlers.GetAlbumHandler(db)) r.Get("/listens", handlers.GetListensHandler(db))
r.Get("/track", handlers.GetTrackHandler(db)) r.Get("/listen-activity", handlers.GetListenActivityHandler(db))
r.Get("/top-tracks", handlers.GetTopTracksHandler(db)) r.Get("/now-playing", handlers.NowPlayingHandler(db))
r.Get("/top-albums", handlers.GetTopAlbumsHandler(db)) r.Get("/stats", handlers.StatsHandler(db))
r.Get("/top-artists", handlers.GetTopArtistsHandler(db)) r.Get("/search", handlers.SearchHandler(db))
r.Get("/listens", handlers.GetListensHandler(db)) r.Get("/aliases", handlers.GetAliasesHandler(db))
r.Get("/listen-activity", handlers.GetListenActivityHandler(db))
r.Get("/now-playing", handlers.NowPlayingHandler(db))
r.Get("/stats", handlers.StatsHandler(db))
r.Get("/search", handlers.SearchHandler(db))
r.Get("/aliases", handlers.GetAliasesHandler(db))
})
r.Post("/logout", handlers.LogoutHandler(db)) r.Post("/logout", handlers.LogoutHandler(db))
if !cfg.RateLimitDisabled() { if !cfg.RateLimitDisabled() {
r.With(httprate.Limit( r.With(httprate.Limit(

12
internal/cfg/cfg.go
Unescape View File

@ -47,7 +47,6 @@ const (
IMPORT_AFTER_UNIX_ENV = "KOITO_IMPORT_AFTER_UNIX" IMPORT_AFTER_UNIX_ENV = "KOITO_IMPORT_AFTER_UNIX"
FETCH_IMAGES_DURING_IMPORT_ENV = "KOITO_FETCH_IMAGES_DURING_IMPORT" FETCH_IMAGES_DURING_IMPORT_ENV = "KOITO_FETCH_IMAGES_DURING_IMPORT"
ARTIST_SEPARATORS_ENV = "KOITO_ARTIST_SEPARATORS_REGEX" ARTIST_SEPARATORS_ENV = "KOITO_ARTIST_SEPARATORS_REGEX"
LOGIN_GATE_ENV = "KOITO_LOGIN_GATE"
) )
type config struct { type config struct {
@ -84,7 +83,6 @@ type config struct {
importBefore time.Time importBefore time.Time
importAfter time.Time importAfter time.Time
artistSeparators []*regexp.Regexp artistSeparators []*regexp.Regexp
loginGate bool
} }
var ( var (
@ -206,10 +204,6 @@ func loadConfig(getenv func(string) string, version string) (*config, error) {
cfg.artistSeparators = []*regexp.Regexp{regexp.MustCompile(`\s+·\s+`)} cfg.artistSeparators = []*regexp.Regexp{regexp.MustCompile(`\s+·\s+`)}
} }
if strings.ToLower(getenv(LOGIN_GATE_ENV)) == "true" {
cfg.loginGate = true
}
switch strings.ToLower(getenv(LOG_LEVEL_ENV)) { switch strings.ToLower(getenv(LOG_LEVEL_ENV)) {
case "debug": case "debug":
cfg.logLevel = 0 cfg.logLevel = 0
@ -415,9 +409,3 @@ func ArtistSeparators() []*regexp.Regexp {
defer lock.RUnlock() defer lock.RUnlock()
return globalConfig.artistSeparators return globalConfig.artistSeparators
} }
func LoginGate() bool {
lock.RLock()
defer lock.RUnlock()
return globalConfig.loginGate
}

Write Preview
Loading…
Cancel
Save