Skip to content

Commit

Permalink
release: v1.55.0
Browse files Browse the repository at this point in the history
  • Loading branch information
newt-sc committed Jan 1, 2024
1 parent 792aa70 commit 5165c58
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 23 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* [v1.55.0](https://github.com/newt-sc/a4kStreaming/releases/tag/plugin.video.a4kstreaming%2Fplugin.video.a4kstreaming-1.55.0):
* Proper fix for Dolby Vision detection and other result title clean improvements

* [v1.54.0](https://github.com/newt-sc/a4kStreaming/releases/tag/plugin.video.a4kstreaming%2Fplugin.video.a4kstreaming-1.54.0):
* More improvements on episode auto-selection from season/packs

Expand Down
34 changes: 14 additions & 20 deletions a4kStreaming/lib/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,10 @@ def video_containers():
return ['3GP', '3G2', 'ASF', 'WMV', 'AVI', 'DIVX', 'EVO', 'F4V', 'FLV', 'MKV', 'MK3D', 'MP4', 'M4V', 'MPG', 'MPEG', 'M2P', 'PS', 'TS', 'M2TS', 'MXF', 'OGG', 'OGV', 'OGX', 'MOV', 'QT', 'RMVB', 'VOB', 'WEBM']

def clean_release_title(title):
return re.sub(r'\s+', ' ', re.sub(r'\-|\_|\.|\,|\?|\!|\[|\]|\{|\}|\(|\)|\||\'|\"|\|\\|\/|\`|\~|\^|\<|\>', ' ', title))
return re.sub(r'\s+', ' ', re.sub(r'\-|\_|\.|\,|\?|\!|\[|\]|\{|\}|\(|\)|\||\'|\’|\"|\|\\|\/|\`|\~|\^|\<|\>', ' ', title))

def cleanup_result(result, no_meta=False):
title = result['release_title'].upper()
title = clean_release_title(result['release_title']).upper()

containers = list(map(lambda v: re.escape(' %s ' % v), video_containers()))
videocodec = ''
Expand All @@ -215,13 +215,13 @@ def cleanup_result(result, no_meta=False):
if 'HEVC' in title: videocodec = 'H265'
if 'AVC' in title: videocodec = 'H264'
if 'X265' in title: videocodec = 'H265'
if 'X.265' in title: videocodec = 'H265'
if 'X 265' in title: videocodec = 'H265'
if 'H265' in title: videocodec = 'H265'
if 'H.265' in title: videocodec = 'H265'
if 'H 265' in title: videocodec = 'H265'
if 'H264' in title: videocodec = 'H264'
if 'H.264' in title: videocodec = 'H265'
if 'H 264' in title: videocodec = 'H265'
if 'X264' in title: videocodec = 'H264'
if 'X.264' in title: videocodec = 'H264'
if 'X 264' in title: videocodec = 'H264'

result['videocodec'] = videocodec

Expand All @@ -245,15 +245,12 @@ def cleanup_result(result, no_meta=False):

rip = ''
if 'WEBRIP' in title: rip = 'WEBRIP'
if 'WEB-DL' in title: rip = 'WEB-DL'
if 'WEB.DL' in title: rip = 'WEB-DL'
if 'WEB DL' in title: rip = 'WEB-DL'
if 'WEBDL' in title: rip = 'WEB-DL'
if 'DVD-RIP' in title: rip = 'DVD'
if 'DVD.RIP' in title: rip = 'DVD'
if 'DVD RIP' in title: rip = 'DVD'
if 'DVDRIP' in title: rip = 'DVD'
if 'BLURAY' in title: rip = 'BLURAY'
if 'BD-RIP' in title: rip = 'BLURAY'
if 'BD.RIP' in title: rip = 'BLURAY'
if 'BD RIP' in title: rip = 'BLURAY'
if 'BDRIP' in title: rip = 'BLURAY'
if 'HDTV' in title: rip = 'HDTV'
if 'UHD' in title: rip = 'UHD'
Expand All @@ -264,12 +261,10 @@ def cleanup_result(result, no_meta=False):
if 'AAC' in title: audiocodec = 'AAC'
if 'DTS' in title: audiocodec = 'DTS'
if 'HDMA' in title: audiocodec = 'HD-MA'
if 'HD-MA' in title: audiocodec = 'HD-MA'
if 'HD.MA' in title: audiocodec = 'HD-MA'
if 'HD MA' in title: audiocodec = 'HD-MA'
if 'ATMOS' in title: audiocodec = 'ATMOS'
if 'TRUEHD' in title: audiocodec = 'TRUEHD'
if 'TRUE-HD' in title: audiocodec = 'TRUEHD'
if 'TRUE.HD' in title: audiocodec = 'TRUEHD'
if 'TRUE HD' in title: audiocodec = 'TRUEHD'
if ' DD ' in title: audiocodec = 'DD'
if 'DD2' in title: audiocodec = 'DD'
if 'DD5' in title: audiocodec = 'DD'
Expand All @@ -283,12 +278,11 @@ def cleanup_result(result, no_meta=False):

result['audiocodec'] = audiocodec

title = re.sub(r'\'|\’', '', title)
title = re.sub(r'COMPLETE|INTERNAL|AUHDTV| SUB ', ' ', title)
title = re.sub(r'HEVC|X265|X\.265|H265|H\.265|X264|X\.264|H264|H\.264|AVC|XVID|DIVX|WMV|MKV', ' ', title)
title = re.sub(r'HEVC|X265|X 265|H265|H 265|X264|X 264|H264|H 264|AVC|XVID|DIVX|WMV|MKV', ' ', title)
title = re.sub(r'HDR10\+|HDR10|HDR|12BIT|10BIT|8BIT|SDR|DOLBY VISION', ' ', title)
title = re.sub(r'WEBRIP|WEB\-DL|WEB\.DL|WEBDL|WEB|DVD\-RIP|DVD\.RIP|DVDRIP|DVD|BLURAY|BD\-RIP|BD\.RIP|BDRIP|HDTV|UHD|FULLHD', ' ', title)
title = re.sub(r'AAC|DTS|HDMA|HD\-MA|HD\.MA|ATMOS|TRUEHD|TRUE\-HD|TRUE\.HD|DD\+|DDP| DD|EAC3|AC3|MP3|WMA', ' ', title)
title = re.sub(r'WEBRIP|WEB DL|WEBDL|WEB|DVD RIP|DVDRIP|DVD|BLURAY|BD RIP|BDRIP|HDTV|UHD|FULLHD', ' ', title)
title = re.sub(r'AAC|DTS|HDMA|HD MA|ATMOS|TRUEHD|TRUE HD|DD\+|DDP| DD|EAC3|AC3|MP3|WMA', ' ', title)
title = re.sub(r'HD |SD |DV ', ' ', title)
title = re.sub(r'\:|\\|\/|\,|\||\!|\?|\(|\)|\"|\+|\[|\]|\_|\.|\{|\}', ' ', title)

Expand Down
5 changes: 4 additions & 1 deletion addon.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.a4kstreaming"
name="a4kStreaming"
version="1.54.0"
version="1.55.0"
provider-name="Unknown">
<requires>
<import addon="script.module.requests"/>
Expand Down Expand Up @@ -32,6 +32,9 @@ Designed for low-end devices and Estuary skin.
<screenshot>screenshot-06.jpg</screenshot>
</assets>
<news>
[v1.55.0]:
* Proper fix for Dolby Vision detection and other result title clean improvements

[v1.54.0]:
* More improvements on episode auto-selection from season/packs

Expand Down
5 changes: 4 additions & 1 deletion packages/addons.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<addons>
<addon id="plugin.video.a4kstreaming"
name="a4kStreaming"
version="1.54.0"
version="1.55.0"
provider-name="Unknown">
<requires>
<import addon="script.module.requests"/>
Expand Down Expand Up @@ -35,6 +35,9 @@ Designed for low-end devices and Estuary skin.
<screenshot>screenshot-06.jpg</screenshot>
</assets>
<news>
[v1.55.0]:
* Proper fix for Dolby Vision detection and other result title clean improvements

[v1.54.0]:
* More improvements on episode auto-selection from season/packs

Expand Down
2 changes: 1 addition & 1 deletion packages/addons.xml.crc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9fa610f13f76f3b2fcafc7c0bc30ccd59b217660
67b5c5e132ad4d7635e58ea6d2ad2b22a8ba70d5

0 comments on commit 5165c58

Please sign in to comment.