finishing async file reader restructureing

This commit is contained in:
kremsy 2015-09-30 22:58:49 +02:00
parent 67239cd1a9
commit 07fa365d1a

View File

@ -1,14 +1,27 @@
<?php <?php
//TODO documentation, finishing
namespace ManiaControl\Files; namespace ManiaControl\Files;
use cURL\Event; use cURL\Event;
use cURL\Request; use cURL\Request;
use ManiaControl\ManiaControl; use ManiaControl\ManiaControl;
/**
* Asynchronous Http Request Class
*
* @author ManiaControl Team <mail@maniacontrol.com>
* @copyright 2014-2015 ManiaControl Team
* @license http://www.gnu.org/licenses/ GNU General Public License, Version 3
*/
class AsyncHttpRequest { class AsyncHttpRequest {
/*
* Constants
*/
const CONTENT_TYPE_JSON = 'application/json';
/*
* Private properties
*/
/** @var ManiaControl $maniaControl */ /** @var ManiaControl $maniaControl */
private $maniaControl; private $maniaControl;
@ -40,7 +53,6 @@ class AsyncHttpRequest {
return $request; return $request;
} }
//TODO merge loadFile / postData
/** /**
* Carry out a GetData Request * Carry out a GetData Request
* *
@ -57,19 +69,7 @@ class AsyncHttpRequest {
$request->getOptions()->set(CURLOPT_AUTOREFERER, true)// accept link reference $request->getOptions()->set(CURLOPT_AUTOREFERER, true)// accept link reference
->set(CURLOPT_HTTPHEADER, $this->headers); // headers ->set(CURLOPT_HTTPHEADER, $this->headers); // headers
$request->addListener('complete', function (Event $event) use (&$function) { $this->processRequest($request);
$error = null;
$content = null;
if ($event->response->hasError()) {
$error = $event->response->getError()->getMessage();
} else {
$content = $event->response->getContent();
}
call_user_func($function, $content, $error);
});
$fileReader = new AsynchronousFileReader($this->maniaControl);
$fileReader->addRequest($request);
} }
@ -93,6 +93,16 @@ class AsyncHttpRequest {
->set(CURLOPT_POSTFIELDS, $content)// post content field ->set(CURLOPT_POSTFIELDS, $content)// post content field
->set(CURLOPT_HTTPHEADER, $this->headers) // headers ->set(CURLOPT_HTTPHEADER, $this->headers) // headers
; ;
$this->processRequest($request);
}
/**
* Processes the Request
*
* @param Request $request
*/
private function processRequest(Request $request) {
$request->addListener('complete', function (Event $event) use (&$function) { $request->addListener('complete', function (Event $event) use (&$function) {
$error = null; $error = null;
$content = null; $content = null;