From 71104a7a8c1a06cdeef5e97411cee4ba9cd7f18b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20R=C3=A4diker?= Date: Sat, 28 Oct 2023 13:51:45 +0200 Subject: [PATCH] Add 1989 TV Deluxe and remove prerelease --- scripts/fetchTaylorAlbums.ts | 2 + scripts/find_taylorsversions.ipynb | 51 +++--- scripts/run/find_log.txt | 198 +++++++++++++++------- src/app/playlisteditor/PlaylistEditor.tsx | 4 +- src/app/taylorsversions.json | 56 +++--- src/app/taylorsversions_prerelease.json | 76 +-------- src/types.ts | 2 +- 7 files changed, 211 insertions(+), 178 deletions(-) diff --git a/scripts/fetchTaylorAlbums.ts b/scripts/fetchTaylorAlbums.ts index 16c9572..6eadf55 100644 --- a/scripts/fetchTaylorAlbums.ts +++ b/scripts/fetchTaylorAlbums.ts @@ -81,6 +81,8 @@ for (const id of [ "1iZR600UW2HCS3L7p5kNB8", // Fearless (Taylor’s Version): The I Remember What You Said Last Night Chapter "0XCoR1j5Sa2su9uDS9AScR", + // If This Was A Movie (Taylor’s Version) + "6IZm7NfvWyXp952VF36Z5F", // Red (Taylor’s Version): Could You Be The One Chapter "1ZkjQ4WBB99Rq5eFGqENNX", // Red (Taylor’s Version): She Wrote A Song About Me Chapter diff --git a/scripts/find_taylorsversions.ipynb b/scripts/find_taylorsversions.ipynb index 92b9e4e..e90db68 100644 --- a/scripts/find_taylorsversions.ipynb +++ b/scripts/find_taylorsversions.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 8, + "execution_count": 17, "metadata": {}, "outputs": [], "source": [ @@ -12,7 +12,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 18, "metadata": {}, "outputs": [], "source": [ @@ -98,7 +98,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 19, "metadata": {}, "outputs": [], "source": [ @@ -111,19 +111,19 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 20, "metadata": {}, "outputs": [], "source": [ "# load manual prerelease album data\n", - "with open(\"prereleases.json\", \"r\") as f:\n", - " _prereleases = json.load(f)\n", - "albums.extend(Album.from_prerelease(p) for p in _prereleases)" + "#with open(\"prereleases.json\", \"r\") as f:\n", + "# _prereleases = json.load(f)\n", + "#albums.extend(Album.from_prerelease(p) for p in _prereleases)" ] }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 21, "metadata": {}, "outputs": [], "source": [ @@ -134,7 +134,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 22, "metadata": {}, "outputs": [ { @@ -146,8 +146,8 @@ "No stolen found: Safe & Sound (feat. Joy Williams and John Paul White) (Taylor’s Version) (normalized: Safe & Sound)\n", "No stolen found: Safe & Sound (feat. Joy Williams and John Paul White) (Taylor’s Version) (normalized: Safe & Sound)\n", "No stolen found: Eyes Open (Taylor's Version) (normalized: Eyes Open)\n", - "Not using Acoustic filter, no TVs left: Track(name='Back To December - Acoustic', album=Album(name='Speak Now (Deluxe Edition)', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='5EpMjweRD573ASl7uNiHym', prerelease_image=None, prerelease_link=None), isrc='USCJY1003672', id='6IH2Z54gYPLqgJtxZjX80i', uri='spotify:track:6IH2Z54gYPLqgJtxZjX80i', stolen=set(), tvs={Track(name=\"Back To December (Taylor's Version)\", album=Album(name=\"Speak Now (Taylor's Version)\", is_prerelease=False, release_date='2023-07-07', group='album', type='album', id='5AEDGbliTTfjOB8TSm1sxt', prerelease_image=None, prerelease_link=None), isrc='USUG12302075', id='79uDOz0zuuWS7HWxzMmTa2', uri='spotify:track:79uDOz0zuuWS7HWxzMmTa2', stolen={Track(name=\"Back To December/Apologize/You're Not Sorry - Live/2011/Medley\", album=Album(name='Speak Now World Tour Live', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='6fyR4wBPwLHKcRtxgd4sGh', prerelease_image=None, prerelease_link=None), isrc='USCJY1103921', id='1IsquhJFJ0qcFZI7FeAEuN', uri='spotify:track:1IsquhJFJ0qcFZI7FeAEuN', stolen=set(), tvs={...}, sorted_tvs=[...]), ..., Track(name='Back To December', album=Album(name='Speak Now', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='5MfAxS5zz8MlfROjGQVXhy', prerelease_image=None, prerelease_link=None), isrc='USCJY1003657', id='3DrjZArsPsoqbLzUZZV1Id', uri='spotify:track:3DrjZArsPsoqbLzUZZV1Id', stolen=set(), tvs={...}, sorted_tvs=[]), Track(name='Back To December', album=Album(name='Speak Now (Deluxe Edition)', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='5EpMjweRD573ASl7uNiHym', prerelease_image=None, prerelease_link=None), isrc='USCJY1003657', id='7lxADouiWFkwR7ZV2GKUcH', uri='spotify:track:7lxADouiWFkwR7ZV2GKUcH', stolen=set(), tvs={...}, sorted_tvs=[...])}, tvs=set(), sorted_tvs=[])}, sorted_tvs=[])\n", - "Not using Acoustic filter, no TVs left: Track(name='Haunted - Acoustic Version', album=Album(name='Speak Now (Deluxe Edition)', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='5EpMjweRD573ASl7uNiHym', prerelease_image=None, prerelease_link=None), isrc='USCJY1003673', id='62rlxI6g2PNaWsHoiRryto', uri='spotify:track:62rlxI6g2PNaWsHoiRryto', stolen=set(), tvs={Track(name=\"Haunted (Taylor's Version)\", album=Album(name=\"Speak Now (Taylor's Version)\", is_prerelease=False, release_date='2023-07-07', group='album', type='album', id='5AEDGbliTTfjOB8TSm1sxt', prerelease_image=None, prerelease_link=None), isrc='USUG12302084', id='4tMzIAFTFdqGBQLdfbPces', uri='spotify:track:4tMzIAFTFdqGBQLdfbPces', stolen={Track(name='Haunted', album=Album(name='Speak Now (Deluxe Edition)', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='5EpMjweRD573ASl7uNiHym', prerelease_image=None, prerelease_link=None), isrc='USCJY1003666', id='11UaQaEp2LvdspTyyuE3ur', uri='spotify:track:11UaQaEp2LvdspTyyuE3ur', stolen=set(), tvs={...}, sorted_tvs=[...]), Track(name='Haunted', album=Album(name='reputation Stadium Tour Surprise Song Playlist', is_prerelease=False, release_date='2017-11-09', group='album', type='album', id='1MPAXuTVL2Ej5x0JHiSPq8', prerelease_image=None, prerelease_link=None), isrc='USCJY1003666', id='6CB7DczrX9ZJB9Wkjegmaq', uri='spotify:track:6CB7DczrX9ZJB9Wkjegmaq', stolen=set(), tvs={...}, sorted_tvs=[...]), ..., Track(name='Haunted', album=Album(name='Speak Now', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='5MfAxS5zz8MlfROjGQVXhy', prerelease_image=None, prerelease_link=None), isrc='USCJY1003666', id='28M2gifMU282QBM3fKajIS', uri='spotify:track:28M2gifMU282QBM3fKajIS', stolen=set(), tvs={...}, sorted_tvs=[]), Track(name='Haunted - Live/2011', album=Album(name='Speak Now World Tour Live', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='6fyR4wBPwLHKcRtxgd4sGh', prerelease_image=None, prerelease_link=None), isrc='USCJY1103930', id='6znB7YZhMJT2B83zfbiyLq', uri='spotify:track:6znB7YZhMJT2B83zfbiyLq', stolen=set(), tvs={...}, sorted_tvs=[...])}, tvs=set(), sorted_tvs=[])}, sorted_tvs=[])\n" + "Not using Acoustic filter, no TVs left: Track(name='Back To December - Acoustic', album=Album(name='Speak Now (Deluxe Edition)', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='5EpMjweRD573ASl7uNiHym', prerelease_image=None, prerelease_link=None), isrc='USCJY1003672', id='6IH2Z54gYPLqgJtxZjX80i', uri='spotify:track:6IH2Z54gYPLqgJtxZjX80i', stolen=set(), tvs={Track(name=\"Back To December (Taylor's Version)\", album=Album(name=\"Speak Now (Taylor's Version)\", is_prerelease=False, release_date='2023-07-07', group='album', type='album', id='5AEDGbliTTfjOB8TSm1sxt', prerelease_image=None, prerelease_link=None), isrc='USUG12302075', id='79uDOz0zuuWS7HWxzMmTa2', uri='spotify:track:79uDOz0zuuWS7HWxzMmTa2', stolen={Track(name='Back To December', album=Album(name='Speak Now', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='5MfAxS5zz8MlfROjGQVXhy', prerelease_image=None, prerelease_link=None), isrc='USCJY1003657', id='3DrjZArsPsoqbLzUZZV1Id', uri='spotify:track:3DrjZArsPsoqbLzUZZV1Id', stolen=set(), tvs={...}, sorted_tvs=[]), Track(name='Back To December', album=Album(name='Speak Now (Deluxe Edition)', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='5EpMjweRD573ASl7uNiHym', prerelease_image=None, prerelease_link=None), isrc='USCJY1003657', id='7lxADouiWFkwR7ZV2GKUcH', uri='spotify:track:7lxADouiWFkwR7ZV2GKUcH', stolen=set(), tvs={...}, sorted_tvs=[...]), Track(name=\"Back To December/Apologize/You're Not Sorry - Live/2011/Medley\", album=Album(name='Speak Now World Tour Live', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='6fyR4wBPwLHKcRtxgd4sGh', prerelease_image=None, prerelease_link=None), isrc='USCJY1103921', id='1IsquhJFJ0qcFZI7FeAEuN', uri='spotify:track:1IsquhJFJ0qcFZI7FeAEuN', stolen=set(), tvs={...}, sorted_tvs=[...]), ...}, tvs=set(), sorted_tvs=[])}, sorted_tvs=[])\n", + "Not using Acoustic filter, no TVs left: Track(name='Haunted - Acoustic Version', album=Album(name='Speak Now (Deluxe Edition)', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='5EpMjweRD573ASl7uNiHym', prerelease_image=None, prerelease_link=None), isrc='USCJY1003673', id='62rlxI6g2PNaWsHoiRryto', uri='spotify:track:62rlxI6g2PNaWsHoiRryto', stolen=set(), tvs={Track(name=\"Haunted (Taylor's Version)\", album=Album(name=\"Speak Now (Taylor's Version)\", is_prerelease=False, release_date='2023-07-07', group='album', type='album', id='5AEDGbliTTfjOB8TSm1sxt', prerelease_image=None, prerelease_link=None), isrc='USUG12302084', id='4tMzIAFTFdqGBQLdfbPces', uri='spotify:track:4tMzIAFTFdqGBQLdfbPces', stolen={Track(name='Haunted - Live/2011', album=Album(name='Speak Now World Tour Live', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='6fyR4wBPwLHKcRtxgd4sGh', prerelease_image=None, prerelease_link=None), isrc='USCJY1103930', id='6znB7YZhMJT2B83zfbiyLq', uri='spotify:track:6znB7YZhMJT2B83zfbiyLq', stolen=set(), tvs={...}, sorted_tvs=[...]), ..., Track(name='Haunted', album=Album(name='Speak Now', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='5MfAxS5zz8MlfROjGQVXhy', prerelease_image=None, prerelease_link=None), isrc='USCJY1003666', id='28M2gifMU282QBM3fKajIS', uri='spotify:track:28M2gifMU282QBM3fKajIS', stolen=set(), tvs={...}, sorted_tvs=[]), Track(name='Haunted', album=Album(name='Speak Now (Deluxe Edition)', is_prerelease=False, release_date='2010-10-25', group='album', type='album', id='5EpMjweRD573ASl7uNiHym', prerelease_image=None, prerelease_link=None), isrc='USCJY1003666', id='11UaQaEp2LvdspTyyuE3ur', uri='spotify:track:11UaQaEp2LvdspTyyuE3ur', stolen=set(), tvs={...}, sorted_tvs=[...]), Track(name='Haunted', album=Album(name='reputation Stadium Tour Surprise Song Playlist', is_prerelease=False, release_date='2017-11-09', group='album', type='album', id='1MPAXuTVL2Ej5x0JHiSPq8', prerelease_image=None, prerelease_link=None), isrc='USCJY1003666', id='6CB7DczrX9ZJB9Wkjegmaq', uri='spotify:track:6CB7DczrX9ZJB9Wkjegmaq', stolen=set(), tvs={...}, sorted_tvs=[...])}, tvs=set(), sorted_tvs=[])}, sorted_tvs=[])\n" ] } ], @@ -182,9 +182,22 @@ "\n", " for stolen in tracks:\n", " stolen_name = normalize_name(stolen.name)\n", - " if (stolen_name.startswith(song_name)\n", + " if (\n", + " stolen_name.startswith(song_name)\n", " and \" Version)\" not in stolen_name # Version) also catches ATW versions\n", " and \"Voice Memo\" not in stolen_name # 1989 (Deluxe Edition) Voice Memos\n", + "\n", + " # Bad Blood (feat. Kendrick Lamar): og is called \"Bad Blood\"\n", + " # exclude TVs without feature:\n", + " and (\n", + " stolen.id != \"6xsEAm6w9oMQYYg3jkEkMT\"\n", + " or \"(feat. Kendrick Lamar)\" in track.name\n", + " )\n", + " # exclude TV feature from og\n", + " and (\n", + " not (\"Bad Blood\" in song_name and stolen.id != \"6xsEAm6w9oMQYYg3jkEkMT\")\n", + " or \"(feat. Kendrick Lamar)\" not in track.name\n", + " )\n", " ):\n", " track.stolen.add(stolen)\n", " stolen.tvs.add(track)\n", @@ -215,7 +228,6 @@ " # ATWTMVTSF second to last\n", " \"(10 Minute Version) (The Short Film)\" not in tv.name,\n", "\n", - "\n", " # exact title matches first\n", " song_name == remove_parens(normalize_name(tv.name)),\n", " # prefer non-remix (e.g. \"Love Story (Taylor's Version)\" over \"Love Story (Taylor's Version) [Elvira Remix]\")\n", @@ -254,11 +266,8 @@ " }\n", " if \"- live\" in stolen.name.lower():\n", " tvs[stolen.isrc][\"isLive\"] = True\n", - " if (\"remix\" in stolen.name.lower() \n", - " # Bad Blood (feat. Kendrick Lamar), as long as no TV is available\n", - " or stolen.id == \"6xsEAm6w9oMQYYg3jkEkMT\"\n", - " ):\n", - " tvs[stolen.isrc][\"isRemix\"] = True\n", + " if \"remix\" in stolen.name.lower():\n", + " tvs[stolen.isrc][\"isRemixWithoutTV\"] = True\n", " if \"acoustic\" in stolen.name.lower() and \"acoustic\" not in stolen.sorted_tvs[0].name.lower():\n", " tvs[stolen.isrc][\"isAcousticWithoutTV\"] = True\n", " if \"demo\" in stolen.name.lower():\n", @@ -288,7 +297,7 @@ " for track in album.tracks:\n", " print(track.name, file=f)\n", " if track.isrc in tvs:\n", - " for tag in (\"isLive\", \"isRemix\", \"isAcousticWithoutTV\", \"isDemoWithoutTV\", \"isMixWithoutTV\"):\n", + " for tag in (\"isLive\", \"isRemixWithoutTV\", \"isAcousticWithoutTV\", \"isDemoWithoutTV\", \"isMixWithoutTV\"):\n", " if tag in tvs[track.isrc]:\n", " print(\" \", tag, file=f)\n", " for tv in track.sorted_tvs:\n", @@ -305,7 +314,7 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 23, "metadata": {}, "outputs": [], "source": [ @@ -335,7 +344,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 24, "metadata": {}, "outputs": [], "source": [ diff --git a/scripts/run/find_log.txt b/scripts/run/find_log.txt index e5e6a7a..5626276 100644 --- a/scripts/run/find_log.txt +++ b/scripts/run/find_log.txt @@ -1,3 +1,99 @@ +### 1989 (Taylor's Version) [Deluxe] + +Welcome To New York (Taylor's Version) + +Blank Space (Taylor's Version) + +Style (Taylor's Version) + +Out Of The Woods (Taylor's Version) + +All You Had To Do Was Stay (Taylor's Version) + +Shake It Off (Taylor's Version) + +I Wish You Would (Taylor's Version) + +Bad Blood (Taylor's Version) + +Wildest Dreams (Taylor's Version) + +How You Get The Girl (Taylor's Version) + +This Love (Taylor’s Version) + +I Know Places (Taylor's Version) + +Clean (Taylor's Version) + +Wonderland (Taylor's Version) + +You Are In Love (Taylor's Version) + +New Romantics (Taylor's Version) + +"Slut!" (Taylor's Version) (From The Vault) + +Say Don't Go (Taylor's Version) (From The Vault) + +Now That We Don't Talk (Taylor's Version) (From The Vault) + +Suburban Legends (Taylor's Version) (From The Vault) + +Is It Over Now? (Taylor's Version) (From The Vault) + +Bad Blood (feat. Kendrick Lamar) (Taylor's Version) + + + + +### 1989 (Taylor's Version) + +Welcome To New York (Taylor's Version) + +Blank Space (Taylor's Version) + +Style (Taylor's Version) + +Out Of The Woods (Taylor's Version) + +All You Had To Do Was Stay (Taylor's Version) + +Shake It Off (Taylor's Version) + +I Wish You Would (Taylor's Version) + +Bad Blood (Taylor's Version) + +Wildest Dreams (Taylor's Version) + +How You Get The Girl (Taylor's Version) + +This Love (Taylor’s Version) + +I Know Places (Taylor's Version) + +Clean (Taylor's Version) + +Wonderland (Taylor's Version) + +You Are In Love (Taylor's Version) + +New Romantics (Taylor's Version) + +"Slut!" (Taylor's Version) (From The Vault) + +Say Don't Go (Taylor's Version) (From The Vault) + +Now That We Don't Talk (Taylor's Version) (From The Vault) + +Suburban Legends (Taylor's Version) (From The Vault) + +Is It Over Now? (Taylor's Version) (From The Vault) + + + + ### The Cruelest Summer Cruel Summer - Live from TS | The Eras Tour @@ -629,13 +725,6 @@ If This Was A Movie (Taylor’s Version) -### Mr. Perfectly Fine (Taylor’s Version) (From The Vault) - -Mr. Perfectly Fine (Taylor’s Version) (From The Vault) - - - - ### You All Over Me (feat. Maren Morris) (Taylor’s Version) (From The Vault) You All Over Me (feat. Maren Morris) (Taylor’s Version) (From The Vault) @@ -883,7 +972,7 @@ hoax ### You're Not Sorry (CSI Remix) You're Not Sorry - CSI Remix - isRemix + isRemixWithoutTV -> You’re Not Sorry (Taylor’s Version) • Fearless (Taylor's Version) -> You’re Not Sorry (Taylor’s Version) • Fearless (Taylor's Version): The Halfway Out The Door Chapter @@ -893,7 +982,7 @@ You're Not Sorry - CSI Remix ### Love Story (Digital Dog Remix) Love Story - Digital Dog Remix - isRemix + isRemixWithoutTV -> Love Story (Taylor’s Version) • Fearless (Taylor's Version) -> Love Story (Taylor’s Version) • Love Story (Taylor’s Version) -> Love Story (Taylor’s Version) • The More Fearless (Taylor’s Version) Chapter @@ -1068,6 +1157,7 @@ All Too Well Wildest Dreams -> Wildest Dreams (Taylor's Version) • 1989 (Taylor's Version) + -> Wildest Dreams (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] -> Wildest Dreams (Taylor's Version) • Wildest Dreams (Taylor's Version) -> Wildest Dreams (Taylor's Version) • This Love (Taylor’s Version) @@ -1105,6 +1195,7 @@ Mean How You Get The Girl -> How You Get The Girl (Taylor's Version) • 1989 (Taylor's Version) + -> How You Get The Girl (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] So It Goes... NO TVs @@ -1138,6 +1229,7 @@ Babe Welcome To New York -> Welcome To New York (Taylor's Version) • 1989 (Taylor's Version) + -> Welcome To New York (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Fearless -> Fearless (Taylor’s Version) • Fearless (Taylor's Version) @@ -1156,6 +1248,7 @@ Ours Out Of The Woods -> Out Of The Woods (Taylor's Version) • 1989 (Taylor's Version) + -> Out Of The Woods (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Come Back...Be Here -> Come Back...Be Here (Taylor's Version) • Red (Taylor's Version) @@ -1166,6 +1259,7 @@ A Place in this World This Love -> This Love (Taylor’s Version) • 1989 (Taylor's Version) + -> This Love (Taylor’s Version) • 1989 (Taylor's Version) [Deluxe] -> This Love (Taylor’s Version) • This Love (Taylor’s Version) The Lucky One @@ -1210,6 +1304,7 @@ Speak Now Wonderland -> Wonderland (Taylor's Version) • 1989 (Taylor's Version) + -> Wonderland (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] White Horse -> White Horse (Taylor’s Version) • Fearless (Taylor's Version) @@ -1225,6 +1320,7 @@ Starlight I Know Places -> I Know Places (Taylor's Version) • 1989 (Taylor's Version) + -> I Know Places (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] @@ -1232,8 +1328,7 @@ I Know Places ### Bad Blood Bad Blood - isRemix - -> Bad Blood (Taylor's Version) • 1989 (Taylor's Version) + -> Bad Blood (feat. Kendrick Lamar) (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] @@ -1241,8 +1336,9 @@ Bad Blood ### Wildest Dreams (R3hab Remix) Wildest Dreams - R3hab Remix - isRemix + isRemixWithoutTV -> Wildest Dreams (Taylor's Version) • 1989 (Taylor's Version) + -> Wildest Dreams (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] -> Wildest Dreams (Taylor's Version) • Wildest Dreams (Taylor's Version) -> Wildest Dreams (Taylor's Version) • This Love (Taylor’s Version) @@ -1253,54 +1349,70 @@ Wildest Dreams - R3hab Remix Welcome To New York -> Welcome To New York (Taylor's Version) • 1989 (Taylor's Version) + -> Welcome To New York (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Blank Space -> Blank Space (Taylor's Version) • 1989 (Taylor's Version) + -> Blank Space (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Style -> Style (Taylor's Version) • 1989 (Taylor's Version) + -> Style (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Out Of The Woods -> Out Of The Woods (Taylor's Version) • 1989 (Taylor's Version) + -> Out Of The Woods (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] All You Had To Do Was Stay -> All You Had To Do Was Stay (Taylor's Version) • 1989 (Taylor's Version) + -> All You Had To Do Was Stay (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Shake It Off -> Shake It Off (Taylor's Version) • 1989 (Taylor's Version) + -> Shake It Off (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] I Wish You Would -> I Wish You Would (Taylor's Version) • 1989 (Taylor's Version) + -> I Wish You Would (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Bad Blood -> Bad Blood (Taylor's Version) • 1989 (Taylor's Version) + -> Bad Blood (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Wildest Dreams -> Wildest Dreams (Taylor's Version) • 1989 (Taylor's Version) + -> Wildest Dreams (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] -> Wildest Dreams (Taylor's Version) • Wildest Dreams (Taylor's Version) -> Wildest Dreams (Taylor's Version) • This Love (Taylor’s Version) How You Get The Girl -> How You Get The Girl (Taylor's Version) • 1989 (Taylor's Version) + -> How You Get The Girl (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] This Love -> This Love (Taylor’s Version) • 1989 (Taylor's Version) + -> This Love (Taylor’s Version) • 1989 (Taylor's Version) [Deluxe] -> This Love (Taylor’s Version) • This Love (Taylor’s Version) I Know Places -> I Know Places (Taylor's Version) • 1989 (Taylor's Version) + -> I Know Places (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Clean -> Clean (Taylor's Version) • 1989 (Taylor's Version) + -> Clean (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Wonderland -> Wonderland (Taylor's Version) • 1989 (Taylor's Version) + -> Wonderland (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] You Are In Love -> You Are In Love (Taylor's Version) • 1989 (Taylor's Version) + -> You Are In Love (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] New Romantics -> New Romantics (Taylor's Version) • 1989 (Taylor's Version) + -> New Romantics (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] I Know Places - Voice Memo NO TVs @@ -1318,45 +1430,58 @@ Blank Space - Voice Memo Welcome To New York -> Welcome To New York (Taylor's Version) • 1989 (Taylor's Version) + -> Welcome To New York (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Blank Space -> Blank Space (Taylor's Version) • 1989 (Taylor's Version) + -> Blank Space (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Style -> Style (Taylor's Version) • 1989 (Taylor's Version) + -> Style (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Out Of The Woods -> Out Of The Woods (Taylor's Version) • 1989 (Taylor's Version) + -> Out Of The Woods (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] All You Had To Do Was Stay -> All You Had To Do Was Stay (Taylor's Version) • 1989 (Taylor's Version) + -> All You Had To Do Was Stay (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Shake It Off -> Shake It Off (Taylor's Version) • 1989 (Taylor's Version) + -> Shake It Off (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] I Wish You Would -> I Wish You Would (Taylor's Version) • 1989 (Taylor's Version) + -> I Wish You Would (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Bad Blood -> Bad Blood (Taylor's Version) • 1989 (Taylor's Version) + -> Bad Blood (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Wildest Dreams -> Wildest Dreams (Taylor's Version) • 1989 (Taylor's Version) + -> Wildest Dreams (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] -> Wildest Dreams (Taylor's Version) • Wildest Dreams (Taylor's Version) -> Wildest Dreams (Taylor's Version) • This Love (Taylor’s Version) How You Get The Girl -> How You Get The Girl (Taylor's Version) • 1989 (Taylor's Version) + -> How You Get The Girl (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] This Love -> This Love (Taylor’s Version) • 1989 (Taylor's Version) + -> This Love (Taylor’s Version) • 1989 (Taylor's Version) [Deluxe] -> This Love (Taylor’s Version) • This Love (Taylor’s Version) I Know Places -> I Know Places (Taylor's Version) • 1989 (Taylor's Version) + -> I Know Places (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] Clean -> Clean (Taylor's Version) • 1989 (Taylor's Version) + -> Clean (Taylor's Version) • 1989 (Taylor's Version) [Deluxe] @@ -1372,7 +1497,7 @@ Sweeter Than Fiction - From "One Chance" Soundtrack ### Everything Has Changed (Remix) Everything Has Changed - Remix - isRemix + isRemixWithoutTV -> Everything Has Changed (feat. Ed Sheeran) (Taylor’s Version) • Red (Taylor's Version) -> Everything Has Changed (feat. Ed Sheeran) (Taylor’s Version) • Red (Taylor’s Version): Could You Be The One Chapter @@ -2015,50 +2140,3 @@ Teardrops on My Guitar - Pop Version -### 1989 (Taylor's Version) - -Welcome To New York (Taylor's Version) - -Blank Space (Taylor's Version) - -Style (Taylor's Version) - -Out Of The Woods (Taylor's Version) - -All You Had To Do Was Stay (Taylor's Version) - -Shake It Off (Taylor's Version) - -I Wish You Would (Taylor's Version) - -Bad Blood (Taylor's Version) - -Wildest Dreams (Taylor's Version) - -How You Get The Girl (Taylor's Version) - -This Love (Taylor’s Version) - -I Know Places (Taylor's Version) - -Clean (Taylor's Version) - -Wonderland (Taylor's Version) - -You Are In Love (Taylor's Version) - -New Romantics (Taylor's Version) - -"Slut!" (Taylor's Version) (From The Vault) - -Say Don't Go (Taylor's Version) (From The Vault) - -Now That We Don't Talk (Taylor's Version) (From The Vault) - -Suburban Legends (Taylor's Version) (From The Vault) - -Is It Over Now? (Taylor's Version) (From The Vault) - - - - diff --git a/src/app/playlisteditor/PlaylistEditor.tsx b/src/app/playlisteditor/PlaylistEditor.tsx index b99b05b..45000e2 100644 --- a/src/app/playlisteditor/PlaylistEditor.tsx +++ b/src/app/playlisteditor/PlaylistEditor.tsx @@ -24,8 +24,8 @@ const SELECTION_CATEGORIES = [ }, { name: "replace-og-remixes", - label: "Replace original remixes", - predicate: (s: StolenVariants) => s.isRemix, + label: "Replace original remixes that don’t have a Taylor’s Version", + predicate: (s: StolenVariants) => s.isRemixWithoutTV, }, { name: "replace-og-special", diff --git a/src/app/taylorsversions.json b/src/app/taylorsversions.json index 176a6b6..be1acba 100644 --- a/src/app/taylorsversions.json +++ b/src/app/taylorsversions.json @@ -1,13 +1,13 @@ { "USCJY0903497": { - "isRemix": true, + "isRemixWithoutTV": true, "ids": [ "6iiAfo4wTA2CVC3Uwx9uh8", "5OTddcb28Mkays7lF8hnmf" ] }, "GBUM70900575": { - "isRemix": true, + "isRemixWithoutTV": true, "ids": [ "6YvqWjhGD8mB5QXcbcUKtx", "3CeCwYWvdfXbZLXFhBrbnf", @@ -39,6 +39,7 @@ "USCJY1431379": { "ids": [ "1K39ty6o1sHwwlZwO6a7wK", + "27exgla7YBw9DUNNcTIpjy", "1Ov37jtRQ2YNAe8HzfczkL", "1IxeJLsubGTboNN9K5XNfL" ] @@ -80,7 +81,8 @@ }, "USCJY1431389": { "ids": [ - "75W3SngKzTuoQ94uLf3y82" + "75W3SngKzTuoQ94uLf3y82", + "733OhaXQIHY7BKtY3vnSkn" ] }, "USCJY0803333": { @@ -123,7 +125,8 @@ }, "USCJY1431299": { "ids": [ - "1hR8BSuEqPCCZfv93zzzz9" + "1hR8BSuEqPCCZfv93zzzz9", + "4WUepByoeqcedHoYhSNHRt" ] }, "USCJY0803332": { @@ -151,7 +154,8 @@ }, "USCJY1431329": { "ids": [ - "045ZeOHPIzhxxsm8bq5kyE" + "045ZeOHPIzhxxsm8bq5kyE", + "1OcSfkeCg9hRC2sFKB4IMJ" ] }, "USCJY1231046": { @@ -163,6 +167,7 @@ "USCJY1431399": { "ids": [ "5QVVjX0ZItqlVpEuVCM9Yg", + "4WBEj8TeGtRPNJdOmT3WJW", "4d1CG5ei1E2vGbvmgf5KKv" ] }, @@ -215,7 +220,8 @@ }, "USCJY1431429": { "ids": [ - "2ve0kuaWUCt4Zx8x4bf1MR" + "2ve0kuaWUCt4Zx8x4bf1MR", + "6HRsJu8vcnzYDN4t0570FY" ] }, "USCJY0803264": { @@ -233,70 +239,80 @@ }, "USCJY1431409": { "ids": [ - "2f0GI2ZLUtbGqFx8t2Gk6A" + "2f0GI2ZLUtbGqFx8t2Gk6A", + "1ULabO0PEsdJekqVH6G10G" ] }, "USCJY1531564": { - "isRemix": true, "ids": [ - "64FzgoLZ3oXu2SriZblHic" + "6qAcApH8obo8eqatCKUHd9" ] }, "USCJY1531577": { - "isRemix": true, + "isRemixWithoutTV": true, "ids": [ "1K39ty6o1sHwwlZwO6a7wK", + "27exgla7YBw9DUNNcTIpjy", "1Ov37jtRQ2YNAe8HzfczkL", "1IxeJLsubGTboNN9K5XNfL" ] }, "USCJY1431309": { "ids": [ - "45wMBGri1PORPjM9PwFfrS" + "45wMBGri1PORPjM9PwFfrS", + "0108kcWLnn2HlH2kedi1gn" ] }, "USCJY1431319": { "ids": [ - "1hjRhYpWyqDpPahmSlUTlc" + "1hjRhYpWyqDpPahmSlUTlc", + "3Vpk1hfMAQme8VJ0SNRSkd" ] }, "USCJY1431339": { "ids": [ - "6GXgd1BPD9bUpqw5AntGV5" + "6GXgd1BPD9bUpqw5AntGV5", + "2k0ZEeAqzvYMcx9Qt5aClQ" ] }, "USCJY1431349": { "ids": [ - "3pv7Q5v2dpdefwdWIvE7yH" + "3pv7Q5v2dpdefwdWIvE7yH", + "50yNTF0Od55qnHLxYsA5Pw" ] }, "USCJY1431359": { "ids": [ - "43y1WpBdnEy5TR9aZoSQL9" + "43y1WpBdnEy5TR9aZoSQL9", + "3FxJDucHWdw6caWTKO5b23" ] }, "USCJY1431369": { "ids": [ - "64FzgoLZ3oXu2SriZblHic" + "64FzgoLZ3oXu2SriZblHic", + "7oZONwFiFIErZcXAtTu7FY" ] }, "USCJY1431419": { "ids": [ - "2ByBBvpR9b7IynvRmnG7kG" + "2ByBBvpR9b7IynvRmnG7kG", + "0lKUBmEyQfzsQHozyeXzES" ] }, "USCJY1431439": { "ids": [ - "4UwqOWDpdeIDVQDuKT6iza" + "4UwqOWDpdeIDVQDuKT6iza", + "0TyGh27YQ5LknmiDhCzJiT" ] }, "USCJY1431449": { "ids": [ - "2vPMoMDXxu9uX1igWZmXSG" + "2vPMoMDXxu9uX1igWZmXSG", + "5M787RexsAiVYjQusM98CV" ] }, "USCJY1331285": { - "isRemix": true, + "isRemixWithoutTV": true, "ids": [ "7qEUFOVcxRI19tbT68JcYK", "4whBXdLvNueDBttTAVTEjW" diff --git a/src/app/taylorsversions_prerelease.json b/src/app/taylorsversions_prerelease.json index be06a71..cc173a1 100644 --- a/src/app/taylorsversions_prerelease.json +++ b/src/app/taylorsversions_prerelease.json @@ -1,76 +1,4 @@ { - "tracks": { - "1hR8BSuEqPCCZfv93zzzz9": { - "name": "Welcome To New York (Taylor's Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - }, - "45wMBGri1PORPjM9PwFfrS": { - "name": "Blank Space (Taylor's Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - }, - "1hjRhYpWyqDpPahmSlUTlc": { - "name": "Style (Taylor's Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - }, - "045ZeOHPIzhxxsm8bq5kyE": { - "name": "Out Of The Woods (Taylor's Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - }, - "6GXgd1BPD9bUpqw5AntGV5": { - "name": "All You Had To Do Was Stay (Taylor's Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - }, - "3pv7Q5v2dpdefwdWIvE7yH": { - "name": "Shake It Off (Taylor's Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - }, - "43y1WpBdnEy5TR9aZoSQL9": { - "name": "I Wish You Would (Taylor's Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - }, - "64FzgoLZ3oXu2SriZblHic": { - "name": "Bad Blood (Taylor's Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - }, - "1K39ty6o1sHwwlZwO6a7wK": { - "name": "Wildest Dreams (Taylor's Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - }, - "75W3SngKzTuoQ94uLf3y82": { - "name": "How You Get The Girl (Taylor's Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - }, - "5QVVjX0ZItqlVpEuVCM9Yg": { - "name": "This Love (Taylor\u2019s Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - }, - "2f0GI2ZLUtbGqFx8t2Gk6A": { - "name": "I Know Places (Taylor's Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - }, - "2ByBBvpR9b7IynvRmnG7kG": { - "name": "Clean (Taylor's Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - }, - "2ve0kuaWUCt4Zx8x4bf1MR": { - "name": "Wonderland (Taylor's Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - }, - "4UwqOWDpdeIDVQDuKT6iza": { - "name": "You Are In Love (Taylor's Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - }, - "2vPMoMDXxu9uX1igWZmXSG": { - "name": "New Romantics (Taylor's Version)", - "albumId": "64LU4c1nfjz1t4VnGhagcg" - } - }, - "albums": { - "64LU4c1nfjz1t4VnGhagcg": { - "name": "1989 (Taylor's Version)", - "releaseTime": "2023-10-27T04:00:00Z", - "image": "https://i.scdn.co/image/ab67616d0000b2735cc1de8fa9b7c2f27af04958", - "presaveLink": "https://open.spotify.com/prerelease/4bpd4VRmRpckdVU0su8LsM" - } - } + "tracks": {}, + "albums": {} } \ No newline at end of file diff --git a/src/types.ts b/src/types.ts index 5ef8bfd..d212808 100644 --- a/src/types.ts +++ b/src/types.ts @@ -26,7 +26,7 @@ export interface StolenVariants { preReleaseTracks?: PreReleaseTrack[] // info on stolen track isLive?: boolean - isRemix?: boolean + isRemixWithoutTV?: boolean isAcousticWithoutTV?: boolean isDemoWithoutTV?: boolean isMixWithoutTV?: boolean