Version 5.1 - All the GraphQL #32
@ -18,7 +18,7 @@ namespace Aviat\EasyMin;
|
||||
|
||||
use function Amp\wait;
|
||||
use Amp\Artax\{Client, FormBody, Request};
|
||||
use Aviat\Ion\Json;
|
||||
use Aviat\Ion\{Json, JsonException};
|
||||
|
||||
// Include Amp and Artax
|
||||
require_once('../vendor/autoload.php');
|
||||
@ -121,7 +121,7 @@ class JSMin {
|
||||
|
||||
$request = (new Request)
|
||||
->setMethod('POST')
|
||||
->setUri('http://closure-compiler.appspot.com/compile')
|
||||
->setUri('https://closure-compiler.appspot.com/compile')
|
||||
->setAllHeaders([
|
||||
'Accept' => 'application/json',
|
||||
'Accept-Encoding' => 'gzip',
|
||||
@ -144,17 +144,25 @@ class JSMin {
|
||||
*/
|
||||
protected function checkMinifyErrors($options)
|
||||
{
|
||||
$errorRes = $this->closureCall($options);
|
||||
$errorJson = $errorRes->getBody();
|
||||
$errorObj = Json::decode($errorJson) ?: (object)[];
|
||||
|
||||
|
||||
// Show error if exists
|
||||
if ( ! empty($errorObj->errors) || ! empty($errorObj->serverErrors))
|
||||
try
|
||||
{
|
||||
$errorJson = Json::encode($errorObj, JSON_PRETTY_PRINT);
|
||||
header('Content-type: application/javascript');
|
||||
echo "console.error(${errorJson});";
|
||||
$errorRes = $this->closureCall($options);
|
||||
$errorJson = $errorRes->getBody();
|
||||
$errorObj = Json::decode($errorJson) ?: (object)[];
|
||||
|
||||
|
||||
// Show error if exists
|
||||
if ( ! empty($errorObj->errors) || ! empty($errorObj->serverErrors))
|
||||
{
|
||||
$errorJson = Json::encode($errorObj, JSON_PRETTY_PRINT);
|
||||
header('Content-type: application/javascript');
|
||||
echo "console.error(${errorJson});";
|
||||
die();
|
||||
}
|
||||
}
|
||||
catch (JsonException $e)
|
||||
{
|
||||
print_r($e);
|
||||
die();
|
||||
}
|
||||
}
|
||||
|
@ -112,7 +112,7 @@ class SyncKitsuWithMal extends BaseCommand {
|
||||
|
||||
if ( ! empty($data['updateKitsu']))
|
||||
{
|
||||
print_r($data['updateKitsu']);
|
||||
// print_r($data['updateKitsu']);
|
||||
$count = count($data['updateKitsu']);
|
||||
$this->echoBox("Updating {$count} outdated Kitsu {$type} list items");
|
||||
$this->updateKitsuListItems($data['updateKitsu'], $type);
|
||||
@ -244,6 +244,7 @@ class SyncKitsuWithMal extends BaseCommand {
|
||||
foreach($data['data'] as $listItem)
|
||||
{
|
||||
$id = $listItem['relationships'][$type]['data']['id'];
|
||||
|
||||
$potentialMappings = $includes[$type][$id]['relationships']['mappings'];
|
||||
$malId = NULL;
|
||||
|
||||
@ -291,7 +292,6 @@ class SyncKitsuWithMal extends BaseCommand {
|
||||
|
||||
foreach($missingMalIds as $mid)
|
||||
{
|
||||
// print_r($malList[$mid]);
|
||||
$itemsToAddToKitsu[] = array_merge($malList[$mid]['data'], [
|
||||
'id' => $this->kitsuModel->getKitsuIdFromMALId($mid, $type),
|
||||
'type' => $type
|
||||
|
Loading…
Reference in New Issue
Block a user