remove deprecated Google Play Music API, remove button

music.py

@@ -17,7 +17,6 @@ import json
 import dpath
 import requests
 import time
-from gmusicapi import Mobileclient
 import os
 from pathlib import Path
 
@@ -37,22 +36,6 @@ spotify_credentials = spotipy.oauth2.SpotifyClientCredentials(SPOTIPY_CLIENT_ID,
 sp = spotipy.Spotify(client_credentials_manager=spotify_credentials)
 
 
-def ask_for_credentials():
-#	Make an instance of the api and attempts to login with it.
-#	Return the authenticated api.
-
-	# We're not going to upload anything, so the Mobileclient is what we want.
-	gpm = Mobileclient()
-
-	logged_in = False
-	attempts = 0
-
-	while not logged_in and attempts < 3:
-		logged_in = gpm.oauth_login(Mobileclient.FROM_MAC_ADDRESS, oauth_credentials=u'./gpmlogin.json')
-		attempts += 1
-
-	return gpm
-
 #
 # Actual bot stuffs
 #
@@ -69,15 +52,12 @@ def help(update, context: CallbackContext):
 def inlinequery(update, context: CallbackContext):
 	query = update.inline_query.query
 	print(query)
-	query_id = uuid4()
-
 	results = []
 
 	spotify_credentials = spotipy.oauth2.SpotifyClientCredentials(SPOTIPY_CLIENT_ID, SPOTIPY_CLIENT_SECRET)
 	sp = spotipy.Spotify(client_credentials_manager=spotify_credentials)
 	if query:
 		sp_info = sp.search(q=query, limit=num_results)
-		open(f"./queries/{query_id}.json", 'w+').write(json.dumps(sp_info, indent = 4))
 		
 		for i in range(num_results):
 			try:
@@ -92,9 +72,10 @@ def inlinequery(update, context: CallbackContext):
 			sp_albdate = dpath.util.get(sp_info, f"/tracks/items/[{i}]/album/release_date")
 			sp_art = dpath.util.get(sp_info,  f"/tracks/items/[{i}]/album/images/[2]/url")
 			sp_audio = dpath.util.get(sp_info,  f"/tracks/items/[{i}]/preview_url")
+			sp_link = dpath.util.get(sp_info, f"/tracks/items/[{i}]/external_urls/spotify")
+			songlink = "https://song.link/{0}".format(sp_link)
 			
-			callback_data = f"query_id:<{query_id}>result:<{i}>"
+			reply_markup = InlineKeyboardMarkup([[InlineKeyboardButton("Spotify", url = sp_link) InlineKeyboardButton("More", url = songlink)]])
-			reply_markup = InlineKeyboardMarkup([[InlineKeyboardButton("Show links", callback_data=callback_data)]])
 
 			description = f"By {sp_artist} on the album {sp_albname}, released {sp_albdate}"
 
@@ -105,82 +86,8 @@ def inlinequery(update, context: CallbackContext):
 				message_content = f"Listen to \"{sp_title}\" by {sp_artist} on the album \"{sp_albname}\""
 				results.append(InlineQueryResultAudio(id = i, audio_url = sp_audio, title = sp_title, performer = sp_artist, audio_duration = 30, caption = message_content, reply_markup = reply_markup),)
 	
-		open(f"./queries/{query_id}.json", 'w+').write(json.dumps(sp_info, indent = 4))
 		update.inline_query.answer(results)
 
-
-def button(update, context: CallbackContext):
-	query = update.callback_query
-	reply_markup = InlineKeyboardMarkup([[InlineKeyboardButton("Loading links, please wait", url='https://www.youtube.com/watch?v=rTga41r3a4s')]])
-	query.edit_message_reply_markup(reply_markup=reply_markup)
-
-	query_id = re.search('(?<=query_id:\<).*(?=\>result)', f"{query.data}")	# matches everything between query_id:< and >result
-	query_id = str(query_id.group(0))
-
-	result_chosen = re.search('(?<=result:\<).', f"{query.data}")			# matches one character after result:<
-	result_chosen = str(result_chosen.group(0))
-
-	data_file = Path(f"./queries/{query_id}.json")
-
-	if not data_file.is_file():
-		reply_markup = InlineKeyboardMarkup([[InlineKeyboardButton("Request not found, probably over 3 days old. Please start over.", url='https://www.youtube.com/watch?v=dQw4w9WgXcQ')]])
-		query.edit_message_reply_markup(reply_markup=reply_markup)
-		return
-		
-	with open(f"./queries/{query_id}.json", encoding='utf-8') as data_file:
-		sp_info = json.loads(data_file.read())
-	
-	sp_link = dpath.util.get(sp_info, f"/tracks/items/[{result_chosen}]/external_urls/spotify")
-	sp_title = dpath.util.get(sp_info, f"/tracks/items/[{result_chosen}]/name")
-	sp_artist = dpath.util.get(sp_info, f"/tracks/items/[{result_chosen}]/artists/[0]/name")
-	sp_albname = dpath.util.get(sp_info, f"/tracks/items/[{result_chosen}]/album/name")
-	sp_art = dpath.util.get(sp_info,  f"/tracks/items/[{result_chosen}]/album/images/[2]/url")
-	
-	songlink = "https://song.link/{0}".format(sp_link)
-
-	gpm = ask_for_credentials()
-	if not gpm.is_authenticated():
-		print("\n\nGPM fucked up somewhere\n\n")
-	
-	gpm = Mobileclient(debug_logging=False)
-	gpm.oauth_login(Mobileclient.FROM_MAC_ADDRESS, oauth_credentials=u'./gpmlogin.json')
-	gpm_results = gpm.search(f"{sp_title} by {sp_artist} on {sp_albname}", max_results=1)
-	gpm.logout()
-
-	try:
-		dpath.util.get(gpm_results, '/song_hits/[0]/track/nid')
-	except KeyError:
-		gpm_link = False
-		yt_link = False
-	else:
-		gpm_link = dpath.util.get(gpm_results, '/song_hits/[0]/track/nid')
-		gpm_link = f"https://play.google.com/music/m/T{gpm_link}"		
-		try:
-			dpath.util.get(gpm_results, '/video_hits/[0]/youtube_video/id')
-		except KeyError:
-			yt_link = False
-		else:
-			yt_link = dpath.util.get(gpm_results, '/video_hits/[0]/youtube_video/id')
-			yt_link = f"https://www.youtube.com/watch?v={yt_link}"
-
-	if not yt_link:
-		query_string = urllib.parse.urlencode({"search_query" : f"{sp_title} {sp_artist}"})
-		html_content = urllib.request.urlopen(f"http://www.youtube.com/results?{query_string}")
-		search_results = re.findall(r'href=\"\/watch\?v=(.{11})', html_content.read().decode())
-		yt_link = f"http://www.youtube.com/watch?v={search_results[0]}"
-
-#	if gpm_link:
-#		reply_markup = InlineKeyboardMarkup([[InlineKeyboardButton("Spotify", url = sp_link), InlineKeyboardButton("GPM", url = gpm_link), InlineKeyboardButton("YouTube", url = yt_link), InlineKeyboardButton("More", url = songlink)]])
-#    Google Play Music is no more, I hope the API still works for a while. I'll have to hunt for one for youtube music	
-#	if not gpm_link:
-		reply_markup = InlineKeyboardMarkup([[InlineKeyboardButton("Spotify", url = sp_link), InlineKeyboardButton("YouTube", url = yt_link), InlineKeyboardButton("More", url = songlink)]])
-
-	query.edit_message_reply_markup(reply_markup=reply_markup)
-
-	os.system('find ./queries -mtime +3 -type f -delete')
-
-
-
 def error(update, context: CallbackContext):
 #	Log Errors caused by Updates
 	logger.warning(f"\nUpdate {update} caused error {context.error}\n")