danvics/ytptube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

renamed presets and added optimized preset for mobile devices.

Browse source
This commit is contained in:
arabcoders 2025-06-28 20:15:29 +03:00
parent 4f7da0b125
commit ffefc3d9af
3 changed files with 45 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.vscode/settings.json vendored
View file

@ -30,6 +30,7 @@
"edgechromium",
"engineio",
"euuo",
"faststart",
"finaldir",
"flac",
"forcejson",
@ -52,6 +53,7 @@
"Microformat",
"microformats",
"mkvtoolsnix",
"movflags",
"mpegts",
"msvideo",
"muxdelay",
@ -73,6 +75,7 @@
"qtpy",
"quicktime",
"rejecttitle",
"remux",
"rtime",
"smhd",
"socketio",

29
app/library/Presets.py
View file

@ -20,34 +20,39 @@ DEFAULT_PRESETS: list[dict[int, dict[str, str | bool]]] = [
"id": "3e163c6c-64eb-4448-924f-814b629b3810",
"name": "default",
"default": True,
"description": "Default preset for yt-dlp. It will download whatever yt-dlp decides is the best quality for the video and audio.",
},
{
"id": "5bf9c42b-8852-468a-99f5-915622dfba25",
"name": "Best video and audio",
"cli": "--format 'bv+ba/b'",
"id": "441675ed-b739-40f0-a0b0-1ecfcb9dc48d",
"name": "Mobile",
"cli": '-t mp4 --merge-output-format mp4 --add-chapters --remux-video mp4 \n--embed-metadata --embed-thumbnail \n--postprocessor-args "-movflags +faststart"',
"default": True,
"description": "This preset is designed for mobile devices. It will download the best quality video and audio in mp4 format, merge them, and add chapters, metadata, and thumbnail.",
},
{
"id": "441675ed-b739-40f0-a0b0-1ecfcb9dc48b",
"name": "1080p H264/m4a or best available",
"name": "1080p",
"cli": "-S vcodec:h264 --format 'bv[height<=1080][ext=mp4]+ba[ext=m4a]/b[ext=mp4]/b[ext=webm]'",
"default": True,
"description": "Download the best quality video and audio in mp4 format for 1080p resolution.",
},
{
"id": "9719fcc3-4cf2-4d88-b1e4-74dff3dba00e",
"name": "720p h264/m4a or best available",
"name": "720p",
"cli": "-S vcodec:h264 --format 'bv[height<=720][ext=mp4]+ba[ext=m4a]/b[ext=mp4]/b[ext=webm]'",
"default": True,
"description": "Download the best quality video and audio in mp4 format for 720p resolution.",
},
{
"id": "a6fd4b25-2b3e-458d-bb57-b75e41cc4330",
"name": "Audio only",
"name": "Audio Only",
"cli": "--extract-audio --add-chapters --embed-metadata --embed-thumbnail --format 'bestaudio/best'",
"default": True,
"description": "This preset is designed to download only the audio of the video. It will extract the audio, add chapters, metadata, and thumbnail.",
},
{
"id": "2ade2c28-cad4-4a06-b7eb-2439fdf46f60",
"name": "yt-dlp info reader plugin",
"name": "Info Reader Plugin",
"description": 'This preset generate specific filename format and metadata to work with yt-dlp info reader plugins for jellyfin/emby and plex and to make play state sync work for WatchState.\n\nThere is one more step you need to do via Other > Terminal if you have it enabled or directly from container shell\n\nyt-dlp -I0 --write-info-json --write-thumbnail --convert-thumbnails jpg --paths /downloads/youtube -o "%(channel|Unknown_title)s [%(channel_id|Unknown_id)s]/%(title).180B [%(channel_id|Unknown_id)s].%(ext)s" -- https://www.youtube.com/channel/UCClfFsWcT3N2I7VTXXyt84A\n\nChange the url to the channel you want to download.\n\nFor more information please visit \nhttps://github.com/arabcoders/watchstate/blob/master/FAQ.md#how-to-get-watchstate-working-with-youtube-contentlibrary',
"folder": "youtube",
"template": "%(channel)s %(channel_id|Unknown_id)s/Season %(release_date>%Y,upload_date>%Y|Unknown)s/%(release_date>%Y%m%d,upload_date>%Y%m%d)s - %(title).180B [%(extractor)s-%(id)s].%(ext)s",
@ -104,14 +109,16 @@ class Presets(metaclass=Singleton):
_instance = None
"""The instance of the class."""
_config: Config = None
_default: list[Preset] = []
def __init__(self, file: str | Path | None = None, config: Config | None = None):
Presets._instance = self
config = config or Config.get_instance()
self._config = config or Config.get_instance()
self._file: Path = Path(file) if file else Path(config.config_path).joinpath("presets.json")
self._file: Path = Path(file) if file else Path(self._config.config_path).joinpath("presets.json")
if self._file.exists() and "600" != self._file.stat().st_mode:
try:
@ -163,6 +170,10 @@ class Presets(metaclass=Singleton):
"""
self.load()
if not self.get(self._config.default_preset):
LOG.error(f"Default preset '{self._config.default_preset}' not found, using 'default' preset.")
self._config.default_preset = "default"
def get_all(self) -> list[Preset]:
"""Return the items."""
return self._default + self._items

29
ui/components/NewDownload.vue
View file

@ -76,16 +76,16 @@
<span>Opts</span>
</button>
</div>
</div>
<div class="column is-12" v-if="get_preset(form.preset)?.description">
<div class="is-overflow-auto" style="max-height: 150px;">
<div class="is-ellipsis is-clickable" @click="expand_description">
<span class="icon"><i class="fa-solid fa-info" /></span> {{ get_preset(form.preset)?.description }}
<div class="column is-12" v-if="!hasFormatInConfig && get_preset(form.preset)?.description">
<div class="is-overflow-auto" style="max-height: 150px;">
<div class="is-ellipsis is-clickable" @click="expand_description">
<span class="icon"><i class="fa-solid fa-info" /></span> {{ get_preset(form.preset)?.description }}
</div>
</div>
</div>
</div>
<div class="columns is-multiline is-mobile" v-if="showAdvanced && !config.app.basic_mode">
<div class="columns is-multiline is-mobile" v-if="showAdvanced && !config.app.basic_mode">
<div class="column is-4-tablet is-12-mobile" v-if="!config.app.basic_mode">
<div class="field">
<label class="label is-inline is-unselectable">
@ -382,6 +382,18 @@ const convertOptions = async args => {
return null;
}
onUpdated(async () => {
await nextTick()
if ('' === form.value?.preset) {
form.value.preset = config.app.default_preset
}
if (form.value?.preset && !config.presets.some(p => p.name === form.value.preset)) {
form.value.preset = config.app.default_preset
}
})
onMounted(async () => {
await nextTick()
@ -389,6 +401,10 @@ onMounted(async () => {
form.value.preset = config.app.default_preset
}
if (form.value?.preset && !config.presets.some(p => p.name === form.value.preset)) {
form.value.preset = config.app.default_preset
}
if (props?.item) {
Object.keys(props.item).forEach(key => {
if (key in form.value) {
@ -419,7 +435,6 @@ const filter_presets = (flag = true) => config.presets.filter(item => item.defau
const get_preset = name => config.presets.find(item => item.name === name)
const expand_description = e => toggleClass(e.target, ['is-ellipsis', 'is-pre-wrap'])
const removeFromArchive = async url => {
try {
const req = await request(`/api/archive/0`, {