59 Commits

Author SHA1 Message Date
rlaphoenix
61270d3af4 Fix expired check in some cases in Cacher class
It seems if a service sets the expiration time in seconds or by a timestamp, then this resolves as expired up to 14 hrs too early, or 14 hours too late, depending on what your timezone is relative to UTC+00:00.

However, I haven't fully confirmed if this is the right fix to make. As in, I'm not sure if changing datetime.utcnow() to datetime.now() should be done, or the other way around. However, I've had multiple people tell me changing it this way worked for them so I'm just going to roll with it.
2023-02-21 06:13:02 +00:00
rlaphoenix
42aaa03941 Completely rewrite downloading system
The new system now downloads and decrypts segments individually instead of downloading all segments, merging them, and then decrypting. Overall the download system now acts more like a normal player.

This fixes #23 as the new HLS download system detects changes in keys and init segments as segments are downloaded. DASH still only supports one period, and one period only, but hopefully I can change that in the future.

Downloading code is now also moved from the Track classes to the manifest classes. Download progress is now also actually helpful for segmented downloads (all HLS, and most DASH streams). It uses TQDM to show a progress bar based on how many segments it needs to download, and how fast it downloads them.

There's only one down side currently. Downloading of segmented videos no longer have the benefit of aria2c's -j parameter. Where it can download n URLs concurrently. Aria2c is still used but only -x and -s is going to make a difference.

In the future I will make HLS and DASH download in a multi-threaded way, sort of a manual version of -j.
2023-02-21 06:00:39 +00:00
rlaphoenix
c925cb8af9 Remove AtomicSQL, use Connection Pools in Vaults
This allows the use of vaults in any thread, while keeping database-file level thread safety. AtomicSQL doesn't actually do anything that useful.
2023-02-21 05:38:39 +00:00
rlaphoenix
707469d252 Add ability to pass a proxy to ClearKey in HLS.get_drm 2023-02-21 01:37:39 +00:00
rlaphoenix
5197961d91 Add doc-string to HLS.get_drm 2023-02-21 01:36:01 +00:00
rlaphoenix
09989f8b94 Raise error if no supported drm was found in HLS.get_drm 2023-02-21 01:31:52 +00:00
rlaphoenix
c3f2d0d9cc Support HLS's EXT-X-KEY NONE
If EXT-X-KEY of Method=NONE is encountered, it assumes no DRM should be used, even if other supported DRM may have already been or is going to be iterated.
2023-02-21 01:24:04 +00:00
rlaphoenix
7025b5cef3 Only convert AES-128 EXT-X-KEYs to ClearKey objects
There's other AES methods like AES-CBC and such that is not currently supported by the ClearKey DRM class.
2023-02-21 01:21:28 +00:00
rlaphoenix
88a5bc8ad5
Merge pull request #30 from varyg1001/master
Check if cookies exists
2023-02-14 22:38:24 +00:00
varyg
f412b0e37f
Check if cookies exists 2023-02-14 21:56:55 +01:00
rlaphoenix
989c24788b Update Changelog for v1.2.0 v1.2.0 2023-02-13 20:12:49 +00:00
rlaphoenix
be87d897e3 Bump to v1.2.0 2023-02-13 20:04:47 +00:00
rlaphoenix
6d3caffa32 Backport Path.is_relative_to to Python 3.8.x
Further Fix to #28.
2023-02-13 19:07:24 +00:00
rlaphoenix
d926b4fe9a Fix annotation type-hints in some files on Python 3.x
Fixes #28.
2023-02-13 19:06:25 +00:00
rlaphoenix
af5e6acbb8 Add byte-range option to the aria2c downloader 2023-02-13 18:43:36 +00:00
rlaphoenix
0c02b1513a
Merge pull request #27 from varyg1001/master
Fix cookie import across drives in `auth add`
2023-02-13 18:36:07 +00:00
rlaphoenix
f06ca768c3 Add varyg1001 to the Contributors list 2023-02-13 18:33:51 +00:00
varyg
bb9e85d777 Use shutil.move to move data instead of Path.rename
Path.rename() cannot move data to different drives. It can only rename the path reference on the same file system. However, shutil.move() will move the data while also changing it's name.
2023-02-13 18:33:02 +00:00
rlaphoenix
b25e6c5ce5
Merge pull request #25 from Arias800/patch-1
Detect redirection
2023-02-12 17:55:22 +00:00
rlaphoenix
6a3559bc0f Add Arias800 to the Contributor list in the README 2023-02-12 17:54:02 +00:00
Arias800
7169eaa885
Detect redirection
If the manifest is hidden behind a redirect, the url is not updated and the segments are created with the old url.
I found a French service where this situation occurred.

After this change, it was possible to correctly parse the mpd.
2023-02-12 11:01:16 +01:00
rlaphoenix
4b5a2c703b Fix subtitle conversion error where WEBVTT header is kept
This happened because the WEBVTT header was segmented and appended to each other without enough newline separation so pycaption thought it was an actual caption and to be kept.
2023-02-11 22:17:43 +00:00
rlaphoenix
47448aac3c Print traceback when download worker fails 2023-02-11 22:16:54 +00:00
rlaphoenix
f4363ae57e Fix HLS conversion of JOC Audio Tracks channels 2023-02-11 17:12:22 +00:00
rlaphoenix
067130990c Add missing exit when --abitrate returns no tracks 2023-02-10 21:11:28 +00:00
rlaphoenix
d612599e27 Add Audio Channels Selection option to dl command CLI
Sub-channel layouts like 5.1, 7.1, will match with e.g., 6.0 and 8.0 respectively.

Closes #9.
2023-02-10 21:10:09 +00:00
rlaphoenix
f9afd87474 Parse audio channels to float, rework parse function
The function now works more effectively, now supports parsing `Nch` strings and explicitly tests for float/int input.
2023-02-10 20:58:33 +00:00
rlaphoenix
0334640e93 Remove unnecessary audio channel 'Nch' differential
This was implemented to know the difference between services explicitly stating 5.1 channel audio, to a service explicitly stating 6.0 channel audio that is likely 5.1 channel layout.

However, since technically both are 6 channels, this is unnecessary and just causes complications.
2023-02-10 20:46:26 +00:00
rlaphoenix
f34bdb8627 If audio channels weren't specified, don't insinuate 2ch 2023-02-10 20:34:46 +00:00
rlaphoenix
84bf9fde92 Add Bitrate Selection options to dl command CLI
It defaults to highest available. Closes #8.
2023-02-10 20:19:54 +00:00
rlaphoenix
4bee08c431 Fix FutureWarning when getting FPS for DASH videos 2023-02-10 20:05:31 +00:00
rlaphoenix
a8f3975f7e Remove assert statements from base Service class
The 2nd assert statement is completely unnecessary, and the first one can be resolved by using it in an if instead.
2023-02-10 19:49:19 +00:00
rlaphoenix
dbe52cf273 Remove list comp on parameter of any() 2023-02-10 19:44:03 +00:00
rlaphoenix
9a757708ac Make the get_session func of the Service class static 2023-02-10 19:41:58 +00:00
rlaphoenix
09e29cb2e1 Define exports with __ALL__ in sub-packages 2023-02-10 19:37:03 +00:00
rlaphoenix
77d892a2a9 Add DeepSource Active Issues Badge to Readme 2023-02-10 19:31:35 +00:00
rlaphoenix
fae44614f5 Define all imports within the tracks package 2023-02-10 19:27:12 +00:00
rlaphoenix
268509fb49 Remove unused f-strings with no placeholders 2023-02-10 19:26:46 +00:00
rlaphoenix
d982e37ee5 Re-order all imports across project with isort 2023-02-10 19:25:25 +00:00
rlaphoenix
faabfb550c Replace use of with_stem + with_suffix to with_name 2023-02-10 19:13:31 +00:00
rlaphoenix
0a5f359217 Fix FutureWarning when getting segment URLs from SegmentTemplate 2023-02-08 12:57:09 +00:00
rlaphoenix
23153f0078 Only use SegmentBase's timescale as FPS if exists
Also optimised it to not require FPS.parse, as the Video class will run it under FPS.parse anyway.
2023-02-08 12:29:57 +00:00
rlaphoenix
3f22c969c3 Update Changelog for v1.1.0 v1.1.0 2023-02-07 21:49:42 +00:00
rlaphoenix
71ded306b6 Bump to v1.1.0 2023-02-07 21:49:32 +00:00
rlaphoenix
44f0ab4793 Create CHANGELOG.md 2023-02-07 21:49:07 +00:00
rlaphoenix
18e2d8617e Create credentials dict prior to assignment in auth add
Fixes #17.
2023-02-07 21:32:21 +00:00
rlaphoenix
c5d6ba09f2 Check if Cookie file for profile already exists during auth add
Fixes #16.
2023-02-07 21:25:26 +00:00
rlaphoenix
6619c29fb5 Create parent dirs when adding cookies with auth add
Fixes #21.
2023-02-07 21:21:15 +00:00
rlaphoenix
0446c44a42 Only iterate over cookie dir if exists in auth list
Fixes #18.
2023-02-07 21:08:45 +00:00
rlaphoenix
794de8b516 Efficiently store data in auth list, sort the data 2023-02-07 21:07:58 +00:00