aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/src/cache.rs5
-rw-r--r--base/src/permission.rs5
-rw-r--r--base/src/temp.rs5
-rw-r--r--common/src/jhls.rs5
-rw-r--r--common/src/user.rs5
-rw-r--r--matroska/src/error.rs5
-rw-r--r--remuxer/src/extract.rs5
-rw-r--r--server/src/routes/progress.rs5
-rw-r--r--server/src/routes/ui/node.rs9
-rw-r--r--stream/src/jhls.rs5
-rw-r--r--stream/src/webvtt.rs5
-rw-r--r--tool/src/import/tmdb.rs4
-rw-r--r--transcoder/src/image.rs5
-rw-r--r--transcoder/src/subtitles.rs5
-rw-r--r--web/script/backbutton.ts5
-rw-r--r--web/script/player/download.ts5
-rw-r--r--web/script/player/jhls.d.ts5
-rw-r--r--web/script/player/mediacaps.ts5
-rw-r--r--web/script/player/player.ts5
-rw-r--r--web/script/player/popup.ts5
-rw-r--r--web/script/player/profiles.ts5
-rw-r--r--web/script/player/track.ts5
-rw-r--r--web/style/js-transition.css5
-rw-r--r--web/style/navbar.css5
-rw-r--r--web/style/props.css5
-rw-r--r--web/style/themes.css5
26 files changed, 128 insertions, 5 deletions
diff --git a/base/src/cache.rs b/base/src/cache.rs
index 86c2379..d2d7990 100644
--- a/base/src/cache.rs
+++ b/base/src/cache.rs
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
use crate::{AssetLocationExt, CONF};
use anyhow::{anyhow, Context};
use base64::Engine;
diff --git a/base/src/permission.rs b/base/src/permission.rs
index 275fe92..a5a40ce 100644
--- a/base/src/permission.rs
+++ b/base/src/permission.rs
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
use crate::CONF;
use anyhow::anyhow;
use jellycommon::{
diff --git a/base/src/temp.rs b/base/src/temp.rs
index 90ee6a8..8da85f7 100644
--- a/base/src/temp.rs
+++ b/base/src/temp.rs
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
use anyhow::Context;
use jellycommon::AssetLocation;
use std::{fs::File, sync::atomic::AtomicUsize};
diff --git a/common/src/jhls.rs b/common/src/jhls.rs
index fe3ffa0..eadf9a2 100644
--- a/common/src/jhls.rs
+++ b/common/src/jhls.rs
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
use crate::SourceTrack;
use serde::{Deserialize, Serialize};
use std::ops::Range;
diff --git a/common/src/user.rs b/common/src/user.rs
index 1ae849c..466423c 100644
--- a/common/src/user.rs
+++ b/common/src/user.rs
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
use crate::{stream::StreamFormat, user};
#[cfg(feature = "rocket")]
use rocket::{FromFormField, UriDisplayQuery};
diff --git a/matroska/src/error.rs b/matroska/src/error.rs
index 02e487d..e8f7c28 100644
--- a/matroska/src/error.rs
+++ b/matroska/src/error.rs
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
use thiserror::Error;
#[derive(Debug, Error)]
diff --git a/remuxer/src/extract.rs b/remuxer/src/extract.rs
index 6bd7b59..a948b49 100644
--- a/remuxer/src/extract.rs
+++ b/remuxer/src/extract.rs
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
use crate::seek_index::get_seek_index;
use anyhow::{anyhow, bail};
use jellycommon::LocalTrack;
diff --git a/server/src/routes/progress.rs b/server/src/routes/progress.rs
index 0ba5b31..c4eb182 100644
--- a/server/src/routes/progress.rs
+++ b/server/src/routes/progress.rs
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
use super::ui::{account::session::Session, error::MyResult};
use crate::routes::ui::node::rocket_uri_macro_r_library_node;
use anyhow::anyhow;
diff --git a/server/src/routes/ui/node.rs b/server/src/routes/ui/node.rs
index fbbf012..6e2f532 100644
--- a/server/src/routes/ui/node.rs
+++ b/server/src/routes/ui/node.rs
@@ -215,6 +215,7 @@ pub fn format_duration(mut d: f64) -> String {
let mut s = String::new();
for (unit, k) in [("h", 60. * 60.), ("m", 60.), ("s", 1.)] {
let mut h = 0;
+ // TODO dont iterate like that. can be a simple rem and div
while d > k {
d -= k;
h += 1;
@@ -257,15 +258,17 @@ trait MediaInfoExt {
}
impl MediaInfoExt for MediaInfo {
fn resolution_name(&self) -> &'static str {
- let mut maxw = 0;
+ let mut maxdim = 0;
for t in &self.tracks {
match &t.kind {
- SourceTrackKind::Video { width, .. } => maxw = maxw.max(*width),
+ SourceTrackKind::Video { width, height, .. } => maxdim = maxdim.max(*width.max(height)),
_ => (),
}
}
- match maxw {
+ match maxdim {
+ 30720.. => "32K",
+ 15360.. => "16K",
7680.. => "8K",
3840.. => "4K",
2560.. => "WQHD",
diff --git a/stream/src/jhls.rs b/stream/src/jhls.rs
index 90dab63..5fe2cab 100644
--- a/stream/src/jhls.rs
+++ b/stream/src/jhls.rs
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
use anyhow::Result;
use jellybase::{permission::PermissionSetExt, CONF};
use jellycommon::{
diff --git a/stream/src/webvtt.rs b/stream/src/webvtt.rs
index 246b1ed..6ee5212 100644
--- a/stream/src/webvtt.rs
+++ b/stream/src/webvtt.rs
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
use anyhow::{anyhow, bail, Context, Result};
use jellybase::CONF;
use jellycommon::{stream::StreamSpec, LocalTrack, Node};
diff --git a/tool/src/import/tmdb.rs b/tool/src/import/tmdb.rs
index 38d6534..c38d50e 100644
--- a/tool/src/import/tmdb.rs
+++ b/tool/src/import/tmdb.rs
@@ -1,10 +1,10 @@
-use anyhow::Context;
-use jellycommon::chrono::{format::Parsed, DateTime, Utc};
/*
This file is part of jellything (https://codeberg.org/metamuffin/jellything)
which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
Copyright (C) 2023 metamuffin <metamuffin.org>
*/
+use anyhow::Context;
+use jellycommon::chrono::{format::Parsed, DateTime, Utc};
use log::info;
use serde::Deserialize;
use std::io::Write;
diff --git a/transcoder/src/image.rs b/transcoder/src/image.rs
index e1ba9b0..5df21a9 100644
--- a/transcoder/src/image.rs
+++ b/transcoder/src/image.rs
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
use crate::LOCAL_IMAGE_TRANSCODING_TASKS;
use anyhow::Context;
use image::imageops::FilterType;
diff --git a/transcoder/src/subtitles.rs b/transcoder/src/subtitles.rs
index 27e01cc..61f8cbc 100644
--- a/transcoder/src/subtitles.rs
+++ b/transcoder/src/subtitles.rs
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
use anyhow::anyhow;
use std::fmt::Write;
diff --git a/web/script/backbutton.ts b/web/script/backbutton.ts
index 3e62165..3b11c2a 100644
--- a/web/script/backbutton.ts
+++ b/web/script/backbutton.ts
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
import { e } from "./jshelper/mod.ts";
globalThis.addEventListener("DOMContentLoaded", () => {
diff --git a/web/script/player/download.ts b/web/script/player/download.ts
index 1799070..2c3b104 100644
--- a/web/script/player/download.ts
+++ b/web/script/player/download.ts
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
import { OVar } from "../jshelper/mod.ts";
interface Measurement { time: number, duration: number, size: number }
diff --git a/web/script/player/jhls.d.ts b/web/script/player/jhls.d.ts
index b38f1b1..e1948ca 100644
--- a/web/script/player/jhls.d.ts
+++ b/web/script/player/jhls.d.ts
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
export interface TimeRange { start: number, end: number }
export interface JhlsMetadata {
diff --git a/web/script/player/mediacaps.ts b/web/script/player/mediacaps.ts
index dca5c53..357c813 100644
--- a/web/script/player/mediacaps.ts
+++ b/web/script/player/mediacaps.ts
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
import { EncodingProfile, SourceTrack, SourceTrackKind } from "./jhls.d.ts";
const cache = new Map<string, boolean>()
diff --git a/web/script/player/player.ts b/web/script/player/player.ts
index c87ae8f..c07fa37 100644
--- a/web/script/player/player.ts
+++ b/web/script/player/player.ts
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
import { OVar, e } from "../jshelper/mod.ts";
import { JhlsMetadata, JhlsTrack, TimeRange } from "./jhls.d.ts";
import { SegmentDownloader } from "./download.ts";
diff --git a/web/script/player/popup.ts b/web/script/player/popup.ts
index 39b5b0f..394f572 100644
--- a/web/script/player/popup.ts
+++ b/web/script/player/popup.ts
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
export class Popup {
trigger_hov = false
diff --git a/web/script/player/profiles.ts b/web/script/player/profiles.ts
index 27c8474..9284ec5 100644
--- a/web/script/player/profiles.ts
+++ b/web/script/player/profiles.ts
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
import { OVar } from "../jshelper/mod.ts";
import { EncodingProfile, JhlsMetadata } from "./jhls.d.ts";
import { profile_to_partial_track, test_media_capability } from "./mediacaps.ts";
diff --git a/web/script/player/track.ts b/web/script/player/track.ts
index c7d90da..e95ba85 100644
--- a/web/script/player/track.ts
+++ b/web/script/player/track.ts
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
import { SourceTrack, TimeRange } from "./jhls.d.ts";
import { OVar } from "../jshelper/mod.ts";
import { JhlsTrack } from "./jhls.d.ts";
diff --git a/web/style/js-transition.css b/web/style/js-transition.css
index 154cd1f..6de9005 100644
--- a/web/style/js-transition.css
+++ b/web/style/js-transition.css
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
@keyframes jst-fadein {
from {
background-color: transparent;
diff --git a/web/style/navbar.css b/web/style/navbar.css
index 5df2f5c..9619532 100644
--- a/web/style/navbar.css
+++ b/web/style/navbar.css
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
nav {
user-select: none;
z-index: 90;
diff --git a/web/style/props.css b/web/style/props.css
index 5f314e3..c9c194a 100644
--- a/web/style/props.css
+++ b/web/style/props.css
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
.props p {
margin: 0.4em;
diff --git a/web/style/themes.css b/web/style/themes.css
index 462fd65..e3d210c 100644
--- a/web/style/themes.css
+++ b/web/style/themes.css
@@ -1,3 +1,8 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2023 metamuffin <metamuffin.org>
+*/
body {
--video-brackground: black;
}
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-10-08 13:29:59 +0000