diff options
| -rw-r--r-- | doc/SUMMARY.md | 1 | ||||
| -rw-r--r-- | doc/book.toml | 2 | ||||
| -rw-r--r-- | doc/getting-started/installation.md | 6 | ||||
| -rw-r--r-- | doc/getting-started/launch.md | 4 | ||||
| -rw-r--r-- | doc/getting-started/setup.md | 6 | ||||
| -rw-r--r-- | doc/import.md | 1 | ||||
| -rw-r--r-- | doc/migration.md | 42 | ||||
| -rw-r--r-- | server/src/ui/home.rs | 9 | ||||
| -rw-r--r-- | stream/src/stream_info.rs | 12 | ||||
| -rw-r--r-- | ui/client-style/src/node_card.css | 3 |
10 files changed, 29 insertions, 57 deletions
diff --git a/doc/SUMMARY.md b/doc/SUMMARY.md index c9fe850..2c7aba8 100644 --- a/doc/SUMMARY.md +++ b/doc/SUMMARY.md @@ -6,7 +6,6 @@ - [Installation](getting-started/installation.md) - [Setup](getting-started/setup.md) - [Launch](getting-started/launch.md) -- [Migrating the Database](migration.md) - [Paths](paths.md) - [Imports](import.md) - [API](api.md) diff --git a/doc/book.toml b/doc/book.toml index 934ad8f..daeb26f 100644 --- a/doc/book.toml +++ b/doc/book.toml @@ -1,5 +1,5 @@ [book] -title = "Jellything Administrator Manual" +title = "Jellything Manual" src = "." [build] diff --git a/doc/getting-started/installation.md b/doc/getting-started/installation.md index 5768a0a..9af212f 100644 --- a/doc/getting-started/installation.md +++ b/doc/getting-started/installation.md @@ -5,6 +5,10 @@ This is the recommended option. It will also install a systemd service and system user for that service. +``` +paru -S jellything-git +``` + ```sh git clone https://aur.archlinux.org/jellything-git.git cd jellything-git @@ -25,7 +29,7 @@ Requirements: - ffmpeg (only if you use transcoding) Jellything was only tested for `x86_64-unknown-linux-gnu` and -`aarch64-unknown-linux-gnu` targetss. Others _probably_ work too. +`aarch64-unknown-linux-gnu` platforms; others likely work too. ```sh git clone --recursive https://codeberg.org/metamuffin/jellything.git diff --git a/doc/getting-started/launch.md b/doc/getting-started/launch.md index 6064348..eb918eb 100644 --- a/doc/getting-started/launch.md +++ b/doc/getting-started/launch.md @@ -1,4 +1,4 @@ -# Launch your Platform +# Launch > [!TIP] > If you used the AUR package, this should be as simple as @@ -21,5 +21,5 @@ stderr can be configured with the `LOG` variable and env_logger syntax. ## Initial import -Next log in with the admin accound and visit `/admin/dashboard` to run an +Next log in with the admin account and visit `/admin/dashboard` to run an initial import. diff --git a/doc/getting-started/setup.md b/doc/getting-started/setup.md index d899384..0d5ffc6 100644 --- a/doc/getting-started/setup.md +++ b/doc/getting-started/setup.md @@ -1,9 +1,9 @@ # Setup -## 1. Writing configurations +## 1. Update config file -First write your configuration files whereever you want. The AUR package uses -`/etc/jellything.yaml`. +First customize the configuration file. The AUR package uses +`/etc/jellything.yaml`; if installed manually, the path doesn't matter. ```yaml # This hostname must be identical to how other instances reach you. diff --git a/doc/import.md b/doc/import.md index 1f8088a..ef3d3fe 100644 --- a/doc/import.md +++ b/doc/import.md @@ -1,4 +1,3 @@ # Jellything's Import System In normal operation, jellything serves all metadata from only the database. - diff --git a/doc/migration.md b/doc/migration.md deleted file mode 100644 index 000072a..0000000 --- a/doc/migration.md +++ /dev/null @@ -1,42 +0,0 @@ -# Migrating the Database - -> [!CAUTION] -> The current architecture for saving to the database will be completely -> rewritten soon. - -With some updates the database serialization for changes. This requires a -migration process. You need to follow this procedure either with every update. - -## 1. Export the database - -Use the `jellytool` of the previous version to export the database to JSON. - -```sh -mv /path/to/db /path/to/db.old # Rename the DB to avoid conflict later -jellytool.old migrate export /path/to/db.old export /tmp/jdb -``` - -## 2. Run migrations on the JSON dump - -> This is not implemented yet. It usually just works without anyway. - -## 3. Import the database - -Now import your library back to where it usually lives using the `jellytool` of -the current version. - -```sh -jellytool migrate export /path/to/db import /tmp/jdb -``` - -## 4. Delete old Databases - -Delete the old database and the JSON dump, they are not required anymore. - -> [!CAUTION] -> Confirm that everything still works and no data is lost before! - -``` -rm /path/to/db.old -rm -r /tmp/jdb -``` diff --git a/server/src/ui/home.rs b/server/src/ui/home.rs index 0fd4432..67e6e90 100644 --- a/server/src/ui/home.rs +++ b/server/src/ui/home.rs @@ -61,6 +61,15 @@ pub fn r_home(ri: RequestInfo<'_>) -> MyResult<UiResponse> { )? .as_object(), ); + page.push( + VIEW_NODE_LIST, + home_row_highlight( + &ri, + "home.bin.daily_random", + "FILTER (visi = visi AND kind = show) SORT RANDOM", + )? + .as_object(), + ); Ok(ri.respond_ui(page.finish())) } diff --git a/stream/src/stream_info.rs b/stream/src/stream_info.rs index 694a44f..3312c71 100644 --- a/stream/src/stream_info.rs +++ b/stream/src/stream_info.rs @@ -90,12 +90,12 @@ fn stream_formats(config: &Config, t: &TrackEntry, remux_bitrate: f64) -> Vec<St let sw = t.video.as_ref().unwrap().pixel_width; let sh = t.video.as_ref().unwrap().pixel_height; for (w, br) in [ - (3840, 6000e3), - (1920, 5000e3), - (1920, 2000e3), - (1280, 1500e3), - (640, 800e3), - (320, 200e3), + (3840, 6e6), + (1920, 5e6), + (1920, 2e6), + (1280, 1.5e6), + (640, 0.8e6), + (320, 0.2e6), ] { if w > sw { continue; diff --git a/ui/client-style/src/node_card.css b/ui/client-style/src/node_card.css index 43c3898..8148845 100644 --- a/ui/client-style/src/node_card.css +++ b/ui/client-style/src/node_card.css @@ -158,6 +158,9 @@ transparent 100% ); } +.card.highlight .overview { + flex-grow: 1; +} .card.highlight .overview h2 { margin-bottom: 0em; } |