heaac

README.md

@@ -42,9 +42,9 @@ Some new features that I added:
 
 ## Usage
 ```
-usage: gamdl [-h] [-u [URLS_TXT]] [-w WVD_LOCATION] [-f FINAL_PATH] [-t TEMP_PATH] [-c COOKIES_LOCATION] [-m] [-p]
-             [-o] [-n] [-s] [-e] [-i] [-v]
-             [url ...]
+usage: gamdl [-h] [-u [URLS_TXT]] [-w WVD_LOCATION] [-f FINAL_PATH] [-t TEMP_PATH] [-c COOKIES_LOCATION] [-m]
+                   [-p] [-a] [-o] [-n] [-s] [-e] [-i] [-v]
+                   [url ...]
 
 Download Apple Music songs/music videos/albums/playlists
 
@@ -66,6 +66,7 @@ options:
   -m, --disable-music-video-skip
                         Disable music video skip on playlists/albums (default: False)
   -p, --prefer-hevc     Prefer HEVC over AVC (default: False)
+  -a, --heaac           Download songs/music videos with HE-AAC instead of AAC (default: False)
   -o, --overwrite       Overwrite existing files (default: False)
   -n, --no-lrc          Don't create .lrc file (default: False)
   -s, --skip-cleanup    Skip cleanup (default: False)
@@ -78,14 +79,15 @@ options:
 
 ## Songs/Music Videos quality
 * Songs:
-    * 256kbps AAC
+    * 256kbps AAC / HE-AAC 64kbps
 * Music Videos (varies depending on the video):
-    * 4K HEVC 20mbps / AAC 256kbps
-    * 4K HEVC 12mbps / AAC 256kbps
-    * 1080p AVC 10mbps / AAC 256kbps
-    * 1080p AVC 6.5bps / AAC 256kbps
-    * 720p AVC 4mbps / AAC 256kbps
-    * 480p AVC 1.5mbps / AAC 256kbps
-    * 360p AVC 1mbps / AAC 256kbps
+    * 4K HEVC 20mbps, AAC 256kbps / HE-AAC 64kbps
+    * 4K HEVC 12mbps, AAC 256kbps / HE-AAC 64kbps
+    * 1080p AVC 10mbps, AAC 256kbps / HE-AAC 64kbps
+    * 1080p AVC 6.5bps, AAC 256kbps / HE-AAC 64kbps
+    * 720p AVC 4mbps, AAC 256kbps / HE-AAC 64kbps
+    * 576p AVC 2mbps, AAC 256kbps / HE-AAC 64kbps
+    * 480p AVC 1.5mbps, AAC 256kbps / HE-AAC 64kbps
+    * 360p AVC 1mbps, AAC 256kbps / HE-AAC 64kbps
 
 Some videos may include EIA-608 closed captions.

gamdl/__init__.py

@@ -3,7 +3,7 @@ import argparse
 import traceback
 from .gamdl import Gamdl
 
-__version__ = '1.2'
+__version__ = '1.8'
 
 
 def main():
@@ -13,18 +13,18 @@ def main():
         raise Exception('MP4Box is not on PATH')
     parser = argparse.ArgumentParser(
         description = 'Download Apple Music songs/music videos/albums/playlists',
-        formatter_class = argparse.ArgumentDefaultsHelpFormatter
+        formatter_class = argparse.ArgumentDefaultsHelpFormatter,
     )
     parser.add_argument(
         'url',
         help = 'Apple Music song/music video/album/playlist URL(s)',
-        nargs = '*'
+        nargs = '*',
     )
     parser.add_argument(
         '-u',
         '--urls-txt',
         help = 'Read URLs from a text file',
-        nargs = '?'
+        nargs = '?',
     )
     parser.add_argument(
         '-w',
@@ -36,67 +36,73 @@ def main():
         '-f',
         '--final-path',
         default = 'Apple Music',
-        help = 'Final Path'
+        help = 'Final Path',
     )
     parser.add_argument(
         '-t',
         '--temp-path',
         default = 'temp',
-        help = 'Temp Path'
+        help = 'Temp Path',
     )
     parser.add_argument(
         '-c',
         '--cookies-location',
         default = 'cookies.txt',
-        help = 'Cookies location'
+        help = 'Cookies location',
     )
     parser.add_argument(
         '-m',
         '--disable-music-video-skip',
         action = 'store_true',
-        help = 'Disable music video skip on playlists/albums'
+        help = 'Disable music video skip on playlists/albums',
     )
     parser.add_argument(
         '-p',
         '--prefer-hevc',
         action = 'store_true',
-        help = 'Prefer HEVC over AVC'
+        help = 'Prefer HEVC over AVC',
+    )
+    parser.add_argument(
+        '-a',
+        '--heaac',
+        action = 'store_true',
+        help = 'Download songs/music videos with HE-AAC instead of AAC',
     )
     parser.add_argument(
         '-o',
         '--overwrite',
         action = 'store_true',
-        help = 'Overwrite existing files'
+        help = 'Overwrite existing files',
     )
     parser.add_argument(
         '-n',
         '--no-lrc',
         action = 'store_true',
-        help = "Don't create .lrc file"
+        help = "Don't create .lrc file",
     )
     parser.add_argument(
         '-s',
         '--skip-cleanup',
         action = 'store_true',
-        help = 'Skip cleanup'
+        help = 'Skip cleanup',
     )
     parser.add_argument(
         '-e',
         '--print-exceptions',
         action = 'store_true',
-        help = 'Print execeptions'
+        help = 'Print execeptions',
     )
     parser.add_argument(
         '-i',
         '--print-video-m3u8-url',
         action = 'store_true',
-        help = 'Print Video M3U8 URL'
+        help = 'Print Video M3U8 URL',
     )
     parser.add_argument(
         '-v',
         '--version',
         action = 'version',
-        version = f'%(prog)s {__version__}'
+        version = f'%(prog)s {__version__}',
     )
     args = parser.parse_args()
     if not args.url and not args.urls_txt:
@@ -109,11 +115,12 @@ def main():
         args.cookies_location,
         args.disable_music_video_skip,
         args.prefer_hevc,
+        args.heaac,
         args.temp_path,
         args.final_path,
         args.no_lrc,
         args.overwrite,
-        args.skip_cleanup
+        args.skip_cleanup,
     )
     error_count = 0
     download_queue = []
@@ -124,7 +131,7 @@ def main():
             exit(1)
         except:
             error_count += 1
-            print(f'* Failed to check URL {i + 1}.')
+            print(f'Failed to check URL {i + 1}/{len(args.url)}')
             if args.print_exceptions:
                 traceback.print_exc()
     for i, url in enumerate(download_queue):
@@ -140,14 +147,12 @@ def main():
                     final_location = dl.get_final_location('.m4v', tags)
                     if dl.check_exists(final_location) and not args.overwrite:
                         continue
-                    playlist = dl.get_playlist_music_video(webplayback)
-                    stream_url_audio = dl.get_stream_url_music_video_audio(playlist)
+                    stream_url_video, stream_url_audio = dl.get_stream_url_music_video(webplayback)
                     decryption_keys_audio = dl.get_decryption_keys_music_video(stream_url_audio, track_id)
                     encrypted_location_audio = dl.get_encrypted_location_audio(track_id)
                     dl.download(encrypted_location_audio, stream_url_audio)
                     decrypted_location_audio = dl.get_decrypted_location_audio(track_id)
                     dl.decrypt(encrypted_location_audio, decrypted_location_audio, decryption_keys_audio)
-                    stream_url_video = dl.get_stream_url_music_video_video(playlist)
                     decryption_keys_video = dl.get_decryption_keys_music_video(stream_url_video, track_id)
                     encrypted_location_video = dl.get_encrypted_location_video(track_id)
                     dl.download(encrypted_location_video, stream_url_video)

gamdl/gamdl.py

@@ -9,20 +9,23 @@ import functools
 import subprocess
 import shutil
 import gamdl.storefront_ids
-from pywidevine import Cdm
-from pywidevine import Device
+from pywidevine import Cdm, Device, PSSH, WidevinePsshData
 import requests
 import m3u8
 from yt_dlp import YoutubeDL
-from pywidevine.pssh import PSSH
-from pywidevine.license_protocol_pb2 import WidevinePsshData
 from mutagen.mp4 import MP4, MP4Cover
 
 
 class Gamdl:
-    def __init__(self, wvd_location, cookies_location, disable_music_video_skip, prefer_hevc, temp_path, final_path, no_lrc, overwrite, skip_cleanup):
+    def __init__(self, wvd_location, cookies_location, disable_music_video_skip, prefer_hevc, heaac, temp_path, final_path, no_lrc, overwrite, skip_cleanup):
         self.disable_music_video_skip = disable_music_video_skip
         self.prefer_hevc = prefer_hevc
+        if heaac:
+            self.song_audio_quality = '32:ctrp64'
+            self.music_video_audio_quality = 'audio-HE-stereo-64'
+        else:
+            self.song_audio_quality = '28:ctrp256'
+            self.music_video_audio_quality = 'audio-stereo-256'
         self.temp_path = Path(temp_path)
         self.final_path = Path(final_path)
         self.no_lrc = no_lrc
@@ -34,7 +37,7 @@ class Gamdl:
         self.cdm = Cdm.from_device(Device.load(Path(wvd_location[0])))
         self.cdm_session = self.cdm.open()
         cookies = MozillaCookieJar(Path(cookies_location))
-        cookies.load(ignore_discard = True, ignore_expires = True)
+        cookies.load(ignore_discard=True, ignore_expires=True)
         self.session = requests.Session()
         self.session.cookies.update(cookies)
         self.session.headers.update({
@@ -50,7 +53,7 @@ class Gamdl:
             'Sec-Fetch-Dest': 'empty',
             'Sec-Fetch-Mode': 'cors',
             'Sec-Fetch-Site': 'same-site',
-            'origin': 'https://beta.music.apple.com'
+            'origin': 'https://beta.music.apple.com',
         })
         web_page = self.session.get('https://beta.music.apple.com').text
         index_js_uri = re.search('(?<=index\.)(.*?)(?=\.js")', web_page).group(1)
@@ -84,29 +87,29 @@ class Gamdl:
             'https://play.itunes.apple.com/WebObjects/MZPlay.woa/wa/webPlayback',
             json = {
                 'salableAdamId': track_id,
-                'language': 'en-US'
+                'language': 'en-US',
             }
         ).json()["songList"][0]
         return response
     
 
-    def get_playlist_music_video(self, webplayback):
-        return m3u8.load(webplayback['hls-playlist-url'])
-    
-
     def get_stream_url_song(self, webplayback):
-        return next(i for i in webplayback["assets"] if i["flavor"] == "28:ctrp256")['URL']
+        return next(i for i in webplayback["assets"] if i["flavor"] == self.song_audio_quality)['URL']
     
 
-    def get_stream_url_music_video_audio(self, playlist):
-        return [i for i in playlist.media if i.type == "AUDIO"][-1].uri
-    
-
-    def get_stream_url_music_video_video(self, playlist):
+    def get_stream_url_music_video(self, webplayback):
+        with YoutubeDL({
+            'allow_unplayable_formats': True,
+            'quiet': True,
+            'no_warnings': True,
+        }) as ydl:
+            playlist = ydl.extract_info(webplayback['hls-playlist-url'], download = False)
         if self.prefer_hevc:
-            return playlist.playlists[-1].uri
+            stream_url_video = playlist['formats'][-1]['url']
         else:
-            return [i for i in playlist.playlists if 'avc' in i.stream_info.codecs][-1].uri
+            stream_url_video = [i['url'] for i in playlist['formats'] if i['vcodec'] is not None and 'avc1' in i['vcodec']][-1]
+        stream_url_audio = next(i['url'] for i in playlist['formats'] if self.music_video_audio_quality in i['format_id'])
+        return stream_url_video, stream_url_audio
     
 
     def check_exists(self, final_location):
@@ -141,7 +144,7 @@ class Gamdl:
             'allow_unplayable_formats': True,
             'fixup': 'never',
             'overwrites': self.overwrite,
-            'external_downloader': 'aria2c'
+            'external_downloader': 'aria2c',
         }) as ydl:
             ydl.download(stream_url)
     
@@ -155,7 +158,7 @@ class Gamdl:
                 'uri': track_uri,
                 'adamId': track_id,
                 'isLibrary': False,
-                'user-initiated': True
+                'user-initiated': True,
             }
         ).json()['license']
 
@@ -189,29 +192,27 @@ class Gamdl:
                 encrypted_location,
                 '--key',
                 decryption_keys,
-                decrypted_location
+                decrypted_location,
             ],
-            check = True
+            check=True
         )
-    
 
+    
     def get_synced_lyrics_formated_time(self, unformatted_time):
-        if 's' in unformatted_time:
-            unformatted_time = unformatted_time.replace('s', '')
-        if '.' not in unformatted_time:
-            unformatted_time += '.0'
-        s = int(unformatted_time.split('.')[-2].split(':')[-1]) * 1000
-        try:
-            m = int(unformatted_time.split('.')[-2].split(':')[-2]) * 60000
-        except:
-            m = 0
-        ms = f'{int(unformatted_time.split(".")[-1]):03d}'
-        if int(ms[2]) >= 5:
-            ms = int(f'{int(ms[:2]) + 1}') * 10
-        else:
-            ms = int(ms)
-        formated_time = datetime.datetime.fromtimestamp((s + m + ms)/1000.0)
-        return formated_time.strftime('%M:%S.%f')[:-4]
+        unformatted_time = unformatted_time.replace('m', '').replace('s', '').replace(':', '.')
+        unformatted_time = unformatted_time.split('.')
+        m, s, ms = 0, 0, 0
+        ms = int(unformatted_time[-1])
+        if len(unformatted_time) >= 2:
+            s = int(unformatted_time[-2]) * 1000
+        if len(unformatted_time) >= 3:
+            m = int(unformatted_time[-3]) * 60000
+        unformatted_time = datetime.datetime.fromtimestamp((ms + s + m)/1000.0)
+        ms_new = f'{int(str(unformatted_time.microsecond)[:3]):03d}'
+        if int(ms_new[2]) >= 5:
+            ms = int(f'{int(ms_new[:2]) + 1}') * 10
+            unformatted_time += datetime.timedelta(milliseconds=ms) - datetime.timedelta(microseconds=unformatted_time.microsecond)
+        return unformatted_time.strftime('%M:%S.%f')[:-4]
 
 
     def get_lyrics(self, track_id):
@@ -237,8 +238,8 @@ class Gamdl:
     
 
     def get_tags_song(self, webplayback, unsynced_lyrics):
-        metadata = next(i for i in webplayback["assets"] if i["flavor"] == "28:ctrp256")['metadata']
-        cover_url = next(i for i in webplayback["assets"] if i["flavor"] == "28:ctrp256")['artworkURL']
+        metadata = next(i for i in webplayback["assets"] if i["flavor"] == self.song_audio_quality)['metadata']
+        cover_url = next(i for i in webplayback["assets"] if i["flavor"] == self.song_audio_quality)['artworkURL']
         tags = {
             '\xa9nam': [metadata['itemName']],
             '\xa9gen': [metadata['genre']],
@@ -259,7 +260,7 @@ class Gamdl:
             'disk': [(metadata['discNumber'], metadata['discCount'])],
             'trkn': [(metadata['trackNumber'], metadata['trackCount'])],
             'covr': [MP4Cover(self.get_cover(cover_url), MP4Cover.FORMAT_JPEG)],
-            'stik': [1]
+            'stik': [1],
         }
         if 'copyright' in metadata:
             tags['cprt'] = [metadata['copyright']]
@@ -279,21 +280,22 @@ class Gamdl:
 
 
     def get_tags_music_video(self, track_id):
-        metadata = requests.get(f'https://itunes.apple.com/lookup?id={track_id}&entity=album&limit=200&country={self.country}&lang=en_US').json()['results']
+        metadata = requests.get(f'https://itunes.apple.com/lookup?id={track_id}&entity=album&country={self.country}&lang=en_US').json()['results']
         extra_metadata = requests.get(f'https://music.apple.com/music-video/{metadata[0]["trackId"]}', headers = {'X-Apple-Store-Front': f'{self.storefront} t:music31'}).json()['storePlatformData']['product-dv']['results'][str(metadata[0]['trackId'])]
         tags = {
             '\xa9ART': [metadata[0]["artistName"]],
             '\xa9nam': [metadata[0]["trackCensoredName"]],
             '\xa9day': [metadata[0]["releaseDate"]],
-            'cprt': [extra_metadata['copyright']],
             '\xa9gen': [metadata[0]['primaryGenreName']],
             'stik': [6],
             'atID': [metadata[0]['artistId']],
             'cnID': [metadata[0]["trackId"]],
             'geID': [int(extra_metadata['genres'][0]['genreId'])],
             'sfID': [int(self.storefront.split('-')[0])],
-            'covr': [MP4Cover(self.get_cover(metadata[0]["artworkUrl30"].replace('30x30bb.jpg', '600x600bb.jpg')), MP4Cover.FORMAT_JPEG)]
+            'covr': [MP4Cover(self.get_cover(metadata[0]["artworkUrl30"].replace('30x30bb.jpg', '600x600bb.jpg')), MP4Cover.FORMAT_JPEG)],
         }
+        if 'copyright' in extra_metadata:
+            tags['cprt'] = [extra_metadata['copyright']]
         if metadata[0]['trackExplicitness'] == 'notExplicit':
             tags['rtng'] = [0]
         elif metadata[0]['trackExplicitness'] == 'explicit':
@@ -346,7 +348,7 @@ class Gamdl:
             final_location /= f'{self.get_sanizated_string(tags["©ART"][0], True)}/Unknown Album/'
         final_location /= f'{file_name}{file_extension}'
         try:
-            if file_extension == '.m4v' and final_location.exists() and MP4(final_location).tags['cnID'][0] != tags['cnID'][0]:
+            if file_extension == '.m4v' and final_location.exists() and MP4(final_location)['cnID'][0] != tags['cnID'][0]:
                 final_location = self.get_final_location_overwrite_prevented_music_video(final_location)
         except:
             pass
@@ -364,9 +366,10 @@ class Gamdl:
                 decrypted_location_video,
                 '-itags',
                 'artist=placeholder',
-                fixed_location
+                '-new',
+                fixed_location,
             ],
-            check = True
+            check=True
         )
     
 
@@ -379,9 +382,10 @@ class Gamdl:
                 decrypted_location,
                 '-itags',
                 'artist=placeholder',
-                fixed_location
+                '-new',
+                fixed_location,
             ],
-            check = True
+            check=True
         )