Commit Graph
758 Commits
Author SHA1 Message Date
tcely 5e5d011b64 Add parser directives
This hopefully helps anyone building on an older docker, such as Debian / Ubuntu packaged versions.
2025-01-12 00:49:19 -05:00
tcely 4364ebbff3 Multi-stage docker build for ffmpeg & s6-overlay
* Create a s6-overlay-extracted stage to copy from

This was largely inspired by: @socheatsok78

Our downloaded files are checked where that version doesn't do any verification of the downloads.

* Update ffmpeg to the first build with checksums.sha256

* Create a ffmpeg-extracted stage to copy from

* Don't preserve ownership from the builder

I was sick of the extra work with ffmpeg builds.

So, I managed to get sums generated for those builds and now we don't need to manually fill out SHA256 hashes anymore.

Now to bump ffmpeg, we can just change the date.
2025-01-11 11:53:10 -05:00
meeb b829b233f8 Merge pull request #615 from tcely/patch-5
Test and log ffmpeg version output earlier
2025-01-10 02:20:47 +11:00
meeb ee5f611592 Merge pull request #614 from tcely/patch-4
Make better use of CPU cache with nginx
2025-01-10 02:19:49 +11:00
meeb 1b1fc67984 Merge pull request #613 from tcely/patch-1
exec nginx so bash isn't still running
2025-01-10 02:18:13 +11:00
tcely 7b42213bbb Keep curl and add less
These are very useful when using the shell inside the container and don't use much space.
2025-01-08 00:36:37 -05:00
tcely f0b7d31949 Test and log ffmpeg version output earlier
Running the ffmpeg in an earlier (hopefully cached) layer should clean up the logs a bit.

On a related note, shadowing the environment variable was causing some confusing log output, so stop doing that as well.
2025-01-08 00:31:30 -05:00
tcely ab5e63f643 Make better use of CPU cache with nginx 2025-01-08 00:12:21 -05:00
tcely 6e116899a7 We don't need to keep bash running 2025-01-07 23:45:25 -05:00
meeb f6e557f502 Merge pull request #611 from tcely/patch-1
Don't chmod a+r when it already has those permissions
2025-01-07 16:41:35 +11:00
tcely 215aa64f2d Change to a logged warning for NFO permission problems 2025-01-06 10:35:37 -05:00
tcely e64f71a970 Don't chmod a+r when it already has those permissions 2025-01-06 10:23:17 -05:00
meeb 25bc6143e0 Merge pull request #610 from tcely/patch-1
Match another variation of the message
2025-01-03 01:48:43 +11:00
tcely 59865a885b Match another variation of the message
```
{key}: This video is available to this channel's members on level: Level 2: Contributor (or any higher level). Join this YouTube channel from your computer or Android app.
```
2025-01-02 02:39:19 -05:00
meeb e2f2a7bb49 Merge pull request #595 from tcely/patch-7
Do not try to skip already skipped media
2024-12-26 12:56:40 +11:00
meeb b40564ff93 Merge pull request #596 from tcely/patch-8
Reduce image size and keep pycache in a volume
2024-12-26 12:44:42 +11:00
meeb 4248824332 Merge pull request #599 from tcely/patch-4
Fix paths for when filename includes sub-directories
2024-12-26 12:43:16 +11:00
meeb 3b3203c7f1 Merge pull request #591 from tcely/patch-5
Handle raise_no_formats exception
2024-12-26 12:42:10 +11:00
meeb 76ac432e53 Merge pull request #593 from RichardHyde/handle_member_only_videos
Handle download_media_metadata task failures
2024-12-26 12:40:45 +11:00
meeb 417675c1ea Merge pull request #597 from tcely/patch-1
Update ci.yaml
2024-12-26 12:30:53 +11:00
meeb 083467296e Merge pull request #601 from tcely/patch-9
Only log new media
2024-12-26 12:29:26 +11:00
tcely d74e6bf2ca Avoid the unlikely possibility of None comparison 2024-12-25 20:16:07 -05:00
meeb 5774e6dfc6 Merge pull request #604 from tcely/patch-12
Use title from DB
2024-12-26 12:05:46 +11:00
meeb e38709809e Merge pull request #606 from tcely/patch-15
Made messages more human friendly
2024-12-26 11:59:53 +11:00
meeb 37b303ecec Merge pull request #605 from tcely/patch-14
Cleanup removed media that has not been downloaded too
2024-12-26 11:59:12 +11:00
meeb c08619cd87 Merge pull request #602 from tcely/patch-10
Remove duplicated ' to:'
2024-12-26 11:57:30 +11:00
meeb 2591e384b4 Merge pull request #600 from tcely/patch-6
Do not log download progress lines by default
2024-12-26 11:56:59 +11:00
meeb 51738afe71 Merge pull request #607 from tcely/patch-16
Bump yt_dlp & ffmpeg
2024-12-26 11:41:37 +11:00
tcely 942452c6a2 Skip media without any formats 2024-12-25 10:53:25 -05:00
tcely 568698351d Use the N version of ffmpeg 2024-12-25 05:23:53 -05:00
tcely 3cea9270a0 Bump ffmpeg 2024-12-25 05:09:30 -05:00
tcely 8def84c7b4 Use filename_path
It's more directly what we want here.

If `filepath` ever changed to not use `filename` the value would be incorrect, so this is the cleaner way to display this value.
2024-12-25 01:17:04 -05:00
tcely 7343e39f35 Verbose output is no longer needed
I confirmed that the changes reduced the amount of files being removed.
2024-12-25 00:32:03 -05:00
tcely 0795eb951d Consistency fixes
The `filepath` variable is defined before the `if` and used throughout the first block, so we should use it in the `else` block too.

Otherwise, a change to that variable would change the first block but not the second block.
2024-12-25 00:21:58 -05:00
tcely 6c4d31765a Made messages more human friendly 2024-12-25 00:16:18 -05:00
tcely 01f0d82788 Cleanup removed media that has not been downloaded too 2024-12-25 00:07:57 -05:00
tcely 99899aac9c Use title from DB
We stored a stripped title string in the database, just use that instead of `.name` and calling `.strip()` again.
2024-12-23 20:13:56 -05:00
tcely 3b41c8df81 Remove duplicated ' to:' 2024-12-23 16:55:26 -05:00
tcely 2799d95119 Only log new media
Channels with thousands of videos, that won't be downloaded, create large blocks in the logs without this.
2024-12-23 10:17:58 -05:00
tcely b19614cc9f Do not log download progress lines by default
When you set debugging, the default progress output can be viewed and/or logged, depending on the other options.
2024-12-23 01:28:46 -05:00
tcely 67b4995448 Remove manual_skip check 2024-12-22 16:16:06 -05:00
tcely d1c6236b9d Display the location the media was actually saved to 2024-12-22 11:54:56 -05:00
tcely 8a04139da9 Add data items to make comparison easier 2024-12-22 11:46:29 -05:00
tcely 495f62f25a Display only the name part
`media.filename` is a `str`
`media.filepath` is a `Path`

The second has a simple way to remove directories, so use that instead of any custom string manipulation.
2024-12-22 11:14:32 -05:00
tcely 20527aa3c2 Update tests to not expect strings 2024-12-22 10:26:41 -05:00
tcely 8ebb333ea3 directory_path should be a Path, not str 2024-12-22 10:09:16 -05:00
tcely 4bbdfd2f24 Fix paths for when filename includes sub-directories 2024-12-22 09:44:27 -05:00
tcely a1248be4ae Update ci.yaml
Python `3.13` is not expected to work until Django `5.1` and we are currently using `3.2`, so that's not worth testing.

More info: https://code.djangoproject.com/ticket/34900
2024-12-22 05:33:08 -05:00
tcely 256f3254d9 Quote Python versions in ci.yaml 2024-12-22 05:21:28 -05:00
tcely 7c77ed1d78 Update ci.yaml
We can keep testing with Python `3.7` by using `ubuntu-22.04` instead of `ubuntu-latest` according to the `setup-python` issue.

More info: https://github.com/actions/setup-python/issues/962
2024-12-22 04:48:53 -05:00