Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-07-09 03:04:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into chart/updateprefix

Browse Source
This commit is contained in:
acelinkio 2025-01-03 09:39:28 -08:00 committed by GitHub
commit 2d982b7539
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 59 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
auth/.env.example
View File

@ -1,6 +1,9 @@
# vi: ft=sh
# shellcheck disable=SC2034
# http route prefix (will listen to $KEIBI_PREFIX/users for example)
KEIBI_PREFIX=""
# Database things
POSTGRES_USER=kyoo
POSTGRES_PASSWORD=password

4
auth/config.go
View File

@ -6,6 +6,7 @@ import (
"crypto/rsa"
"crypto/x509"
"encoding/pem"
"os"
"time"
"github.com/golang-jwt/jwt/v5"
@ -13,6 +14,7 @@ import (
)
type Configuration struct {
Prefix string
JwtPrivateKey *rsa.PrivateKey
JwtPublicKey *rsa.PublicKey
Issuer string
@ -52,6 +54,8 @@ func LoadConfiguration(db *dbc.Queries) (*Configuration, error) {
}
}
ret.Prefix = os.Getenv("KEIBI_PREFIX")
if ret.JwtPrivateKey == nil {
ret.JwtPrivateKey, err = rsa.GenerateKey(rand.Reader, 4096)
if err != nil {

15
auth/main.go
View File

@ -163,29 +163,30 @@ func main() {
}
h.config = conf
r := e.Group("")
g := e.Group(conf.Prefix)
r := e.Group(conf.Prefix)
r.Use(echojwt.WithConfig(echojwt.Config{
SigningMethod: "RS256",
SigningKey: h.config.JwtPublicKey,
}))
e.GET("/health", h.CheckHealth)
g.GET("/health", h.CheckHealth)
r.GET("/users", h.ListUsers)
r.GET("/users/:id", h.GetUser)
r.GET("/users/me", h.GetMe)
r.DELETE("/users/:id", h.DeleteUser)
r.DELETE("/users/me", h.DeleteSelf)
e.POST("/users", h.Register)
g.POST("/users", h.Register)
e.POST("/sessions", h.Login)
g.POST("/sessions", h.Login)
r.DELETE("/sessions", h.Logout)
r.DELETE("/sessions/:id", h.Logout)
e.GET("/jwt", h.CreateJwt)
e.GET("/info", h.GetInfo)
g.GET("/jwt", h.CreateJwt)
g.GET("/info", h.GetInfo)
e.GET("/swagger/*", echoSwagger.WrapHandler)
g.GET("/swagger/*", echoSwagger.WrapHandler)
e.Logger.Fatal(e.Start(":4568"))
}

5
back/.env.example Normal file
View File

@ -0,0 +1,5 @@
# vi: ft=sh
# shellcheck disable=SC2034
# http route prefix (will listen to $KYOO_PREFIX/movie for example)
KYOO_PREFIX=""

3
back/src/Kyoo.Core/Program.cs
View File

@ -17,7 +17,6 @@
// along with Kyoo. If not, see <https://www.gnu.org/licenses/>.
using System;
using Kyoo.Abstractions.Controllers;
using Kyoo.Authentication;
using Kyoo.Core;
using Kyoo.Core.Controllers;
@ -28,6 +27,7 @@ using Kyoo.RabbitMq;
using Kyoo.Swagger;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Serilog;
@ -85,6 +85,7 @@ builder.ConfigureRabbitMq();
WebApplication app = builder.Build();
CoreModule.Services = app.Services;
app.UsePathBase(new PathString(builder.Configuration.GetValue("KYOO_PREFIX", "")));
app.UseHsts();
app.UseKyooOpenApi();
app.UseResponseCompression();

2
back/src/Kyoo.Meilisearch/Kyoo.Meilisearch.csproj
View File

@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MeiliSearch" Version="0.15.5" />
<PackageReference Include="MeiliSearch" Version="0.15.4" />
</ItemGroup>
<ItemGroup>

17
docker-compose.build.yml
View File

@ -19,7 +19,8 @@ services:
build: ./back
restart: on-failure
environment:
- TRANSCODER_URL=${TRANSCODER_URL:-http://transcoder:7666}
- TRANSCODER_URL=${TRANSCODER_URL:-http://transcoder:7666/video}
- KYOO_PREFIX=/api
env_file:
- ./.env
depends_on:
@ -36,9 +37,6 @@ services:
labels:
- "traefik.enable=true"
- "traefik.http.routers.api.rule=PathPrefix(`/api/`)"
- "traefik.http.routers.api.middlewares=api-sp"
- "traefik.http.middlewares.api-sp.stripprefix.prefixes=/api"
- "traefik.http.middlewares.api-sp.stripprefix.forceSlash=false"
migrations:
build:
@ -55,7 +53,7 @@ services:
build: ./front
restart: on-failure
environment:
- KYOO_URL=${KYOO_URL:-http://back:5000}
- KYOO_URL=${KYOO_URL:-http://back:5000/api}
labels:
- "traefik.enable=true"
- "traefik.http.routers.front.rule=PathPrefix(`/`)"
@ -68,12 +66,11 @@ services:
condition: service_healthy
env_file:
- ./.env
environment:
- KEIBI_PREFIX=/auth
labels:
- "traefik.enable=true"
- "traefik.http.routers.auth.rule=PathPrefix(`/auth/`)"
- "traefik.http.routers.auth.middlewares=auth-sp"
- "traefik.http.middlewares.auth-sp.stripprefix.prefixes=/auth"
- "traefik.http.middlewares.auth-sp.stripprefix.forceSlash=false"
profiles:
- "v5"
@ -86,7 +83,7 @@ services:
env_file:
- ./.env
environment:
- KYOO_URL=${KYOO_URL:-http://back:5000}
- KYOO_URL=${KYOO_URL:-http://back:5000/api}
volumes:
- ${LIBRARY_ROOT}:/video:ro
@ -100,7 +97,7 @@ services:
env_file:
- ./.env
environment:
- KYOO_URL=${KYOO_URL:-http://back:5000}
- KYOO_URL=${KYOO_URL:-http://back:5000/api}
autosync:
build: ./autosync

17
docker-compose.dev.yml
View File

@ -29,7 +29,8 @@ services:
- "5000:5000"
restart: on-failure
environment:
- TRANSCODER_URL=${TRANSCODER_URL:-http://transcoder:7666}
- TRANSCODER_URL=${TRANSCODER_URL:-http://transcoder:7666/video}
- KYOO_PREFIX=/api
env_file:
- ./.env
depends_on:
@ -48,9 +49,6 @@ services:
labels:
- "traefik.enable=true"
- "traefik.http.routers.api.rule=PathPrefix(`/api/`)"
- "traefik.http.routers.api.middlewares=api-sp"
- "traefik.http.middlewares.api-sp.stripprefix.prefixes=/api"
- "traefik.http.middlewares.api-sp.stripprefix.forceSlash=false"
migrations:
build:
@ -79,7 +77,7 @@ services:
- "8081:8081"
restart: on-failure
environment:
- KYOO_URL=${KYOO_URL:-http://back:5000}
- KYOO_URL=${KYOO_URL:-http://back:5000/api}
labels:
- "traefik.enable=true"
- "traefik.http.routers.front.rule=PathPrefix(`/`)"
@ -96,14 +94,13 @@ services:
- "4568:4568"
env_file:
- ./.env
environment:
- KEIBI_PREFIX=/auth
volumes:
- ./auth:/app
labels:
- "traefik.enable=true"
- "traefik.http.routers.auth.rule=PathPrefix(`/auth/`)"
- "traefik.http.routers.auth.middlewares=auth-sp"
- "traefik.http.middlewares.auth-sp.stripprefix.prefixes=/auth"
- "traefik.http.middlewares.auth-sp.stripprefix.forceSlash=false"
scanner:
build: ./scanner
@ -114,7 +111,7 @@ services:
env_file:
- ./.env
environment:
- KYOO_URL=${KYOO_URL:-http://back:5000}
- KYOO_URL=${KYOO_URL:-http://back:5000/api}
volumes:
- ${LIBRARY_ROOT}:/video:ro
@ -128,7 +125,7 @@ services:
env_file:
- ./.env
environment:
- KYOO_URL=${KYOO_URL:-http://back:5000}
- KYOO_URL=${KYOO_URL:-http://back:5000/api}
autosync:
build: ./autosync

12
docker-compose.yml
View File

@ -20,7 +20,8 @@ services:
restart: unless-stopped
cpus: 1.5
environment:
- TRANSCODER_URL=${TRANSCODER_URL:-http://transcoder:7666}
- TRANSCODER_URL=${TRANSCODER_URL:-http://transcoder:7666/video}
- KYOO_PREFIX=/api
env_file:
- ./.env
depends_on:
@ -37,9 +38,6 @@ services:
labels:
- "traefik.enable=true"
- "traefik.http.routers.api.rule=PathPrefix(`/api/`)"
- "traefik.http.routers.api.middlewares=api-sp"
- "traefik.http.middlewares.api-sp.stripprefix.prefixes=/api"
- "traefik.http.middlewares.api-sp.stripprefix.forceSlash=false"
migrations:
image: ghcr.io/zoriya/kyoo_migrations:edge
@ -54,7 +52,7 @@ services:
image: ghcr.io/zoriya/kyoo_front:edge
restart: unless-stopped
environment:
- KYOO_URL=${KYOO_URL:-http://back:5000}
- KYOO_URL=${KYOO_URL:-http://back:5000/api}
labels:
- "traefik.enable=true"
- "traefik.http.routers.front.rule=PathPrefix(`/`)"
@ -68,7 +66,7 @@ services:
env_file:
- ./.env
environment:
- KYOO_URL=${KYOO_URL:-http://back:5000}
- KYOO_URL=${KYOO_URL:-http://back:5000/api}
volumes:
- ${LIBRARY_ROOT}:/video:ro
@ -82,7 +80,7 @@ services:
env_file:
- ./.env
environment:
- KYOO_URL=${KYOO_URL:-http://back:5000}
- KYOO_URL=${KYOO_URL:-http://back:5000/api}
autosync:
image: ghcr.io/zoriya/kyoo_autosync:edge

25
transcoder/main.go
View File

@ -308,18 +308,19 @@ func main() {
metadata: metadata,
}
e.GET("/:path/direct", DirectStream)
e.GET("/:path/direct/:identifier", DirectStream)
e.GET("/:path/master.m3u8", h.GetMaster)
e.GET("/:path/:video/:quality/index.m3u8", h.GetVideoIndex)
e.GET("/:path/audio/:audio/index.m3u8", h.GetAudioIndex)
e.GET("/:path/:video/:quality/:chunk", h.GetVideoSegment)
e.GET("/:path/audio/:audio/:chunk", h.GetAudioSegment)
e.GET("/:path/info", h.GetInfo)
e.GET("/:path/thumbnails.png", h.GetThumbnails)
e.GET("/:path/thumbnails.vtt", h.GetThumbnailsVtt)
e.GET("/:path/attachment/:name", h.GetAttachment)
e.GET("/:path/subtitle/:name", h.GetSubtitle)
g := e.Group(src.Settings.RoutePrefix)
g.GET("/:path/direct", DirectStream)
g.GET("/:path/direct/:identifier", DirectStream)
g.GET("/:path/master.m3u8", h.GetMaster)
g.GET("/:path/:video/:quality/index.m3u8", h.GetVideoIndex)
g.GET("/:path/audio/:audio/index.m3u8", h.GetAudioIndex)
g.GET("/:path/:video/:quality/:chunk", h.GetVideoSegment)
g.GET("/:path/audio/:audio/:chunk", h.GetAudioSegment)
g.GET("/:path/info", h.GetInfo)
g.GET("/:path/thumbnails.png", h.GetThumbnails)
g.GET("/:path/thumbnails.vtt", h.GetThumbnailsVtt)
g.GET("/:path/attachment/:name", h.GetAttachment)
g.GET("/:path/subtitle/:name", h.GetSubtitle)
e.Logger.Fatal(e.Start(":7666"))
}

4
transcoder/src/extract.go
View File

@ -60,6 +60,10 @@ func extractSubs(info *MediaInfo) error {
for _, sub := range info.Subtitles {
if ext := sub.Extension; ext != nil {
if sub.IsExternal {
// skip extraction of external subtitles
continue
}
cmd.Args = append(
cmd.Args,
"-map", fmt.Sprintf("0:s:%d", *sub.Index),