v2.1.0

So the version string doesn't need to overflow when it includes the `-dev` affix

Dockerfile

@@ -1,7 +1,7 @@
 #
 # Backend
 #
-FROM golang:1.22-alpine AS server
+FROM golang:1.24-alpine AS server
 
 WORKDIR /server
 COPY server/*.go server/go.* ./

doc/docs/importing/myanimelist.md

@@ -1,5 +1,5 @@
 ---
-sidebar_position: 1
+sidebar_position: 2
 ---
 
 # MyAnimeList

doc/docs/importing/text-file.md

@@ -0,0 +1,30 @@
+---
+sidebar_position: 1
+---
+
+# Text File (.txt list)
+
+:::info Backup?
+You may consider a backup of your server before starting any import. They are not easily reversible, though we do our best to ensure they are accurate and bug free!
+:::
+
+The text file (.txt) import is of an arbitrary format (the one I used for years before creating Watcharr).
+
+Hopefully it is useful for others with similar files or in scenarios where its the easiest to generate for an import (though if possible, when generating a backup from another service data manually, matching a Watcharr export would enable keeping more data).
+
+## Format
+
+Each line is a new entry. The name of the content (show/movie) must be provided, the year can be optionally provided surrounded by brackets. Doesn't support specifying if name is for a show or movie, the importer will only automatically match on full search matches, if there are multiple results, you will be asked to pick the correct one.
+
+```
+<name> [(<year>)]
+```
+
+## An example
+
+```
+The Terminator (1984)
+Breaking Bad
+A Fistful of Dollars
+Reacher (2022)
+```

doc/docs/importing/trakt.md

@@ -0,0 +1,16 @@
+---
+sidebar_position: 3
+---
+
+# Trakt
+
+:::info Backup?
+You may consider a backup of your server before starting any import. They are not easily reversible, though we do our best to ensure they are accurate and bug free!
+:::
+
+**Note:** Your Trakt profile must be public _during_ this process. You are free to private it again once it completes.
+
+1. Provide your Trakt username in the text box.
+2. Press `Start Import`.
+
+This will be a long process, possibly a couple hours depending on how large of a Trakt history you have. If you think it has frozen or isn't working, try checking your server logs to see if it is doing anything.

doc/docs/importing/watcharr.md

@@ -0,0 +1,16 @@
+---
+sidebar_position: 0
+---
+
+# Watcharr
+
+:::info Backup?
+You may consider a backup of your server before starting any import. They are not easily reversible, though we do our best to ensure they are accurate and bug free!
+:::
+
+:::warning May not be what you want
+Watcharr import/export is a feature intended for end users. If you are the server admin, it is recommended that you copy your server files directly to any new server you are creating (it'll be much faster and easier). [See backup guide](/docs/server_config/backup).
+:::
+
+1. Provide the Watcharr export file (that you generated from your profile page).
+2. Review the import table, if everything looks good, start the import.

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "watcharr",
-	"version": "2.0.2",
+	"version": "2.1.0",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",
@@ -15,27 +15,27 @@
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-node": "^5.2.12",
-		"@sveltejs/kit": "^2.16.0",
+		"@sveltejs/kit": "^2.21.0",
 		"@types/papaparse": "^5.3.15",
-		"@typescript-eslint/eslint-plugin": "^8.18.2",
-		"@typescript-eslint/parser": "^8.18.2",
+		"@typescript-eslint/eslint-plugin": "^8.32.1",
+		"@typescript-eslint/parser": "^8.32.1",
 		"@vite-pwa/sveltekit": "^0.6.6",
 		"eslint": "^8.57.0",
-		"eslint-config-prettier": "^9.1.0",
+		"eslint-config-prettier": "^10.1.2",
 		"eslint-plugin-svelte": "^2.45.1",
 		"prettier": "^3.4.2",
-		"prettier-plugin-svelte": "^3.2.6",
-		"sass": "^1.83.0",
+		"prettier-plugin-svelte": "^3.4.0",
+		"sass": "^1.89.0",
 		"svelte": "^5.17.3",
 		"svelte-check": "^4.1.3",
 		"svelte-eslint-parser": "^0.42.0",
 		"svelte-preprocess": "^6.0.3",
-		"typescript": "^5.7.2",
-		"vite": "^6.0.7"
+		"typescript": "^5.8.3",
+		"vite": "^6.3.5"
 	},
 	"type": "module",
 	"dependencies": {
-		"axios": "^1.7.4",
+		"axios": "^1.9.0",
 		"blurhash": "^2.0.5",
 		"papaparse": "^5.4.1"
 	}

server/go.mod

@@ -1,16 +1,16 @@
 module github.com/sbondCo/Watcharr
 
-go 1.22
+go 1.24
 
 require (
 	github.com/buckket/go-blurhash v1.1.0
 	github.com/gin-contrib/cache v1.3.1
-	github.com/gin-contrib/cors v1.7.3
+	github.com/gin-contrib/cors v1.7.5
 	github.com/gin-gonic/gin v1.10.0
-	github.com/go-co-op/gocron/v2 v2.14.2
-	github.com/golang-jwt/jwt/v5 v5.2.1
+	github.com/go-co-op/gocron/v2 v2.16.2
+	github.com/golang-jwt/jwt/v5 v5.2.2
 	github.com/joho/godotenv v1.5.1
-	golang.org/x/crypto v0.32.0
+	golang.org/x/crypto v0.38.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gorm.io/driver/sqlite v1.5.7
 	gorm.io/gorm v1.25.12
@@ -18,23 +18,23 @@ require (
 
 require (
 	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
-	github.com/bytedance/sonic v1.12.6 // indirect
-	github.com/bytedance/sonic/loader v0.2.1 // indirect
-	github.com/cloudwego/base64x v0.1.4 // indirect
-	github.com/cloudwego/iasm v0.2.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.7 // indirect
-	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/bytedance/sonic v1.13.2 // indirect
+	github.com/bytedance/sonic/loader v0.2.4 // indirect
+	github.com/cloudwego/base64x v0.1.5 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
+	github.com/gin-contrib/sse v1.0.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.23.0 // indirect
-	github.com/goccy/go-json v0.10.4 // indirect
+	github.com/go-playground/validator/v10 v10.26.0 // indirect
+	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/gomodule/redigo v1.9.2 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/jonboulle/clockwork v0.4.0 // indirect
+	github.com/jonboulle/clockwork v0.5.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-sqlite3 v1.14.22 // indirect
@@ -46,11 +46,10 @@ require (
 	github.com/robfig/go-cache v0.0.0-20130306151617-9fc39e0dbf62 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
-	golang.org/x/arch v0.12.0 // indirect
-	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	google.golang.org/protobuf v1.36.1 // indirect
+	golang.org/x/arch v0.15.0 // indirect
+	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

server/go.sum

@@ -2,42 +2,41 @@ github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 h1:N7oVaKyGp8b
 github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
 github.com/buckket/go-blurhash v1.1.0 h1:X5M6r0LIvwdvKiUtiNcRL2YlmOfMzYobI3VCKCZc9Do=
 github.com/buckket/go-blurhash v1.1.0/go.mod h1:aT2iqo5W9vu9GpyoLErKfTHwgODsZp3bQfXjXJUxNb8=
-github.com/bytedance/sonic v1.12.6 h1:/isNmCUF2x3Sh8RAp/4mh4ZGkcFAX/hLrzrK3AvpRzk=
-github.com/bytedance/sonic v1.12.6/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
+github.com/bytedance/sonic v1.13.2 h1:8/H1FempDZqC4VqjptGo14QQlJx8VdZJegxs6wwfqpQ=
+github.com/bytedance/sonic v1.13.2/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/bytedance/sonic/loader v0.2.1 h1:1GgorWTqf12TA8mma4DDSbaQigE2wOgQo7iCjjJv3+E=
-github.com/bytedance/sonic/loader v0.2.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
-github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
-github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
+github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY=
+github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
+github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
+github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA=
-github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU=
+github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
+github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
 github.com/gin-contrib/cache v1.3.1 h1:EWjkOaLocs5fGt9feQaI7rt1GZbDyatFXEUh2/s3ZI8=
 github.com/gin-contrib/cache v1.3.1/go.mod h1:6Tme0p3QEF/Ck/KUcq7h/OAqZvUDjHRH1DtQbNgfIX0=
-github.com/gin-contrib/cors v1.7.3 h1:hV+a5xp8hwJoTw7OY+a70FsL8JkVVFTXw9EcfrYUdns=
-github.com/gin-contrib/cors v1.7.3/go.mod h1:M3bcKZhxzsvI+rlRSkkxHyljJt1ESd93COUvemZ79j4=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-contrib/cors v1.7.5 h1:cXC9SmofOrRg0w9PigwGlHG3ztswH6bqq4vJVXnvYMk=
+github.com/gin-contrib/cors v1.7.5/go.mod h1:4q3yi7xBEDDWKapjT2o1V7mScKDDr8k+jZ0fSquGoy0=
+github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E=
+github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0=
 github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
 github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
-github.com/go-co-op/gocron/v2 v2.14.2 h1:S6CbI7MVfD3S/aPJNLoSg2YcGyEqzEMwUopDejuT4Oc=
-github.com/go-co-op/gocron/v2 v2.14.2/go.mod h1:ZF70ZwEqz0OO4RBXE1sNxnANy/zvwLcattWEFsqpKig=
+github.com/go-co-op/gocron/v2 v2.16.2 h1:r08P663ikXiulLT9XaabkLypL/W9MoCIbqgQoAutyX4=
+github.com/go-co-op/gocron/v2 v2.16.2/go.mod h1:4YTLGCCAH75A5RlQ6q+h+VacO7CgjkgP0EJ+BEOXRSI=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o=
-github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
-github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
-github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
-github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=
+github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
+github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
+github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
+github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/gomodule/redigo v1.9.2 h1:HrutZBLhSIU8abiSfW8pj8mPhOyMYjZT/wcA4/L9L9s=
 github.com/gomodule/redigo v1.9.2/go.mod h1:KsU3hiK/Ay8U42qpaJk+kuNa3C+spxapWpM+ywhcgtw=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
@@ -51,13 +50,13 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4=
-github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc=
+github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I=
+github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
-github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
+github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
+github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
@@ -89,11 +88,13 @@ github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6po
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
@@ -102,21 +103,19 @@ github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65E
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-golang.org/x/arch v0.12.0 h1:UsYJhbzPYGsT0HbEdmYcqtCv8UNGvnaL561NnIUvaKg=
-golang.org/x/arch v0.12.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
-golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
-golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/arch v0.15.0 h1:QtOrQd0bTUnhNVNndMpLHNWrDmYzZ2KDqSrEymqInZw=
+golang.org/x/arch v0.15.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE=
+golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
+golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
+golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
-google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

src/lib/nav/FaceMenu.svelte

@@ -69,7 +69,7 @@
 	}
 </script>
 
-<Menu conf={{ arrowRight: "10px" }}>
+<Menu conf={{ width: "140px", arrowRight: "10px" }}>
 	{#if user?.username}
 		<h5 title={user.username}>Hi {user.username}!</h5>
 	{/if}

src/lib/util/helpers.ts

@@ -1,10 +1,8 @@
-import { store } from "@/store.svelte";
 import {
 	UserPermission,
 	type Icon,
 	type MediaType,
 	type TMDBContentCreditsCrew,
-	type Theme,
 	type TokenClaims,
 	type Watched,
 	type WatchedStatus,
@@ -294,26 +292,6 @@ export function getOrdinalSuffix(i: number) {
 	return "th";
 }
 
-/**
- * Toggle site wide theme.
- * @param theme The theme to switch to.
- * @param updateStore Should the store be updated to new theme?
- * **If set to `false`, state should be manually updated.**
- */
-export function toggleTheme(theme: Theme, updateStore = true) {
-	if (theme === "dark") {
-		document.documentElement.classList.add("theme-dark");
-		if (updateStore) {
-			store.appTheme = "dark";
-		}
-	} else {
-		document.documentElement.classList.remove("theme-dark");
-		if (updateStore) {
-			store.appTheme = "light";
-		}
-	}
-}
-
 export function parseTokenPayload(): TokenClaims | undefined {
 	try {
 		const token = localStorage.getItem("token");

src/lib/util/theme.ts

@@ -0,0 +1,66 @@
+// App Theme logic.
+
+import { browser } from "$app/environment";
+import { store } from "@/store.svelte";
+import type { Theme } from "@/types";
+
+/**
+ * Utility function to handle media queries for theme preferences.
+ */
+
+const prefersDarkThemeQuery: MediaQueryList | undefined = browser
+	? window.matchMedia("(prefers-color-scheme: dark)")
+	: undefined;
+
+/**
+ * prefersDarkThemeQuery onChange handler.
+ */
+function prefersDarkThemeChanged(e: MediaQueryListEvent) {
+	console.info(
+		"prefersDarkThemeChanged: User preferred theme has changed. prefersDark:",
+		e.matches,
+	);
+	document.documentElement.classList.toggle("theme-dark", e.matches);
+}
+
+/**
+ * Toggle site wide theme.
+ * @param theme The theme to switch to.
+ * @param updateStore Should the store be updated to new theme?
+ * **If set to `false`, state should be manually updated.**
+ */
+export function toggleTheme(theme: Theme, updateStore = true) {
+	if (updateStore) {
+		store.appTheme = theme;
+	}
+
+	switch (theme) {
+		case "dark":
+			document.documentElement.classList.add("theme-dark");
+			break;
+		case "light":
+			document.documentElement.classList.remove("theme-dark");
+			break;
+		case "system":
+			document.documentElement.classList.toggle(
+				"theme-dark",
+				prefersDarkThemeQuery?.matches,
+			);
+			break;
+	}
+
+	if (prefersDarkThemeQuery) {
+		// Always remove first before adding to avoid cases
+		// where we add multiple events at same time.
+		prefersDarkThemeQuery.removeEventListener(
+			"change",
+			prefersDarkThemeChanged,
+		);
+		// If using system theme, add change listener (since
+		// system theme supports live updating when user
+		// preference changes on os or wherever).
+		if (theme === "system") {
+			prefersDarkThemeQuery.addEventListener("change", prefersDarkThemeChanged);
+		}
+	}
+}

src/routes/(app)/+layout.svelte

@@ -43,13 +43,25 @@
 
 	function handleSearch(ev: KeyboardEvent) {
 		if (
+			ev.key === "ContextMenu" ||
+			ev.key === "Home" ||
+			ev.key === "End" ||
+			ev.key === "PageDown" ||
+			ev.key === "PageUp" ||
+			ev.key === "NumLock" ||
+			ev.key === "Escape" ||
 			ev.key === "Tab" ||
 			ev.key === "CapsLock" ||
 			ev.key === "OS" ||
 			ev.key === "ArrowLeft" ||
 			ev.key === "ArrowRight" ||
 			ev.key === "ArrowUp" ||
-			ev.key === "ArrowDown"
+			ev.key === "ArrowDown" ||
+			ev.key === "Control" ||
+			ev.key === "Alt" ||
+			ev.key === "AltGraph" ||
+			ev.key === "Shift" ||
+			ev.key === "Meta"
 		)
 			return;
 		clearTimeout(searchTimeout);
@@ -162,6 +174,33 @@
 		scroll = window.scrollY;
 	}
 
+	function focusSearch() {
+		try {
+			if (!mainSearchEl) {
+				console.warn("focusSearch: mainSearchEl not defined!");
+				return;
+			}
+			if (document.activeElement === mainSearchEl) {
+				console.debug("focusSearch: mainSearchEl is already focused.");
+				return;
+			}
+			mainSearchEl.focus();
+		} catch (err) {
+			console.error("focusSearch: Failed!", err);
+		}
+	}
+
+	function handleGlobalKeybind(ev: KeyboardEvent) {
+		switch (ev.key.toLowerCase()) {
+			case "s":
+				if (ev.ctrlKey) {
+					ev.preventDefault();
+					focusSearch();
+				}
+				break;
+		}
+	}
+
 	afterNavigate(() => {
 		decideOnNavSplit();
 		closeAllSubMenus();
@@ -172,10 +211,12 @@
 			decideOnNavSplit();
 			window.addEventListener("resize", decideOnNavSplit);
 			window.document.addEventListener("scroll", docOnScroll);
+			window.document.addEventListener("keydown", handleGlobalKeybind);
 
 			return () => {
 				window.removeEventListener("resize", decideOnNavSplit);
 				window.document.removeEventListener("scroll", docOnScroll);
+				window.document.removeEventListener("keydown", handleGlobalKeybind);
 			};
 		} else {
 			console.error(

src/routes/(app)/import/+page.svelte

@@ -430,7 +430,7 @@
 			// Build toImport array
 			const toImport: ImportedList[] = [];
 			const fileText = await readFile(new FileReader(), file);
-			const jsonData = JSON.parse(fileText)["media"] as any[];
+			const jsonData = JSON.parse(fileText)["metadata"] as any[];
 			for (const v of jsonData) {
 				if (
 					!v.source_id ||
@@ -491,11 +491,9 @@
 							? v.reviews[0].review?.text
 							: "",
 
-					// Ryot does not support overall rating for shows
-					rating:
-						v.lot === "movie" && v.reviews?.length
-							? validifyRating(Number(v.reviews[0].rating))
-							: undefined,
+					rating: v.reviews?.length
+						? validifyRating(Number(v.reviews[0].rating))
+						: undefined,
 
 					datesWatched:
 						v.lot === "movie" && v.seen_history?.length

src/routes/(app)/import/process/+page.svelte

@@ -1,4 +1,4 @@
-<!-- 
+<!--
   /import/process is for processing the
   selected files data. Here it will be
   displayed and imported.
@@ -166,17 +166,33 @@
 						if (year) {
 							l.year = String(year.getFullYear());
 						}
-						if (type === "movie") {
-							l.type = "movie";
-						} else if (type === "tv series") {
-							l.type = "tv";
-						} else if (type === "tv episode") {
-							l.type = "tv_episode";
-						} else {
-							console.warn("Skipping item with invalid type", `(${type})`, el);
-							anySkipped = true;
-							continue;
+
+						switch (type) {
+							case "movie":
+							case "video":
+							case "tv movie":
+							case "short":
+								l.type = "movie";
+								break;
+							case "tv series":
+							case "tv mini series":
+							case "tv special":
+							case "tv short":
+								l.type = "tv";
+								break;
+							case "tv episode":
+								l.type = "tv_episode";
+								break;
+							default:
+								console.warn(
+									"Skipping item with invalid type",
+									`(${type})`,
+									el,
+								);
+								anySkipped = true;
+								continue;
 						}
+
 						if (imdbId) {
 							l.imdbId = imdbId;
 						}
@@ -709,7 +725,9 @@
 	{#if importMultiItem}
 		<Modal
 			title="Multiple Results Found"
-			desc="Select the correct item for {importMultiItem.original.name}"
+			desc="Select the correct item for {importMultiItem.original
+				.name} {importMultiItem.original.year &&
+				'(' + importMultiItem.original.year + ')'}"
 			onClose={() => {
 				importMultiItem?.callback("closed results modal");
 				importMultiItem = undefined;

src/routes/(app)/profile/+page.svelte

@@ -7,11 +7,7 @@
 	import Stat from "@/lib/stats/Stat.svelte";
 	import Stats from "@/lib/stats/Stats.svelte";
 	import { updateUserSetting } from "@/lib/util/api";
-	import {
-		getOrdinalSuffix,
-		monthsShort,
-		toggleTheme,
-	} from "@/lib/util/helpers";
+	import { getOrdinalSuffix, monthsShort } from "@/lib/util/helpers";
 	import { store } from "@/store.svelte";
 	import { UserType, type Image, type Profile } from "@/types";
 	import axios from "axios";
@@ -21,6 +17,7 @@
 	import SyncModal from "./modals/SyncModal.svelte";
 	import RegionDropDown from "@/lib/RegionDropDown.svelte";
 	import RatingSetting from "@/lib/rating/RatingSetting.svelte";
+	import { toggleTheme } from "@/lib/util/theme";
 
 	let user = $derived(store.userInfo);
 	let settings = $derived(store.userSettings);
@@ -218,6 +215,13 @@
 			<div class="theme">
 				<h4 class="norm">Theme</h4>
 				<div class="row">
+					<button
+						class={`plain${selectedTheme === "system" ? " selected" : ""}`}
+						id="system"
+						onclick={() => toggleTheme("system")}
+					>
+						<span>system</span>
+					</button>
 					<button
 						class={`plain${selectedTheme === "light" ? " selected" : ""}`}
 						id="light"
@@ -504,6 +508,20 @@
 					}
 				}
 
+				&#system {
+					background: linear-gradient(to right bottom, white 50%, black 50.3%);
+					outline-color: black;
+
+					span {
+						mix-blend-mode: difference;
+					}
+
+					&:hover {
+						color: white;
+						-webkit-text-stroke: 0.5px white;
+					}
+				}
+
 				&.selected {
 					outline-color: gold !important;
 				}

src/store.svelte.ts

@@ -12,7 +12,7 @@ import type {
 } from "./types";
 import type { Notification } from "./lib/util/notify";
 import { browser } from "$app/environment";
-import { toggleTheme } from "./lib/util/helpers";
+import { toggleTheme } from "./lib/util/theme";
 
 export const defaultSort = ["DATEADDED", "DOWN"];
 
@@ -54,7 +54,7 @@ const _store: Store = $state({
 	notifications: [],
 	activeSort: defaultSort,
 	activeFilters: { type: [], status: [] },
-	appTheme: "light",
+	appTheme: "system",
 	importedList: undefined,
 	parsedImportedList: undefined,
 	searchQuery: "",
@@ -186,7 +186,7 @@ export const clearAllStores = () => {
 	store.watchedList = [];
 	store.notifications = [];
 	store.activeSort = defaultSort;
-	store.appTheme = "light";
+	store.appTheme = "system";
 	store.importedList = undefined;
 	store.parsedImportedList = undefined;
 	store.searchQuery = "";
@@ -244,10 +244,7 @@ function rehydrateStore() {
 			$state.snapshot(store.appTheme),
 		);
 	} else {
-		let defTheme: Theme = "light";
-		if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
-			defTheme = "dark";
-		}
+		let defTheme: Theme = "system";
 		_store.appTheme = defTheme;
 		toggleTheme(defTheme, false);
 		console.debug(

src/types.ts

@@ -63,7 +63,7 @@ export type Icon =
 	| "tmdb"
 	| "igdb";
 
-export type Theme = "light" | "dark";
+export type Theme = "light" | "dark" | "system";
 
 export type WLDetailedViewOption =
 	| "statusRating"