From 29d84c29eac4bafa7aa1370578bce9e8e0a8f2bc Mon Sep 17 00:00:00 2001 From: Jacob Casper Date: Tue, 26 Jun 2018 18:56:59 -0500 Subject: [PATCH] v0.3.2: commit 4028754e9fd79cdbf9906e0e99df33b004bee916 Author: Jacob Casper Date: Tue Jun 26 18:37:46 2018 -0500 Updated to new spotify credentials, less fragile marketplace date format --- callback.php | 2 +- marketplay.php | 2 +- marketscraper.php | 2 +- mktplc.sqlite3 | Bin 167936 -> 184320 bytes mpfuncs.php | 12 +++++------- searchify.php | 5 ++--- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/callback.php b/callback.php index be99a1a..b6211da 100644 --- a/callback.php +++ b/callback.php @@ -49,7 +49,7 @@ /*'header' => "Content-type: application/x-www-form-urlencoded\r\n" . "Content-Length: " . strlen($token_data) . "\r\n" . "Authorization: Basic " . base64_encode('868e2cba00de4819900dd8a647a7ba7d:' . CLIENT_SECRET) . "\r\n",*/ - 'header' => "Authorization: Basic " . base64_encode('868e2cba00de4819900dd8a647a7ba7d:' . CLIENT_SECRET) . " \r\n", + 'header' => "Authorization: Basic " . base64_encode('93a6f9c0375c45d4b348157691aa24e8:' . CLIENT_SECRET) . " \r\n", 'content' => $token_data ] ]; diff --git a/marketplay.php b/marketplay.php index b456ec8..6ff4b85 100644 --- a/marketplay.php +++ b/marketplay.php @@ -1,6 +1,6 @@ query('SELECT date FROM songs order by date desc limit 1'); $resultset = $query->fetch(); - $lastEpDT = new DateTime::createFromFormat(SQLITE_DATE_FORM, $resultset['date']; + $lastEpDT = DateTime::createFromFormat(SQLITE_DATE_FORM, $resultset['date']); $startDate = new DateTime; $episodeDatePages = []; $episodeTrackPages = []; diff --git a/mktplc.sqlite3 b/mktplc.sqlite3 index 5daf12db5955a47decc8a5a997ca8104daf64040..68a6b175eb43213ce6b5e2f7cf6875e9a9d31c6b 100644 GIT binary patch delta 11804 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'class') && $header->getAttribute('class') === 'river--hed') { - $dateStringParts = explode('/', explode(':', $header->nodeValue)[0]); - if ( strlen($dateStringParts[2]) === 2 ) { - $dateStringParts[2] = '20' . $dateStringParts[2]; - } - $episodeDate = DateTime::createFromFormat(DATE_FORM, implode("/", $dateStringParts)); + $episodeAnchorHref = $header->firstChild->getAttribute('href'); + $dateString = explode('/', $episodeAnchorHref)[3]; + $episodeDate = DateTime::createFromFormat(DATE_FORM, $dateString); if ($episodeDate < $lastDate) { break; } @@ -47,4 +45,4 @@ } } return $episodeDates; - } \ No newline at end of file + } diff --git a/searchify.php b/searchify.php index 740f79f..949abf9 100644 --- a/searchify.php +++ b/searchify.php @@ -2,7 +2,7 @@ const BASE_URL = 'https://api.spotify.com/v1/'; // Currently updated manually whenever I get one from the server - const SPOT_TOKEN = 'BQCQTtwO2kiMcV_VDgfSmTXQzGlO47rUuPyc4oCHpRunPQx2ZhhVYOtksVZPMbSgoCy3cGiRMHMygon5-SleqfsP0lvRMQW3gm1Q_a8TRv5MfCGQdNwdUcUu_NBpcSjWDNUadWeg3ps-WTDWxjUWm_FOlfxMy7a2AdI_RHWZ0Lx56WHf8gYA4-YVUm_HxpqDlReqEkWE9DHppQ'; + const SPOT_TOKEN = 'BQBU1Qs3ROpkN9CwlQNpZS00khdSU61zuejyKbjS4KiIszK8aiLaTd9TfPiSH0OsmtWStOVL7ym-QYEBWyLX3qlFIN5peit0n6_B-LLtz4C8KSh3Dxj5O3jf4HSWf3fFISC4cLbznfSV3QnpQ4vdnCTehz4vT8V54XDiG2hX275Uw_gDHzKjqFWQo249-rY42rBv7pf555wQ2PSBymuZMcDlIDEeAbGiyRI'; $pdo = new PDO("sqlite:mktplc.sqlite3"); @@ -13,8 +13,7 @@ if ($stmt->execute()) { - print_r($stmt->fetchAll()); - exit(0); + #print_r($stmt->fetchAll()); while ($row = $stmt->fetch()) { $track_opts = [ -- 2.20.1