timw4mail
/
HummingBirdAnimeClient
1
1
Fork 1
Code Issues 5 Pull Requests Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Timothy Warren 2017-12-04 16:07:46 -05:00
parent cce0e714dc d13ad92dd1
commit a2f6805417
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
public/js.php
View File

@ -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();
}
}

4
src/Command/SyncKitsuWithMal.php
View File

@ -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