windows
This commit is contained in:
nmemmert committed
1 parent
38131fb653
commit
59689dcbf6
3 files changed
+66
-24
No files matched your search
+4
-7
@@ -3,21 +3,18 @@ Songs not in your library - Amazon search links:
|
|||||||
Danny Gokey - I Got You
|
Danny Gokey - I Got You
|
||||||
https://www.amazon.com/s?k=Danny%20Gokey%20I%20Got%20You&i=digital-music
|
https://www.amazon.com/s?k=Danny%20Gokey%20I%20Got%20You&i=digital-music
|
||||||
|
|
||||||
Danny Gokey - I Got You
|
Have For You Colton Dixon - The Love I
|
||||||
https://www.amazon.com/s?k=Danny%20%20Gokey%20I%20%20Got%20%20You&i=digital-music
|
|
||||||
|
|
||||||
Have For You Colton Dixon - The Love I
|
|
||||||
https://www.amazon.com/s?k=Have%20%20For%20%20You%20Colton%20%20Dixon%20The%20%20Love%20%20I%20&i=digital-music
|
https://www.amazon.com/s?k=Have%20%20For%20%20You%20Colton%20%20Dixon%20The%20%20Love%20%20I%20&i=digital-music
|
||||||
|
|
||||||
Done Tasha Layton - Look What You've
|
Done Tasha Layton - Look What You've
|
||||||
https://www.amazon.com/s?k=Done%20Tasha%20%20Layton%20Look%20%20What%20%20You%27ve%20&i=digital-music
|
https://www.amazon.com/s?k=Done%20Tasha%20%20Layton%20Look%20%20What%20%20You%27ve%20&i=digital-music
|
||||||
|
|
||||||
Cochren & Co. - Who Can
|
Cochren & Co. - Who Can
|
||||||
https://www.amazon.com/s?k=Cochren%20%26%20%20Co.%20Who%20%20Can&i=digital-music
|
https://www.amazon.com/s?k=Cochren%20%26%20%20Co.%20Who%20%20Can&i=digital-music
|
||||||
|
|
||||||
Have For You Colton Dixon - The Love I
|
Have For You Colton Dixon - The Love I
|
||||||
https://www.amazon.com/s?k=Have%20%20For%20%20You%20Colton%20%20Dixon%20The%20%20Love%20%20I%20&i=digital-music
|
https://www.amazon.com/s?k=Have%20%20For%20%20You%20Colton%20%20Dixon%20The%20%20Love%20%20I%20&i=digital-music
|
||||||
|
|
||||||
Done Tasha Layton - Look What You've
|
Done Tasha Layton - Look What You've
|
||||||
https://www.amazon.com/s?k=Done%20Tasha%20%20Layton%20Look%20%20What%20%20You%27ve%20&i=digital-music
|
https://www.amazon.com/s?k=Done%20Tasha%20%20Layton%20Look%20%20What%20%20You%27ve%20&i=digital-music
|
||||||
|
|
||||||
@@ -32,6 +32,8 @@ PLAYLIST_NAME = 'Journey FM Recently Played'
|
|||||||
|
|
||||||
def scrape_recently_played():
|
def scrape_recently_played():
|
||||||
"""Scrape recently played songs from multiple stations using Selenium"""
|
"""Scrape recently played songs from multiple stations using Selenium"""
|
||||||
|
import platform
|
||||||
|
|
||||||
urls = [
|
urls = [
|
||||||
('https://www.myjourneyfm.com/recently-played/', 'Journey FM'),
|
('https://www.myjourneyfm.com/recently-played/', 'Journey FM'),
|
||||||
('https://spiritfm.com/spiritfm-recently-played/', 'Spirit FM')
|
('https://spiritfm.com/spiritfm-recently-played/', 'Spirit FM')
|
||||||
@@ -47,10 +49,20 @@ def scrape_recently_played():
|
|||||||
options.add_argument("--disable-dev-shm-usage")
|
options.add_argument("--disable-dev-shm-usage")
|
||||||
options.add_argument("--disable-gpu")
|
options.add_argument("--disable-gpu")
|
||||||
options.add_argument("--remote-debugging-port=9222")
|
options.add_argument("--remote-debugging-port=9222")
|
||||||
options.add_argument("--user-data-dir=/tmp/chromium")
|
|
||||||
options.add_argument("--no-first-run")
|
options.add_argument("--no-first-run")
|
||||||
options.add_argument("--disable-extensions")
|
options.add_argument("--disable-extensions")
|
||||||
options.binary_location = "/usr/bin/chromium-browser"
|
|
||||||
|
# Set binary location based on OS
|
||||||
|
if platform.system() == 'Windows':
|
||||||
|
options.binary_location = r"C:\Program Files\Google\Chrome\Application\chrome.exe"
|
||||||
|
options.add_argument("--user-data-dir=C:\\temp\\chromium")
|
||||||
|
elif platform.system() == 'Darwin': # macOS
|
||||||
|
options.binary_location = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
|
||||||
|
options.add_argument("--user-data-dir=/tmp/chromium")
|
||||||
|
else: # Linux
|
||||||
|
options.binary_location = "/usr/bin/chromium-browser"
|
||||||
|
options.add_argument("--user-data-dir=/tmp/chromium")
|
||||||
|
|
||||||
service = Service()
|
service = Service()
|
||||||
driver = webdriver.Chrome(service=service, options=options)
|
driver = webdriver.Chrome(service=service, options=options)
|
||||||
|
|
||||||
@@ -76,14 +88,46 @@ def scrape_recently_played():
|
|||||||
# Find elements (div, li) that contain time in their text
|
# Find elements (div, li) that contain time in their text
|
||||||
song_elements = soup.find_all(lambda tag: tag.name in ['div', 'li', 'p'] and re.search(r'\d+:\d+ [AP]M', tag.get_text()))
|
song_elements = soup.find_all(lambda tag: tag.name in ['div', 'li', 'p'] and re.search(r'\d+:\d+ [AP]M', tag.get_text()))
|
||||||
for element in song_elements:
|
for element in song_elements:
|
||||||
spans = element.find_all('span')
|
if source == 'Journey FM':
|
||||||
if len(spans) >= 3:
|
# Journey FM uses <strong> for title
|
||||||
title = spans[0].get_text().strip()
|
strong = element.find('strong')
|
||||||
artist = spans[1].get_text().strip()
|
if strong:
|
||||||
# Ignore time
|
title = strong.get_text().strip()
|
||||||
songs.append({'artist': artist, 'title': title, 'source': source})
|
full_text = element.get_text().strip()
|
||||||
|
# Remove the title and time
|
||||||
|
match = re.search(r'(\d+:\d+ [AP]M)', full_text)
|
||||||
|
if match:
|
||||||
|
time_part = match.group(1)
|
||||||
|
before_time = full_text.split(time_part)[0].strip()
|
||||||
|
artist = before_time.replace(title, '').strip()
|
||||||
|
else:
|
||||||
|
artist = full_text.replace(title, '').strip()
|
||||||
|
artist = artist.strip()
|
||||||
|
else:
|
||||||
|
# Fallback
|
||||||
|
full_text = element.get_text().strip()
|
||||||
|
match = re.search(r'(\d+:\d+ [AP]M)', full_text)
|
||||||
|
if match:
|
||||||
|
play_time = match.group(1)
|
||||||
|
before = full_text.split(play_time)[0].strip()
|
||||||
|
if ' by ' in before:
|
||||||
|
title, artist = before.split(' by ', 1)
|
||||||
|
title = title.strip()
|
||||||
|
artist = artist.strip()
|
||||||
|
elif ' - ' in before:
|
||||||
|
title, artist = before.split(' - ', 1)
|
||||||
|
title = title.strip()
|
||||||
|
artist = artist.strip()
|
||||||
|
else:
|
||||||
|
parts = re.findall(r'[A-Z][^A-Z]*', before)
|
||||||
|
if len(parts) >= 4:
|
||||||
|
title = ' '.join(parts[:2])
|
||||||
|
artist = ' '.join(parts[2:])
|
||||||
|
else:
|
||||||
|
title = ' '.join(parts[:len(parts)//2])
|
||||||
|
artist = ' '.join(parts[len(parts)//2:])
|
||||||
else:
|
else:
|
||||||
# Fallback to text parsing
|
# Spirit FM uses text with -
|
||||||
full_text = element.get_text().strip()
|
full_text = element.get_text().strip()
|
||||||
match = re.search(r'(\d+:\d+ [AP]M)', full_text)
|
match = re.search(r'(\d+:\d+ [AP]M)', full_text)
|
||||||
if match:
|
if match:
|
||||||
@@ -93,19 +137,20 @@ def scrape_recently_played():
|
|||||||
title, artist = before.split(' by ', 1)
|
title, artist = before.split(' by ', 1)
|
||||||
title = title.strip()
|
title = title.strip()
|
||||||
artist = artist.strip()
|
artist = artist.strip()
|
||||||
|
elif ' - ' in before:
|
||||||
|
title, artist = before.split(' - ', 1)
|
||||||
|
title = title.strip()
|
||||||
|
artist = artist.strip()
|
||||||
else:
|
else:
|
||||||
# Split on capital letters
|
|
||||||
parts = re.findall(r'[A-Z][^A-Z]*', before)
|
parts = re.findall(r'[A-Z][^A-Z]*', before)
|
||||||
if len(parts) == 4:
|
if len(parts) >= 4:
|
||||||
title = ' '.join(parts[:2])
|
title = ' '.join(parts[:2])
|
||||||
artist = ' '.join(parts[2:])
|
artist = ' '.join(parts[2:])
|
||||||
else:
|
else:
|
||||||
title = ' '.join(parts[:3])
|
title = ' '.join(parts[:len(parts)//2])
|
||||||
artist = ' '.join(parts[3:])
|
artist = ' '.join(parts[len(parts)//2:])
|
||||||
if title and artist:
|
if title and artist:
|
||||||
songs.append({'artist': artist, 'title': title, 'source': source})
|
songs.append({'artist': artist, 'title': title, 'source': source}) # Add to all_songs, avoiding duplicates
|
||||||
|
|
||||||
# Add to all_songs, avoiding duplicates
|
|
||||||
for song in songs:
|
for song in songs:
|
||||||
key = (song['title'].lower(), song['artist'].lower())
|
key = (song['title'].lower(), song['artist'].lower())
|
||||||
if key not in seen:
|
if key not in seen:
|
||||||
|
|||||||
Binary file not shown.
Reference in new issue
Block a user