Version bump

README.md

@@ -1,7 +1,7 @@
 # Glomatico's ✨ Apple Music ✨ Downloader
 A Python script to download Apple Music songs/music videos/albums/playlists.
 
-![Windows CMD usage example](https://i.imgur.com/6WeUCFh.png)
+![Windows CMD usage example](https://i.imgur.com/18Azlg4.png)
 
 This is a rework of https://github.com/loveyoursupport/AppleMusic-Downloader/tree/661a274d62586b521feec5a7de6bee0e230fdb7d.
 
@@ -25,59 +25,73 @@ Some new features that I added:
     * You can get them from here:
         * MP4Box: https://gpac.wp.imt.fr/downloads/
         * mp4decrypt: https://www.bento4.com/downloads/
-4. Export your Apple Music cookies as `cookies.txt` and put it on the same folder that you will run the script
+4. Export your Apple Music cookies as `cookies.txt` to the same folder that you will run the script
     * You can export your cookies by using this Google Chrome extension on Apple Music website: https://chrome.google.com/webstore/detail/open-cookiestxt/gdocmgbfkjnnpapoeobnolbbkoibbcif. Make sure to be logged in.
-5. Put your L3 Widevine Device Keys (`device_client_id_blob` and `device_private_key` files) on the same folder that you will run the script
-    * You can get your L3 Widevine Device Keys by using Dumper: https://github.com/Diazole/dumper
-        * The generated `private_key.pem` and `client_id.bin` files should be renamed to `device_private_key` and `device_client_id_blob` respectively.
+5. Put your Widevine Device file (.wvd) in the same folder that you will run the script
+    * You can use Dumper to dump your phone's L3 CDM: https://github.com/Diazole/dumper. Once you have the L3 CDM, you can use pywidevine to create the .wvd file from it.
+        1. Install pywidevine with pip
+            ```
+            pip install pywidevine pyyaml
+            ```
+        2. Create the .wvd file
+            ```
+            pywidevine create-device -t ANDROID -l 3 -k private_key.pem -c client_id.bin -o .
+            ```
 6. (optional) Add aria2c to your PATH for faster downloads
     * You can get it from here: https://github.com/aria2/aria2/releases.
 
 ## Usage
 ```
-usage: gamdl [-h] [-u [URLS_TXT]] [-d DEVICE_PATH] [-f FINAL_PATH] [-t TEMP_PATH] [-c COOKIES_LOCATION] [-m]
-                   [-p] [-n] [-s] [-e] [-y] [-v]
+usage: __main__.py [-h] [-u [URLS_TXT]] [-w WVD_LOCATION] [-f FINAL_PATH]
+                   [-t TEMP_PATH] [-c COOKIES_LOCATION] [-m] [-p] [-o] [-n]
+                   [-l] [-s] [-e] [-v]
                    [url ...]
 
 Download Apple Music songs/music videos/albums/playlists
 
 positional arguments:
-  url                   Apple Music song/music video/album/playlist URL(s) (default: None)
+  url                   Apple Music song/music video/album/playlist URL(s)
+                        (default: None)
 
 options:
   -h, --help            show this help message and exit
   -u [URLS_TXT], --urls-txt [URLS_TXT]
                         Read URLs from a text file (default: None)
-  -d DEVICE_PATH, --device-path DEVICE_PATH
-                        Widevine L3 device keys path (default: .)
+  -w WVD_LOCATION, --wvd-location WVD_LOCATION
+                        .wvd file location (ignored if using -l/--lrc-only)
+                        (default: ./*.wvd)
   -f FINAL_PATH, --final-path FINAL_PATH
-                        Final Path (default: Apple Music)
+                        Final Path (default: ./Apple Music)
   -t TEMP_PATH, --temp-path TEMP_PATH
-                        Temp Path (default: temp)
+                        Temp Path (default: ./temp)
   -c COOKIES_LOCATION, --cookies-location COOKIES_LOCATION
-                        Cookies location (default: cookies.txt)
+                        Cookies location (default: ./cookies.txt)
   -m, --disable-music-video-skip
-                        Disable music video skip on playlists/albums (default: False)
+                        Disable music video skip on playlists/albums (default:
+                        False)
   -p, --prefer-hevc     Prefer HEVC over AVC (default: False)
-  -n, --no-lrc          Don't create .lrc file (default: False)
+  -o, --overwrite       Overwrite existing files (default: False)
+  -n, --no-lrc          Don't create .lrc file (ignored if using -l/--lrc-
+                        only) (default: False)
+  -l, --lrc-only        Skip downloading songs and only create .lrc files
+                        (default: False)
   -s, --skip-cleanup    Skip cleanup (default: False)
   -e, --print-exceptions
                         Print execeptions (default: False)
-  -y, --print-video-playlist
-                        Print Video M3U8 Playlist (default: False)
   -v, --version         show program's version number and exit
 ```
 
 ## Songs/Music Videos quality
 * Songs:
-    * 256kbps AAC
+    * AAC 256kbps
 * 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
+    * 4K HEVC 12mbps, AAC 256kbps
+    * 1080p AVC 10mbps, AAC 256kbps
+    * 1080p AVC 6.5bps, AAC 256kbps
+    * 720p AVC 4mbps, AAC 256kbps
+    * 576p AVC 2mbps, AAC 256kbps
+    * 480p AVC 1.5mbps, AAC 256kbps
+    * 360p AVC 1mbps, AAC 256kbps
 
 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.0'
+__version__ = '1.9.1'
 
 
 def main():
@@ -12,101 +12,108 @@ def main():
     if not shutil.which('MP4Box'):
         raise Exception('MP4Box is not on PATH')
     parser = argparse.ArgumentParser(
-        description = 'Download Apple Music songs/music videos/albums/playlists',
-        formatter_class = argparse.ArgumentDefaultsHelpFormatter
+        description='Download Apple Music songs/music videos/albums/playlists',
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     )
     parser.add_argument(
         'url',
-        help = 'Apple Music song/music video/album/playlist URL(s)',
-        nargs = '*'
+        help='Apple Music song/music video/album/playlist URL(s)',
+        nargs='*',
     )
     parser.add_argument(
         '-u',
         '--urls-txt',
-        help = 'Read URLs from a text file',
-        nargs = '?'
+        help='Read URLs from a text file',
+        nargs='?',
     )
     parser.add_argument(
-        '-d',
-        '--device-path',
-        default = '.',
-        help = 'Widevine L3 device keys path'
+        '-w',
+        '--wvd-location',
+        default='./*.wvd',
+        help='.wvd file location (ignored if using -l/--lrc-only)',
     )
     parser.add_argument(
         '-f',
         '--final-path',
-        default = 'Apple Music',
-        help = 'Final Path'
+        default='./Apple Music',
+        help='Final Path',
     )
     parser.add_argument(
         '-t',
         '--temp-path',
-        default = 'temp',
-        help = 'Temp Path'
+        default='./temp',
+        help='Temp Path',
     )
     parser.add_argument(
         '-c',
         '--cookies-location',
-        default = 'cookies.txt',
-        help = 'Cookies location'
+        default='./cookies.txt',
+        help='Cookies location',
     )
     parser.add_argument(
         '-m',
         '--disable-music-video-skip',
-        action = 'store_true',
-        help = 'Disable music video skip on playlists/albums'
+        action='store_true',
+        help='Disable music video skip on playlists/albums',
     )
     parser.add_argument(
         '-p',
         '--prefer-hevc',
-        action = 'store_true',
-        help = 'Prefer HEVC over AVC'
+        action='store_true',
+        help='Prefer HEVC over AVC',
+    )
+    parser.add_argument(
+        '-o',
+        '--overwrite',
+        action='store_true',
+        help='Overwrite existing files',
     )
     parser.add_argument(
         '-n',
         '--no-lrc',
-        action = 'store_true',
-        help = "Don't create .lrc file"
+        action='store_true',
+        help="Don't create .lrc file (ignored if using -l/--lrc-only)",
+    )
+    parser.add_argument(
+        '-l',
+        '--lrc-only',
+        action='store_true',
+        help='Skip downloading songs and only create .lrc files'
     )
     parser.add_argument(
         '-s',
         '--skip-cleanup',
-        action = 'store_true',
-        help = 'Skip cleanup'
+        action='store_true',
+        help='Skip cleanup',
     )
     parser.add_argument(
         '-e',
         '--print-exceptions',
-        action = 'store_true',
-        help = 'Print execeptions'
-    )
-    parser.add_argument(
-        '-y',
-        '--print-video-playlist',
-        action = 'store_true',
-        help = 'Print Video M3U8 Playlist'
+        action='store_true',
+        help='Print execeptions',
     )
     parser.add_argument(
         '-v',
         '--version',
-        action = 'version',
-        version = f'%(prog)s {__version__}'
+        action='version',
+        version=f'%(prog)s {__version__}',
     )
     args = parser.parse_args()
     if not args.url and not args.urls_txt:
         parser.error('you must specify an url or a text file using -u/--urls-txt')
     if args.urls_txt:
-        with open(args.urls_txt, 'r', encoding = 'utf8') as f:
+        with open(args.urls_txt, 'r', encoding='utf8') as f:
             args.url = f.read().splitlines()
     dl = Gamdl(
-        args.device_path,
+        args.wvd_location,
         args.cookies_location,
         args.disable_music_video_skip,
         args.prefer_hevc,
         args.temp_path,
         args.final_path,
-        args.no_lrc,
-        args.skip_cleanup
+        args.lrc_only,
+        args.overwrite,
+        args.skip_cleanup,
     )
     error_count = 0
     download_queue = []
@@ -117,56 +124,63 @@ 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):
         for j, track in enumerate(url):
-            print(f'Downloading "{track["attributes"]["name"]}" (track {j + 1} from URL {i + 1})...')
+            print(f'Downloading "{track["attributes"]["name"]}" (track {j + 1}/{len(url)} from URL {i + 1}/{len(download_queue)})')
             track_id = track['id']
             try:
                 webplayback = dl.get_webplayback(track_id)
                 if track['type'] == 'music-videos':
-                    playlist = dl.get_playlist_music_video(webplayback)
-                    if args.print_video_playlist:
-                        print(playlist.dumps())
-                    stream_url_audio = dl.get_stream_url_music_video_audio(playlist)
+                    tags = dl.get_tags_music_video(track['attributes']['url'].split('/')[-1].split('?')[0])
+                    final_location = dl.get_final_location('.m4v', tags)
+                    if final_location.exists() and not args.overwrite:
+                        continue
+                    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)
                     decrypted_location_video = dl.get_decrypted_location_video(track_id)
                     dl.decrypt(encrypted_location_video, decrypted_location_video, decryption_keys_video)
-                    tags = dl.get_tags_music_video(track['attributes']['url'].split('/')[-1])
                     fixed_location = dl.get_fixed_location(track_id, '.m4v')
-                    final_location = dl.get_final_location('.m4v', tags)
                     dl.fixup_music_video(decrypted_location_audio, decrypted_location_video, fixed_location)
-                    dl.make_final(final_location, fixed_location, tags)
+                    final_location.parent.mkdir(parents=True, exist_ok=True)
+                    dl.move_final(final_location, fixed_location, tags)
                 else:
+                    unsynced_lyrics, synced_lyrics = dl.get_lyrics(track_id)
+                    tags = dl.get_tags_song(webplayback, unsynced_lyrics)
+                    final_location = dl.get_final_location('.m4a', tags)
+                    if args.lrc_only:
+                        final_location.parent.mkdir(parents=True, exist_ok=True)
+                        dl.make_lrc(final_location, synced_lyrics)
+                        continue
+                    if final_location.exists() and not args.overwrite:
+                        continue
                     stream_url = dl.get_stream_url_song(webplayback)
                     decryption_keys = dl.get_decryption_keys_song(stream_url, track_id)
                     encrypted_location = dl.get_encrypted_location_audio(track_id)
                     dl.download(encrypted_location, stream_url)
                     decrypted_location = dl.get_decrypted_location_audio(track_id)
                     dl.decrypt(encrypted_location, decrypted_location, decryption_keys)
-                    unsynced_lyrics, synced_lyrics = dl.get_lyrics(track_id)
-                    tags = dl.get_tags_song(webplayback, unsynced_lyrics, track['attributes']['genreNames'][0])
                     fixed_location = dl.get_fixed_location(track_id, '.m4a')
-                    final_location = dl.get_final_location('.m4a', tags)
                     dl.fixup_song(decrypted_location, fixed_location)
-                    dl.make_final(final_location, fixed_location, tags)
-                    dl.make_lrc(final_location, synced_lyrics)
+                    final_location.parent.mkdir(parents=True, exist_ok=True)
+                    dl.move_final(final_location, fixed_location, tags)
+                    if not args.no_lrc:
+                        dl.make_lrc(final_location, synced_lyrics)
             except KeyboardInterrupt:
                 exit(1)
             except:
                 error_count += 1
-                print(f'* Failed to download "{track["attributes"]["name"]}" (track {j + 1} from URL {i + 1}).')
+                print(f'Failed to download "{track["attributes"]["name"]}" (track {j + 1}/{len(url)} from URL {i + 1}/{len(download_queue)})')
                 if args.print_exceptions:
                     traceback.print_exc()
             dl.cleanup()
-    print(f'Done ({error_count} error(s)).')
+    print(f'Done ({error_count} error(s))')

gamdl/gamdl.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+import glob
 from http.cookiejar import MozillaCookieJar
 import re
 import base64
@@ -8,37 +9,30 @@ 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, device_path, cookies_location, disable_music_video_skip, prefer_hevc, temp_path, final_path, no_lrc, skip_cleanup):
+    def __init__(self, wvd_location, cookies_location, disable_music_video_skip, prefer_hevc, temp_path, final_path, lrc_only, overwrite, skip_cleanup):
         self.disable_music_video_skip = disable_music_video_skip
         self.prefer_hevc = prefer_hevc
         self.temp_path = Path(temp_path)
         self.final_path = Path(final_path)
-        self.no_lrc = no_lrc
+        self.overwrite = overwrite
         self.skip_cleanup = skip_cleanup
-        with open(Path(device_path) / 'device_client_id_blob', 'rb') as client_id, open(Path(device_path) / 'device_private_key', 'rb') as private_key:
-            self.cdm = Cdm.from_device(
-                Device(
-                    type_ = 'ANDROID',
-                    security_level = 3,
-                    flags = None,
-                    private_key = private_key.read(),
-                    client_id = client_id.read()
-                )
-            )
-        self.cdm_session = self.cdm.open()
-        cookies = MozillaCookieJar(Path(cookies_location))
-        cookies.load(ignore_discard = True, ignore_expires = True)
+        self.lrc_only = lrc_only
+        if not self.lrc_only:
+            wvd_location = glob.glob(wvd_location)
+            if not wvd_location:
+                raise Exception('.wvd file not found')
+            self.cdm = Cdm.from_device(Device.load(wvd_location[0]))
+            self.cdm_session = self.cdm.open()
+        cookies = MozillaCookieJar(cookies_location)
+        cookies.load(ignore_discard=True, ignore_expires=True)
         self.session = requests.Session()
         self.session.cookies.update(cookies)
         self.session.headers.update({
@@ -54,11 +48,11 @@ 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)
-        index_js_page = self.session.get(f'https://beta.music.apple.com/assets/index.{index_js_uri}.js').text
+        index_js_uri = re.search(r"/assets/index-legacy-[^/]+\.js", web_page).group(0)
+        index_js_page = self.session.get(f'https://beta.music.apple.com{index_js_uri}').text
         token = re.search('(?=eyJh)(.*?)(?=")', index_js_page).group(1)
         self.session.headers.update({"authorization": f'Bearer {token}'})
         self.country = self.session.cookies.get_dict()['itua']
@@ -68,13 +62,15 @@ class Gamdl:
     def get_download_queue(self, url):
         download_queue = []
         product_id = url.split('/')[-1].split('i=')[-1].split('&')[0].split('?')[0]
-        response = self.session.get(f'https://amp-api.music.apple.com/v1/catalog/{self.country}/?ids[songs]={product_id}&ids[albums]={product_id}&ids[playlists]={product_id}&ids[music-videos]={product_id}&l=en').json()['data'][0]
-        if response['type'] in ('songs', 'music-videos') and 'playParams' in response['attributes']:
+        response = self.session.get(f'https://amp-api.music.apple.com/v1/catalog/{self.country}/?ids[songs]={product_id}&ids[albums]={product_id}&ids[playlists]={product_id}&ids[music-videos]={product_id}').json()['data'][0]
+        if response['type'] == 'songs' and 'playParams' in response['attributes']:
+            download_queue.append(response)
+        if response['type'] == 'music-videos' and 'playParams' in response['attributes'] and not self.lrc_only:
             download_queue.append(response)
         if response['type'] == 'albums' or response['type'] == 'playlists':
             for track in response['relationships']['tracks']['data']:
                 if 'playParams' in track['attributes']:
-                    if track['type'] == 'music-videos' and self.disable_music_video_skip:
+                    if track['type'] == 'music-videos' and self.disable_music_video_skip and not self.lrc_only:
                         download_queue.append(track)
                     if track['type'] == 'songs':
                         download_queue.append(track)
@@ -87,29 +83,30 @@ class Gamdl:
         response = self.session.post(
             'https://play.itunes.apple.com/WebObjects/MZPlay.woa/wa/webPlayback',
             json = {
-                'salableAdamId': track_id
+                'salableAdamId': track_id,
+                '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"] == '28:ctrp256')['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 'audio-stereo-256' in i['format_id'])
+        return stream_url_video, stream_url_audio
     
 
     def get_encrypted_location_video(self, track_id):
@@ -139,8 +136,8 @@ class Gamdl:
             'outtmpl': str(encrypted_location),
             'allow_unplayable_formats': True,
             'fixup': 'never',
-            'overwrites': True,
-            'external_downloader': 'aria2c'
+            'overwrites': self.overwrite,
+            'external_downloader': 'aria2c',
         }) as ydl:
             ydl.download(stream_url)
     
@@ -154,7 +151,7 @@ class Gamdl:
                 'uri': track_uri,
                 'adamId': track_id,
                 'isLibrary': False,
-                'user-initiated': True
+                'user-initiated': True,
             }
         ).json()['license']
 
@@ -163,7 +160,7 @@ class Gamdl:
         playlist = m3u8.load(stream_url)
         track_uri = next(i for i in playlist.keys if i.keyformat == "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed").uri
         pssh = PSSH(track_uri.split(',')[1])
-        challenge = base64.b64encode(self.cdm.get_license_challenge(self.cdm_session, pssh)).decode('utf-8')
+        challenge = base64.b64encode(self.cdm.get_license_challenge(self.cdm_session, pssh)).decode()
         license_b64 = self.get_license_b64(challenge, track_uri, track_id)
         self.cdm.parse_license(self.cdm_session, license_b64)
         return f'1:{next(i for i in self.cdm.get_keys(self.cdm_session) if i.type == "CONTENT").key.hex()}'
@@ -171,11 +168,11 @@ class Gamdl:
     
     def get_decryption_keys_song(self, stream_url, track_id):
         track_uri = m3u8.load(stream_url).keys[0].uri
-        wvpsshdata = WidevinePsshData()
-        wvpsshdata.algorithm = 1
-        wvpsshdata.key_ids.append(base64.b64decode(track_uri.split(",")[1]))
-        pssh = PSSH(base64.b64encode(wvpsshdata.SerializeToString()).decode('utf-8'))
-        challenge = base64.b64encode(self.cdm.get_license_challenge(self.cdm_session, pssh)).decode('utf-8')
+        widevine_pssh_data = WidevinePsshData()
+        widevine_pssh_data.algorithm = 1
+        widevine_pssh_data.key_ids.append(base64.b64decode(track_uri.split(",")[1]))
+        pssh = PSSH(base64.b64encode(widevine_pssh_data.SerializeToString()).decode())
+        challenge = base64.b64encode(self.cdm.get_license_challenge(self.cdm_session, pssh)).decode()
         license_b64 = self.get_license_b64(challenge, track_uri, track_id)
         self.cdm.parse_license(self.cdm_session, license_b64)
         return f'1:{next(i for i in self.cdm.get_keys(self.cdm_session) if i.type == "CONTENT").key.hex()}'
@@ -188,29 +185,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):
@@ -235,12 +230,12 @@ class Gamdl:
         return requests.get(url).content
     
 
-    def get_tags_song(self, webplayback, unsynced_lyrics, genre):
-        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']
+    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'].replace('600x600bb', '1200x1200bb')
         tags = {
             '\xa9nam': [metadata['itemName']],
-            '\xa9gen': [genre],
+            '\xa9gen': [metadata['genre']],
             'aART': [metadata['playlistArtistName']],
             '\xa9alb': [metadata['playlistName']],
             'soar': [metadata['sort-artist']],
@@ -257,8 +252,8 @@ class Gamdl:
             'cpil': metadata['compilation'],
             'disk': [(metadata['discNumber'], metadata['discCount'])],
             'trkn': [(metadata['trackNumber'], metadata['trackCount'])],
-            'covr': [MP4Cover(self.get_cover(cover_url), MP4Cover.FORMAT_JPEG)],
-            'stik': [1]
+            'covr': [MP4Cover(self.get_cover(cover_url))],
+            'stik': [1],
         }
         if 'copyright' in metadata:
             tags['cprt'] = [metadata['copyright']]
@@ -278,21 +273,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', '1280x720bb.jpg')))],
         }
+        if 'copyright' in extra_metadata:
+            tags['cprt'] = [extra_metadata['copyright']]
         if metadata[0]['trackExplicitness'] == 'notExplicit':
             tags['rtng'] = [0]
         elif metadata[0]['trackExplicitness'] == 'explicit':
@@ -309,11 +305,10 @@ class Gamdl:
 
 
     def get_sanizated_string(self, dirty_string, is_folder):
-        for character in ['\\', '/', ':', '*', '?', '"', '<', '>', '|', ';']:
-            dirty_string = dirty_string.replace(character, '_')
+        dirty_string = re.sub(r'[\\/:\*\?"<>\|;]', '_', dirty_string)
         if is_folder:
             dirty_string = dirty_string[:40]
-            if dirty_string[-1:] == '.':
+            if dirty_string.endswith('.') == '.':
                 dirty_string = dirty_string[:-1] + '_'
         else:
             dirty_string = dirty_string[:36]
@@ -345,7 +340,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
@@ -363,9 +358,10 @@ class Gamdl:
                 decrypted_location_video,
                 '-itags',
                 'artist=placeholder',
-                fixed_location
+                '-new',
+                fixed_location,
             ],
-            check = True
+            check=True
         )
     
 
@@ -378,27 +374,26 @@ class Gamdl:
                 decrypted_location,
                 '-itags',
                 'artist=placeholder',
-                fixed_location
+                '-new',
+                fixed_location,
             ],
-            check = True
+            check=True
         )
     
 
     def make_lrc(self, final_location, synced_lyrics):
-        if synced_lyrics and not self.no_lrc:
-            with open(final_location.with_suffix('.lrc'), 'w', encoding = 'utf8') as f:
+        if synced_lyrics:
+            with open(final_location.with_suffix('.lrc'), 'w', encoding='utf8') as f:
                 f.write(synced_lyrics)
     
 
-    def make_final(self, final_location, fixed_location, tags):
-        final_location.parent.mkdir(parents = True, exist_ok = True)
-        shutil.copy(fixed_location, final_location)
-        file = MP4(final_location).tags
+    def move_final(self, final_location, fixed_location, tags):
+        shutil.move(fixed_location, final_location)
+        file = MP4(final_location)
         file.update(tags)
-        file.save(final_location)
+        file.save()
     
 
     def cleanup(self):
         if self.temp_path.exists() and not self.skip_cleanup:
             shutil.rmtree(self.temp_path)
-