mirror of
https://github.com/unshackle-dl/unshackle.git
synced 2026-03-18 09:07:30 +00:00
Compare commits
6 Commits
c82bb5fe34
...
4.0.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
79e8184474 | ||
|
|
178eed9236 | ||
|
|
63d2ba60c4 | ||
|
|
f46aa9d8c8 | ||
|
|
b1447eb14b | ||
|
|
e02aa66843 |
91
.github/workflows/release.yml
vendored
Normal file
91
.github/workflows/release.yml
vendored
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
name: Release
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
paths:
|
||||||
|
- "pyproject.toml"
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
check-version:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
should_release: ${{ steps.version_check.outputs.should_release }}
|
||||||
|
new_version: ${{ steps.version_check.outputs.new_version }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Check for major/minor version bump
|
||||||
|
id: version_check
|
||||||
|
run: |
|
||||||
|
NEW_VERSION=$(grep -m1 '^version' pyproject.toml | sed 's/version = "\(.*\)"/\1/')
|
||||||
|
echo "Detected version in pyproject.toml: $NEW_VERSION"
|
||||||
|
|
||||||
|
LATEST_TAG=$(git tag --list | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1)
|
||||||
|
echo "Latest git tag: $LATEST_TAG"
|
||||||
|
|
||||||
|
if [ -z "$LATEST_TAG" ]; then
|
||||||
|
echo "No previous tag found, treating as new release"
|
||||||
|
echo "should_release=true" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "new_version=$NEW_VERSION" >> "$GITHUB_OUTPUT"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
OLD_MAJOR=$(echo "$LATEST_TAG" | cut -d. -f1)
|
||||||
|
OLD_MINOR=$(echo "$LATEST_TAG" | cut -d. -f2)
|
||||||
|
NEW_MAJOR=$(echo "$NEW_VERSION" | cut -d. -f1)
|
||||||
|
NEW_MINOR=$(echo "$NEW_VERSION" | cut -d. -f2)
|
||||||
|
|
||||||
|
if [ "$NEW_MAJOR" -gt "$OLD_MAJOR" ] || [ "$NEW_MINOR" -gt "$OLD_MINOR" ]; then
|
||||||
|
echo "Major or minor version bump detected: $LATEST_TAG -> $NEW_VERSION"
|
||||||
|
echo "should_release=true" >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "Patch-only change ($LATEST_TAG -> $NEW_VERSION), skipping release"
|
||||||
|
echo "should_release=false" >> "$GITHUB_OUTPUT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "new_version=$NEW_VERSION" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
release:
|
||||||
|
needs: check-version
|
||||||
|
if: needs.check-version.outputs.should_release == 'true'
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Install uv
|
||||||
|
uses: astral-sh/setup-uv@v4
|
||||||
|
|
||||||
|
- name: Set up Python
|
||||||
|
run: uv python install 3.12
|
||||||
|
|
||||||
|
- name: Install dependencies and build
|
||||||
|
run: |
|
||||||
|
uv sync
|
||||||
|
uv build
|
||||||
|
|
||||||
|
- name: Extract changelog for release
|
||||||
|
id: changelog
|
||||||
|
run: |
|
||||||
|
VERSION=${{ needs.check-version.outputs.new_version }}
|
||||||
|
# Extract the section for this version from CHANGELOG.md
|
||||||
|
awk "/^## \[$VERSION\]/{found=1; next} /^## \[/{if(found) exit} found{print}" CHANGELOG.md > release_notes.md
|
||||||
|
echo "Extracted release notes:"
|
||||||
|
cat release_notes.md
|
||||||
|
|
||||||
|
- name: Create GitHub Release
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
run: |
|
||||||
|
VERSION=${{ needs.check-version.outputs.new_version }}
|
||||||
|
gh release create "$VERSION" \
|
||||||
|
--title "$VERSION" \
|
||||||
|
--notes-file release_notes.md \
|
||||||
|
dist/unshackle-${VERSION}-py3-none-any.whl \
|
||||||
|
dist/unshackle-${VERSION}.tar.gz
|
||||||
18
CHANGELOG.md
18
CHANGELOG.md
@@ -6,7 +6,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||||||
|
|
||||||
This changelog is automatically generated using [git-cliff](https://git-cliff.org).
|
This changelog is automatically generated using [git-cliff](https://git-cliff.org).
|
||||||
|
|
||||||
## [Unreleased]
|
## [4.0.0] - 2026-03-17
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|
||||||
@@ -19,6 +19,11 @@ This changelog is automatically generated using [git-cliff](https://git-cliff.or
|
|||||||
- *tracks*: Add edition tags to output filenames
|
- *tracks*: Add edition tags to output filenames
|
||||||
- *templates*: [**breaking**] Add customizable output filename templates
|
- *templates*: [**breaking**] Add customizable output filename templates
|
||||||
- *templates*: Add configurable language tagging rule engine
|
- *templates*: Add configurable language tagging rule engine
|
||||||
|
- Update unshackle version to 4.0.0
|
||||||
|
- *dl*: Add --animeapi and --enrich options for anime metadata and tagging
|
||||||
|
- *dl*: Add skip messages for --no-audio and --no-chapters flags
|
||||||
|
- *dl*: Extract closed captions from HLS manifests and improve CC extraction
|
||||||
|
- *dl*: Add --worst flag and SHIELD OkHttp fingerprint preset
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|
||||||
@@ -33,6 +38,13 @@ This changelog is automatically generated using [git-cliff](https://git-cliff.or
|
|||||||
- *n_m3u8dl_re*: Disable segment count validation for duration-based DASH
|
- *n_m3u8dl_re*: Disable segment count validation for duration-based DASH
|
||||||
- Correct formatting and add missing newlines in selector and EXAMPLE service
|
- Correct formatting and add missing newlines in selector and EXAMPLE service
|
||||||
- *dependencies*: Update pyplayready version to 0.8.3 and adjust dependencies
|
- *dependencies*: Update pyplayready version to 0.8.3 and adjust dependencies
|
||||||
|
- *drm*: Update PlayReady KID extraction for pyplayready 0.8.3 compatibility
|
||||||
|
- *api*: Resolve Sentinel serialization, missing params, and add search endpoint
|
||||||
|
- *dash*: Pass period_filter to n_m3u8dl_re via filtered MPD file
|
||||||
|
- *title*: Add HDR Vivid Format HDR Tag
|
||||||
|
- *ism*: Prevent duplicate track IDs for audio tracks with same lang/codec/bitrate
|
||||||
|
- *aria2c*: Correct progress bar tracking for HLS downloads
|
||||||
|
- *dl*: Filter CC subtitle languages with --s-lang and extract all manifest CCs
|
||||||
|
|
||||||
### Documentation
|
### Documentation
|
||||||
|
|
||||||
@@ -45,10 +57,6 @@ This changelog is automatically generated using [git-cliff](https://git-cliff.or
|
|||||||
- *example*: Migrate EXAMPLE service to track_request pattern
|
- *example*: Migrate EXAMPLE service to track_request pattern
|
||||||
- *providers*: Extract metadata providers into modular system
|
- *providers*: Extract metadata providers into modular system
|
||||||
|
|
||||||
### Maintenance
|
|
||||||
|
|
||||||
- *changelog*: Update changelog for upcoming release and reorganize sections
|
|
||||||
|
|
||||||
## [3.0.0] - 2026-02-15
|
## [3.0.0] - 2026-02-15
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ from unshackle.core.tracks import Audio, Subtitle, Tracks, Video
|
|||||||
from unshackle.core.tracks.attachment import Attachment
|
from unshackle.core.tracks.attachment import Attachment
|
||||||
from unshackle.core.tracks.hybrid import Hybrid
|
from unshackle.core.tracks.hybrid import Hybrid
|
||||||
from unshackle.core.utilities import (find_font_with_fallbacks, get_debug_logger, get_system_fonts, init_debug_logger,
|
from unshackle.core.utilities import (find_font_with_fallbacks, get_debug_logger, get_system_fonts, init_debug_logger,
|
||||||
is_close_match, suggest_font_packages, time_elapsed_since)
|
is_close_match, is_exact_match, suggest_font_packages, time_elapsed_since)
|
||||||
from unshackle.core.utils import tags
|
from unshackle.core.utils import tags
|
||||||
from unshackle.core.utils.click_types import (AUDIO_CODEC_LIST, LANGUAGE_RANGE, QUALITY_LIST, SEASON_RANGE,
|
from unshackle.core.utils.click_types import (AUDIO_CODEC_LIST, LANGUAGE_RANGE, QUALITY_LIST, SEASON_RANGE,
|
||||||
ContextData, MultipleChoice, MultipleVideoCodecChoice,
|
ContextData, MultipleChoice, MultipleVideoCodecChoice,
|
||||||
@@ -506,6 +506,12 @@ class dl:
|
|||||||
@click.option(
|
@click.option(
|
||||||
"--reset-cache", "reset_cache", is_flag=True, default=False, help="Clear title cache before fetching."
|
"--reset-cache", "reset_cache", is_flag=True, default=False, help="Clear title cache before fetching."
|
||||||
)
|
)
|
||||||
|
@click.option(
|
||||||
|
"--worst",
|
||||||
|
is_flag=True,
|
||||||
|
default=False,
|
||||||
|
help="Select the lowest bitrate track within the specified quality. Requires -q/--quality.",
|
||||||
|
)
|
||||||
@click.option(
|
@click.option(
|
||||||
"--best-available",
|
"--best-available",
|
||||||
"best_available",
|
"best_available",
|
||||||
@@ -991,6 +997,7 @@ class dl:
|
|||||||
no_mux: bool,
|
no_mux: bool,
|
||||||
workers: Optional[int],
|
workers: Optional[int],
|
||||||
downloads: int,
|
downloads: int,
|
||||||
|
worst: bool,
|
||||||
best_available: bool,
|
best_available: bool,
|
||||||
split_audio: Optional[bool] = None,
|
split_audio: Optional[bool] = None,
|
||||||
*_: Any,
|
*_: Any,
|
||||||
@@ -1016,6 +1023,10 @@ class dl:
|
|||||||
self.log.error("--require-subs and --s-lang cannot be used together")
|
self.log.error("--require-subs and --s-lang cannot be used together")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
if worst and not quality:
|
||||||
|
self.log.error("--worst requires -q/--quality to be specified")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
if select_titles and wanted:
|
if select_titles and wanted:
|
||||||
self.log.error("--select-titles and -w/--wanted cannot be used together")
|
self.log.error("--select-titles and -w/--wanted cannot be used together")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
@@ -1609,8 +1620,7 @@ class dl:
|
|||||||
for resolution, color_range, codec in product(
|
for resolution, color_range, codec in product(
|
||||||
quality or [None], non_hybrid_ranges, vcodec or [None]
|
quality or [None], non_hybrid_ranges, vcodec or [None]
|
||||||
):
|
):
|
||||||
match = next(
|
candidates = [
|
||||||
(
|
|
||||||
t
|
t
|
||||||
for t in non_hybrid_tracks
|
for t in non_hybrid_tracks
|
||||||
if (
|
if (
|
||||||
@@ -1620,9 +1630,8 @@ class dl:
|
|||||||
)
|
)
|
||||||
and (not color_range or t.range == color_range)
|
and (not color_range or t.range == color_range)
|
||||||
and (not codec or t.codec == codec)
|
and (not codec or t.codec == codec)
|
||||||
),
|
]
|
||||||
None,
|
match = candidates[-1] if worst and candidates else next(iter(candidates), None)
|
||||||
)
|
|
||||||
if match and match not in non_hybrid_selected:
|
if match and match not in non_hybrid_selected:
|
||||||
non_hybrid_selected.append(match)
|
non_hybrid_selected.append(match)
|
||||||
|
|
||||||
@@ -1632,8 +1641,7 @@ class dl:
|
|||||||
for resolution, color_range, codec in product(
|
for resolution, color_range, codec in product(
|
||||||
quality or [None], range_ or [None], vcodec or [None]
|
quality or [None], range_ or [None], vcodec or [None]
|
||||||
):
|
):
|
||||||
match = next(
|
candidates = [
|
||||||
(
|
|
||||||
t
|
t
|
||||||
for t in title.tracks.videos
|
for t in title.tracks.videos
|
||||||
if (
|
if (
|
||||||
@@ -1643,9 +1651,8 @@ class dl:
|
|||||||
)
|
)
|
||||||
and (not color_range or t.range == color_range)
|
and (not color_range or t.range == color_range)
|
||||||
and (not codec or t.codec == codec)
|
and (not codec or t.codec == codec)
|
||||||
),
|
]
|
||||||
None,
|
match = candidates[-1] if worst and candidates else next(iter(candidates), None)
|
||||||
)
|
|
||||||
if match and match not in selected_videos:
|
if match and match not in selected_videos:
|
||||||
selected_videos.append(match)
|
selected_videos.append(match)
|
||||||
title.tracks.videos = selected_videos
|
title.tracks.videos = selected_videos
|
||||||
@@ -1705,8 +1712,6 @@ class dl:
|
|||||||
f"Required languages found ({', '.join(require_subs)}), downloading all available subtitles"
|
f"Required languages found ({', '.join(require_subs)}), downloading all available subtitles"
|
||||||
)
|
)
|
||||||
elif s_lang and "all" not in s_lang:
|
elif s_lang and "all" not in s_lang:
|
||||||
from unshackle.core.utilities import is_exact_match
|
|
||||||
|
|
||||||
match_func = is_exact_match if exact_lang else is_close_match
|
match_func = is_exact_match if exact_lang else is_close_match
|
||||||
|
|
||||||
missing_langs = [
|
missing_langs = [
|
||||||
@@ -2098,6 +2103,7 @@ class dl:
|
|||||||
and not video_only
|
and not video_only
|
||||||
and not no_video
|
and not no_video
|
||||||
):
|
):
|
||||||
|
match_func = is_exact_match if exact_lang else is_close_match
|
||||||
for video_track_n, video_track in enumerate(title.tracks.videos):
|
for video_track_n, video_track in enumerate(title.tracks.videos):
|
||||||
has_manifest_cc = bool(getattr(video_track, "closed_captions", None))
|
has_manifest_cc = bool(getattr(video_track, "closed_captions", None))
|
||||||
has_eia_cc = (
|
has_eia_cc = (
|
||||||
@@ -2111,14 +2117,31 @@ class dl:
|
|||||||
if not has_manifest_cc and not has_eia_cc:
|
if not has_manifest_cc and not has_eia_cc:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
# Build list of CC entries to extract
|
||||||
|
if has_manifest_cc:
|
||||||
|
cc_entries = video_track.closed_captions
|
||||||
|
# Filter CC languages against --s-lang if specified
|
||||||
|
if s_lang and "all" not in s_lang:
|
||||||
|
cc_entries = [
|
||||||
|
entry for entry in cc_entries
|
||||||
|
if entry.get("language")
|
||||||
|
and match_func(Language.get(entry["language"]), s_lang)
|
||||||
|
]
|
||||||
|
if not cc_entries:
|
||||||
|
continue
|
||||||
|
else:
|
||||||
|
# EIA fallback: single entry with unknown language
|
||||||
|
cc_entries = [{}]
|
||||||
|
|
||||||
with console.status(f"Checking Video track {video_track_n + 1} for Closed Captions..."):
|
with console.status(f"Checking Video track {video_track_n + 1} for Closed Captions..."):
|
||||||
try:
|
try:
|
||||||
|
for cc_idx, cc_entry in enumerate(cc_entries):
|
||||||
cc_lang = (
|
cc_lang = (
|
||||||
Language.get(video_track.closed_captions[0]["language"])
|
Language.get(cc_entry["language"])
|
||||||
if has_manifest_cc and video_track.closed_captions[0].get("language")
|
if cc_entry.get("language")
|
||||||
else title.language or video_track.language
|
else title.language or video_track.language
|
||||||
)
|
)
|
||||||
track_id = f"ccextractor-{video_track.id}"
|
track_id = f"ccextractor-{video_track.id}-{cc_idx}"
|
||||||
cc = video_track.ccextractor(
|
cc = video_track.ccextractor(
|
||||||
track_id=track_id,
|
track_id=track_id,
|
||||||
out_path=config.directories.temp
|
out_path=config.directories.temp
|
||||||
@@ -2130,7 +2153,7 @@ class dl:
|
|||||||
cc.cc = True
|
cc.cc = True
|
||||||
title.tracks.add(cc)
|
title.tracks.add(cc)
|
||||||
self.log.info(
|
self.log.info(
|
||||||
f"Extracted a Closed Caption from Video track {video_track_n + 1}"
|
f"Extracted a Closed Caption ({cc_lang}) from Video track {video_track_n + 1}"
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
self.log.info(
|
self.log.info(
|
||||||
|
|||||||
@@ -44,6 +44,17 @@ FINGERPRINT_PRESETS = {
|
|||||||
"akamai": "4:16777216|16711681|0|m,p,a,s",
|
"akamai": "4:16777216|16711681|0|m,p,a,s",
|
||||||
"description": "OkHttp 5.x (BoringSSL TLS stack)",
|
"description": "OkHttp 5.x (BoringSSL TLS stack)",
|
||||||
},
|
},
|
||||||
|
"shield_okhttp": {
|
||||||
|
"ja3": (
|
||||||
|
"771," # TLS 1.2
|
||||||
|
"4865-4866-4867-49195-49199-49196-49200-52393-52392-49171-49172-156-157-47-53," # Ciphers (OkHttp 4.11)
|
||||||
|
"0-23-65281-10-11-35-16-5-13-51-45-43-21," # Extensions (incl padding ext 21)
|
||||||
|
"29-23-24," # Named groups (x25519, secp256r1, secp384r1)
|
||||||
|
"0" # EC point formats
|
||||||
|
),
|
||||||
|
"akamai": "4:16777216|16711681|0|m,p,a,s",
|
||||||
|
"description": "NVIDIA SHIELD Android TV OkHttp 4.11 (captured JA3)",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user