Saverr/spotifykeydumper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix coding style

Browse Source
This commit is contained in:
Johnny Doo 2020-11-28 11:38:16 +01:00
parent a3ea56345d
commit 60eb96ece4
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
SpotifyKeyDumper/Utils.cpp
View File

@ -1,7 +1,6 @@
#include "pch.h" #include "pch.h"
#include "Utils.h" #include "Utils.h"
#include "aes.h" #include "aes.h"
#include <regex>
const uint8_t IV[] = { 0x72, 0xE0, 0x67, 0xFB, 0xDD, 0xCB, 0xCF, 0x77, 0xEB, 0xE8, 0xBC, 0x64, 0x3F, 0x63, 0x0D, 0x93 }; const uint8_t IV[] = { 0x72, 0xE0, 0x67, 0xFB, 0xDD, 0xCB, 0xCF, 0x77, 0xEB, 0xE8, 0xBC, 0x64, 0x3F, 0x63, 0x0D, 0x93 };
@ -136,7 +135,9 @@ struct SongInfo
static const std::string albumSearchPattern = "\x68\x65\x69\x67\x68\x74\x22\x20\x3A\x20\x36\x34\x30"; static const std::string albumSearchPattern = "\x68\x65\x69\x67\x68\x74\x22\x20\x3A\x20\x36\x34\x30";
static const std::wstring songDirRoot = L"Downloads"; static const std::wstring songDirRoot = L"Downloads";
static const std::string songRegex = "https?:\\/\\/(?:www\.)?([-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6})\\b([-a-zA-Z0-9()@:%_\\+.~#?&\\/\\/=]*)"; static const std::string songRegex =
"https?:\\/\\/(?:www\.)?([-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6})"
"\\b([-a-zA-Z0-9()@:%_\\+.~#?&\\/\\/=]*)";
static std::wstring songDir = songDirRoot; static std::wstring songDir = songDirRoot;
void Utils::DownloadSong(std::string fileId, std::string trackUri, std::string key, std::string authToken) void Utils::DownloadSong(std::string fileId, std::string trackUri, std::string key, std::string authToken)
{ {
@ -160,19 +161,23 @@ void Utils::DownloadSong(std::string fileId, std::string trackUri, std::string k
// Parse storage resolve response to get the encrypted song data's URL // Parse storage resolve response to get the encrypted song data's URL
std::string songHost; std::string songHost;
std::string songPath; std::string songPath;
try { try
{
std::regex re(songRegex); std::regex re(songRegex);
std::smatch match; std::smatch match;
if (std::regex_search(srStr, match, re) && match.size() > 1) { if (std::regex_search(srStr, match, re) && match.size() > 1)
{
songHost = match.str(1); songHost = match.str(1);
songPath = match.str(2); songPath = match.str(2);
} }
else { else
{
std::cout << "Error: Download URL not found" << std::endl; std::cout << "Error: Download URL not found" << std::endl;
return; return;
} }
} }
catch (std::regex_error& e) { catch (std::regex_error& e)
{
// Syntax error in the regular expression // Syntax error in the regular expression
std::cout << "Error: regex_error" << std::endl; std::cout << "Error: regex_error" << std::endl;
return; return;
@ -183,7 +188,8 @@ void Utils::DownloadSong(std::string fileId, std::string trackUri, std::string k
//std::cout << "URL: " << songHost + songPath << std::endl; //std::cout << "URL: " << songHost + songPath << std::endl;
if (songStr.empty()) { if (songStr.empty())
{
std::cout << "Error: Could not download audio" << std::endl; std::cout << "Error: Could not download audio" << std::endl;
return; return;
} }

1
SpotifyKeyDumper/pch.h
View File

@ -22,5 +22,6 @@
#include <thread> #include <thread>
#include <vector> #include <vector>
#include <WinInet.h> #include <WinInet.h>
#include <regex>
#endif //PCH_H #endif //PCH_H