From e2d95ce49a85b3e0d3c0ede1ce3b215eb1cc2566 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Jun 2010 00:08:06 +0800 Subject: create a class folder and move FedoraClient --- FedoraClient.php | 267 ------------------------------------------------- class/FedoraClient.php | 267 +++++++++++++++++++++++++++++++++++++++++++++++++ fedcli.php | 43 ++++---- main.inc.php | 2 +- 4 files changed, 290 insertions(+), 289 deletions(-) delete mode 100644 FedoraClient.php create mode 100644 class/FedoraClient.php diff --git a/FedoraClient.php b/FedoraClient.php deleted file mode 100644 index e003a03..0000000 --- a/FedoraClient.php +++ /dev/null @@ -1,267 +0,0 @@ - - * - * @category Main - * @package FedoraClient - * - * @author Remi Collet - * @author Johan Cwiklinski - * @copyright 2010 Remi Collet - * @license http://www.gnu.org/licenses/lgpl-2.1.txt LGPL License 2.1 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ - * @since The begining of times. - */ - -define('FEDORACLIENT_VERSION', '0.1.0-dev'); - -if (!function_exists('curl_version')) { - die("curl extension required\n"); -} -require_once 'Cache/Lite.php'; - -abstract class FedoraClient -{ - private $url; - private $agent; - private $debug = 0; - protected $cache; - - function __construct ($url, array $options) - { - $dir = "/tmp/cachelite-".posix_getlogin()."/"; - @mkdir($dir); - $this->cache = new Cache_Lite( - array( - 'memoryCaching' => true, - 'cacheDir' => $dir, - 'automaticSerialization' => true - ) - ); - - $this->url = $url; - if (isset($options['agent']) && !empty($options['agent'])) { - $this->agent = $options['agent']; - } else { - $this->agent = 'Fedora PHPClient/'.FEDORACLIENT_VERSION; - } - if (isset($options['debug']) && intval($options['debug'])>0) { - $this->debug = intval($options['debug']); - } - $this->logDebug( - 3, - __CLASS__."::".__FUNCTION__.": url='$url', agent='".$this->agent."'" - ); - } - - function logDebug($level, $msg) - { - if ($this->debug>=$level) { - echo "[debug][$level] $msg\n"; - } - } - - function sendRequest($method, array $options=array()) - { - $curl = curl_init(); - // And join to make our url. - $url = $this->url.$method; - curl_setopt($curl, CURLOPT_URL, $url); - // Boilerplate so pycurl processes cookies - curl_setopt($curl, CURLOPT_COOKIEFILE, '/dev/null'); - - //# Associate with the response to accumulate data - $this->data=''; - curl_setopt($curl, CURLOPT_WRITEFUNCTION, array($this, 'receive')); - - // Follow redirect - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); - curl_setopt($curl, CURLOPT_MAXREDIRS, 5); - - // Set standard headers - curl_setopt( - $curl, - CURLOPT_HTTPHEADER, - array('User-agent: '.$this->agent, 'Accept: application/json') - ); - - // run the request - $this->logDebug( - 2, - __CLASS__."::".__FUNCTION__.": call '$url'" - ); - curl_exec($curl); - - - // Check for auth failures - // Note: old TG apps returned 403 Forbidden on authentication failures. - // Updated apps return 401 Unauthorized - // We need to accept both until all apps are updated to return 401. - $http_status = curl_getinfo($curl, CURLINFO_HTTP_CODE); - if ($http_status==401 || $http_status==403) { - $this->logDebug( - 1, - __CLASS__."::".__FUNCTION__. - ": http_status '$http_status' Authentication failed logging in" - ); - return array(); - } else if ($http_status>=400) { - $this->logDebug( - 1, - __CLASS__."::".__FUNCTION__. - ": http_status '$http_status' Unknown HTTP Server Response" - ); - return array(); - } else { - $this->logDebug( - 2, - __CLASS__."::".__FUNCTION__.": http_status '$http_status'" - ); - } - - $this->logDebug( - 2, - __CLASS__."::".__FUNCTION__.": close connexion" - ); - - curl_close($curl); - return json_decode($this->data, true); - } - - function receive($curl, $data) - { - $this->logDebug( - 9, - __CLASS__."::".__FUNCTION__.": $data" - ); - $this->data .= $data; - return strlen($data); - } -} - - -class FedoraPkgdb extends FedoraClient -{ - - function __construct (array $options=array()) - { - parent::__construct('https://admin.fedoraproject.org/pkgdb/', $options); - $this->logDebug( - 3, - __CLASS__."::".__FUNCTION__ - ); - } - - function getBranches($refresh=false) - { - $rep = ($refresh ? false : $this->cache->get(__FUNCTION__, __CLASS__)); - if ($rep) { - $this->logDebug( - 2, - __CLASS__."::".__FUNCTION__."() get from cache" - ); - } else { - $rep =$this->sendRequest('collections'); - $this->cache->save($rep, __FUNCTION__, __CLASS__); - $this->logDebug( - 2, - __CLASS__."::".__FUNCTION__."() save to cache" - ); - } - - $branches = array(); - if (isset($rep['collections'])) { - foreach ($rep['collections'] as $coll) { - if (isset($coll[0]['branchname'])) { - $branches[$coll[0]['branchname']] = $coll[0]; - } - } - } - return $branches; - } - - function getPackageInfo($name, $refresh=false) - { - $url="acls/name/$name"; - $rep = ($refresh ? false : $this->cache->get($url, __CLASS__)); - if ($rep) { - $this->logDebug( - 2, - __CLASS__."::".__FUNCTION__."($name) get from cache" - ); - } else { - $rep =$this->sendRequest($url); - $this->cache->save($rep, $url, __CLASS__); - $this->logDebug( - 2, - __CLASS__."::".__FUNCTION__."($name) save to cache" - ); - } - - if (isset($rep['status']) && !$rep['status']) { - $this->logDebug( - 1, - __CLASS__."::".__FUNCTION__."($name) ".$rep['message'] - ); - return false; - } - $branches = array(); - foreach ($rep['packageListings'] as $pack) { - $branches[$pack['collection']['branchname']] = $pack; - } - return $branches; - } - - function getBranch($name, $refresh=false) - { - $branches = $this->getBranches($refresh); - - if (isset($branches[$name])) { - return $branches[$name]; - } - return false; - } - - function getCritPath($refresh=false) - { - $url="lists/critpath"; - $rep = ($refresh ? false : $this->cache->get($url, __CLASS__)); - if ($rep) { - $this->logDebug( - 2, - __CLASS__."::".__FUNCTION__." get from cache" - ); - } else { - $rep =$this->sendRequest($url); - $this->cache->save($rep, $url, __CLASS__); - $this->logDebug( - 2, - __CLASS__."::".__FUNCTION__." save to cache" - ); - } - return $rep['pkgs']; - } -} -?> diff --git a/class/FedoraClient.php b/class/FedoraClient.php new file mode 100644 index 0000000..e003a03 --- /dev/null +++ b/class/FedoraClient.php @@ -0,0 +1,267 @@ + + * + * @category Main + * @package FedoraClient + * + * @author Remi Collet + * @author Johan Cwiklinski + * @copyright 2010 Remi Collet + * @license http://www.gnu.org/licenses/lgpl-2.1.txt LGPL License 2.1 or (at your option) any later version + * @link http://github.com/remicollet/rpmphp/ + * @since The begining of times. + */ + +define('FEDORACLIENT_VERSION', '0.1.0-dev'); + +if (!function_exists('curl_version')) { + die("curl extension required\n"); +} +require_once 'Cache/Lite.php'; + +abstract class FedoraClient +{ + private $url; + private $agent; + private $debug = 0; + protected $cache; + + function __construct ($url, array $options) + { + $dir = "/tmp/cachelite-".posix_getlogin()."/"; + @mkdir($dir); + $this->cache = new Cache_Lite( + array( + 'memoryCaching' => true, + 'cacheDir' => $dir, + 'automaticSerialization' => true + ) + ); + + $this->url = $url; + if (isset($options['agent']) && !empty($options['agent'])) { + $this->agent = $options['agent']; + } else { + $this->agent = 'Fedora PHPClient/'.FEDORACLIENT_VERSION; + } + if (isset($options['debug']) && intval($options['debug'])>0) { + $this->debug = intval($options['debug']); + } + $this->logDebug( + 3, + __CLASS__."::".__FUNCTION__.": url='$url', agent='".$this->agent."'" + ); + } + + function logDebug($level, $msg) + { + if ($this->debug>=$level) { + echo "[debug][$level] $msg\n"; + } + } + + function sendRequest($method, array $options=array()) + { + $curl = curl_init(); + // And join to make our url. + $url = $this->url.$method; + curl_setopt($curl, CURLOPT_URL, $url); + // Boilerplate so pycurl processes cookies + curl_setopt($curl, CURLOPT_COOKIEFILE, '/dev/null'); + + //# Associate with the response to accumulate data + $this->data=''; + curl_setopt($curl, CURLOPT_WRITEFUNCTION, array($this, 'receive')); + + // Follow redirect + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); + curl_setopt($curl, CURLOPT_MAXREDIRS, 5); + + // Set standard headers + curl_setopt( + $curl, + CURLOPT_HTTPHEADER, + array('User-agent: '.$this->agent, 'Accept: application/json') + ); + + // run the request + $this->logDebug( + 2, + __CLASS__."::".__FUNCTION__.": call '$url'" + ); + curl_exec($curl); + + + // Check for auth failures + // Note: old TG apps returned 403 Forbidden on authentication failures. + // Updated apps return 401 Unauthorized + // We need to accept both until all apps are updated to return 401. + $http_status = curl_getinfo($curl, CURLINFO_HTTP_CODE); + if ($http_status==401 || $http_status==403) { + $this->logDebug( + 1, + __CLASS__."::".__FUNCTION__. + ": http_status '$http_status' Authentication failed logging in" + ); + return array(); + } else if ($http_status>=400) { + $this->logDebug( + 1, + __CLASS__."::".__FUNCTION__. + ": http_status '$http_status' Unknown HTTP Server Response" + ); + return array(); + } else { + $this->logDebug( + 2, + __CLASS__."::".__FUNCTION__.": http_status '$http_status'" + ); + } + + $this->logDebug( + 2, + __CLASS__."::".__FUNCTION__.": close connexion" + ); + + curl_close($curl); + return json_decode($this->data, true); + } + + function receive($curl, $data) + { + $this->logDebug( + 9, + __CLASS__."::".__FUNCTION__.": $data" + ); + $this->data .= $data; + return strlen($data); + } +} + + +class FedoraPkgdb extends FedoraClient +{ + + function __construct (array $options=array()) + { + parent::__construct('https://admin.fedoraproject.org/pkgdb/', $options); + $this->logDebug( + 3, + __CLASS__."::".__FUNCTION__ + ); + } + + function getBranches($refresh=false) + { + $rep = ($refresh ? false : $this->cache->get(__FUNCTION__, __CLASS__)); + if ($rep) { + $this->logDebug( + 2, + __CLASS__."::".__FUNCTION__."() get from cache" + ); + } else { + $rep =$this->sendRequest('collections'); + $this->cache->save($rep, __FUNCTION__, __CLASS__); + $this->logDebug( + 2, + __CLASS__."::".__FUNCTION__."() save to cache" + ); + } + + $branches = array(); + if (isset($rep['collections'])) { + foreach ($rep['collections'] as $coll) { + if (isset($coll[0]['branchname'])) { + $branches[$coll[0]['branchname']] = $coll[0]; + } + } + } + return $branches; + } + + function getPackageInfo($name, $refresh=false) + { + $url="acls/name/$name"; + $rep = ($refresh ? false : $this->cache->get($url, __CLASS__)); + if ($rep) { + $this->logDebug( + 2, + __CLASS__."::".__FUNCTION__."($name) get from cache" + ); + } else { + $rep =$this->sendRequest($url); + $this->cache->save($rep, $url, __CLASS__); + $this->logDebug( + 2, + __CLASS__."::".__FUNCTION__."($name) save to cache" + ); + } + + if (isset($rep['status']) && !$rep['status']) { + $this->logDebug( + 1, + __CLASS__."::".__FUNCTION__."($name) ".$rep['message'] + ); + return false; + } + $branches = array(); + foreach ($rep['packageListings'] as $pack) { + $branches[$pack['collection']['branchname']] = $pack; + } + return $branches; + } + + function getBranch($name, $refresh=false) + { + $branches = $this->getBranches($refresh); + + if (isset($branches[$name])) { + return $branches[$name]; + } + return false; + } + + function getCritPath($refresh=false) + { + $url="lists/critpath"; + $rep = ($refresh ? false : $this->cache->get($url, __CLASS__)); + if ($rep) { + $this->logDebug( + 2, + __CLASS__."::".__FUNCTION__." get from cache" + ); + } else { + $rep =$this->sendRequest($url); + $this->cache->save($rep, $url, __CLASS__); + $this->logDebug( + 2, + __CLASS__."::".__FUNCTION__." save to cache" + ); + } + return $rep['pkgs']; + } +} +?> diff --git a/fedcli.php b/fedcli.php index ce9c31a..eb897c4 100755 --- a/fedcli.php +++ b/fedcli.php @@ -2,33 +2,34 @@ */ - + + require 'Console/Getargs.php'; -require 'FedoraClient.php'; +require 'class/FedoraClient.php'; function Help() { echo "\nFedora Client Command Line usage\n\n"; - + echo "fdcli command options\n"; echo "\tbranch: branch info\n"; echo "\tbranches: list branches\n"; @@ -43,11 +44,11 @@ function Branches() { "debug" => array('short' => 'd', 'max' => 1, 'min' => 1, 'desc' => "debug level", 'default' => "0") ); $args =& Console_Getargs::factory($config); - + if (PEAR::isError($args)) { die (Console_Getargs::getHelp($config)); } - + $client = new FedoraPkgdb(array('debug' => intval($args->getValue('debug')))); $branches = $client->getBranches(); foreach ($branches as $name => $branch) { @@ -62,11 +63,11 @@ function Branch() { "debug" => array('short' => 'd', 'max' => 1, 'min' => 1, 'desc' => "debug level", 'default' => "0") ); $args =& Console_Getargs::factory($config); - + if (PEAR::isError($args)) { die (Console_Getargs::getHelp($config)); } - + $client = new FedoraPkgdb(array('debug' => intval($args->getValue('debug')))); $branch = $client->getBranch($args->getValue('branch')); print_r($branch); @@ -78,11 +79,11 @@ function CritPath() { "debug" => array('short' => 'd', 'max' => 1, 'min' => 1, 'desc' => "debug level", 'default' => "0") ); $args =& Console_Getargs::factory($config); - + if (PEAR::isError($args)) { die (Console_Getargs::getHelp($config)); } - + $client = new FedoraPkgdb(array('debug' => intval($args->getValue('debug')))); $branch = $client->getCritPath(); print_r($branch); @@ -94,7 +95,7 @@ function Package() { "debug" => array('short' => 'd', 'max' => 1, 'min' => 1, 'desc' => "debug level", 'default' => "0") ); $args =& Console_Getargs::factory($config); - + if (PEAR::isError($args)) { die (Console_Getargs::getHelp($config)); } @@ -104,7 +105,7 @@ function Package() { if (!$rep) { die("Package not found\n"); } - + $first = true; foreach ($rep as $branch => $pack) { if ($first) { @@ -114,7 +115,7 @@ function Package() { echo "Description:\n".$pack['package']['description']."\n"; } echo $branch.":\t".$pack['owner']; - + $i=0; foreach ($pack['people'] as $user) { if (isset($user['aclOrder']['commit']['statuscode']) && $user['aclOrder']['commit']['statuscode']==3) { @@ -130,11 +131,11 @@ function Version() { "debug" => array('short' => 'd', 'max' => 1, 'min' => 1, 'desc' => "debug level", 'default' => "0") ); $args =& Console_Getargs::factory($config); - + if (PEAR::isError($args)) { die (Console_Getargs::getHelp($config)."\n"); } - + echo "PHP Fedora Client class version ".FEDORACLIENT_VERSION."\n"; } @@ -147,6 +148,6 @@ switch ($cmd) { case 'critpath': CritPath(); break; case 'package': Package(); break; case 'version': Version(); break; - default: Help(); + default: Help(); } ?> diff --git a/main.inc.php b/main.inc.php index a846e16..c9ec889 100644 --- a/main.inc.php +++ b/main.inc.php @@ -37,7 +37,7 @@ define('RPMPHP_VERSION', '1.0.0-dev'); require 'config.inc.php'; require '/usr/share/php/Smarty/Smarty.class.php'; -require 'FedoraClient.php'; +require 'class/FedoraClient.php'; $smarty = new Smarty(); -- cgit