tweeper.php: use the same parenthesis style for all functions

[tweeper.git] / tweeper.php

diff --git a/tweeper.php b/tweeper.php
index a9fce9b..d534a10 100644 (file)
--- a/tweeper.php
+++ b/tweeper.php
@@ -18,7 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-require_once 'XML/Serializer.php';
+require_once 'Symfony/Component/Serializer/autoload.php';
+
+use Symfony\Component\Serializer\Serializer;
+use Symfony\Component\Serializer\Encoder\XmlEncoder;
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;

 
 date_default_timezone_set('UTC');
 
 
 date_default_timezone_set('UTC');
 


@@ -30,8 +34,7 @@ class Tweeper {
     $this->generate_enclosure = $generate_enclosure;
   }
 
     $this->generate_enclosure = $generate_enclosure;
   }
 

-  public static function epoch_to_gmdate($timestamp)
-  {
+  public static function epoch_to_gmdate($timestamp) {

     if (!is_numeric($timestamp) || is_nan($timestamp)) {
       $timestamp = 0;
     }
     if (!is_numeric($timestamp) || is_nan($timestamp)) {
       $timestamp = 0;
     }


@@ -39,8 +42,7 @@ class Tweeper {
     return gmdate('D, d M Y H:i:s', $timestamp) . ' GMT';
   }
 
     return gmdate('D, d M Y H:i:s', $timestamp) . ' GMT';
   }
 

-  public static function str_to_gmdate($date)
-  {
+  public static function str_to_gmdate($date) {

     $timestamp = strtotime($date);
     if (FALSE === $timestamp) {
       $timestamp = 0;
     $timestamp = strtotime($date);
     if (FALSE === $timestamp) {
       $timestamp = 0;


@@ -49,8 +51,7 @@ class Tweeper {
     return Tweeper::epoch_to_gmdate($timestamp);
   }
 
     return Tweeper::epoch_to_gmdate($timestamp);
   }
 

-  private static function get_contents($url)
-  {
+  private static function get_contents($url) {

     $ch = curl_init($url);
     curl_setopt_array($ch, array(
       CURLOPT_HEADER => FALSE,
     $ch = curl_init($url);
     curl_setopt_array($ch, array(
       CURLOPT_HEADER => FALSE,


@@ -67,8 +68,7 @@ class Tweeper {
     return $contents;
   }
 
     return $contents;
   }
 

-  private static function get_info($url)
-  {
+  private static function get_info($url) {

     $ch = curl_init($url);
     curl_setopt_array($ch, array(
       CURLOPT_HEADER => TRUE,
     $ch = curl_init($url);
     curl_setopt_array($ch, array(
       CURLOPT_HEADER => TRUE,


@@ -86,8 +86,7 @@ class Tweeper {
     return $url_info;
   }
 
     return $url_info;
   }
 

-  public static function generate_enclosure($url)
-  {
+  public static function generate_enclosure($url) {

     $supported_content_types = array(
       "application/ogg",
       "audio/aac",
     $supported_content_types = array(
       "application/ogg",
       "audio/aac",


@@ -178,39 +177,44 @@ class Tweeper {
     return $xsltProcessor;
   }
 
     return $xsltProcessor;
   }
 

-  private function json_to_xml($html, $json_match_expr, $rootName) {
-    // pre-process, convert json to XML
-    $ret = preg_match($json_match_expr, $html, $matches);
-    if ($ret !== 1) {
-      trigger_error("Cannot match expression: $json_match_expr\n", E_USER_ERROR);
-      return NULL;
-    }
-
-    $data = json_decode($matches[1]);
+  private function json_to_xml($json, $root_node_name) {
+    // Apparenty the ObjectNormalizer used afterwards is not able to handle
+    // the stdClass object created by json_decode() with the default setting
+    // $assoc = false; so use $assoc = true 
+    $data = json_decode($json, $assoc = true);

     if (!$data) {
       return NULL;
     }
 
     if (!$data) {
       return NULL;
     }
 

+    $encoder = new XmlEncoder();
+    $normalizer = new ObjectNormalizer();
+    $serializer = new Serializer(array($normalizer), array($encoder));
+

     $serializer_options = array (
     $serializer_options = array (

-      'addDecl' => TRUE,
-      'encoding' => "UTF-8",
-      'indent' => '  ',
-      'rootName' => $rootName,
+      'xml_encoding' => "UTF-8",
+      'xml_format_output' => TRUE,
+      'xml_root_node_name' => $root_node_name,

     );
 
     );
 

-    $serializer = new XML_Serializer($serializer_options);
-
-    $status = $serializer->serialize($data);
-    if (PEAR::isError($status)) {
-      trigger_error($status->getMessage(), E_USER_ERROR);
+    $xml_data = $serializer->serialize($data, 'xml', $serializer_options);
+    if (!$xml_data) {
+      trigger_error("Cannot serialize data", E_USER_ERROR);

       return NULL;
     }
 
       return NULL;
     }
 

-    return $serializer->getSerializedData();
+    return $xml_data;

   }
 
   private function get_xml_instagram_com($html) {
   }
 
   private function get_xml_instagram_com($html) {

-    return $this->json_to_xml($html, '/window._sharedData = (.*);/', 'instagram');
+    // extract the json data from the html code
+    $json_match_expr = '/window._sharedData = (.*);/';
+    $ret = preg_match($json_match_expr, $html, $matches);
+    if ($ret !== 1) {
+      trigger_error("Cannot match expression: $json_match_expr\n", E_USER_ERROR);
+      return NULL;
+    }
+
+    return $this->json_to_xml($matches[1], 'instagram');

   }
 
   private function preprocess_html_facebook_com($html) {
   }
 
   private function preprocess_html_facebook_com($html) {


@@ -283,13 +287,11 @@ class Tweeper {
   }
 }
 
   }
 }
 

-function is_cli()
-{
+function is_cli() {

   return (php_sapi_name() === "cli");
 }
 
   return (php_sapi_name() === "cli");
 }
 

-function usage($argv)
-{
+function usage($argv) {

   if (is_cli()) {
     $usage = "{$argv[0]} [-e|-h|--help] <src_url>\n";
   } else {
   if (is_cli()) {
     $usage = "{$argv[0]} [-e|-h|--help] <src_url>\n";
   } else {


@@ -299,8 +301,7 @@ function usage($argv)
   return "usage: $usage";
 }
 
   return "usage: $usage";
 }
 

-function parse_options_cli($argv, $argc)
-{
+function parse_options_cli($argv, $argc) {

   $options = array(
     'generate_enclosure' => FALSE
   );
   $options = array(
     'generate_enclosure' => FALSE
   );


@@ -329,8 +330,7 @@ function parse_options_cli($argv, $argc)
   return $options;
 }
 
   return $options;
 }
 

-function parse_options_query_string()
-{
+function parse_options_query_string() {

   $options = array(
     'generate_enclosure' => FALSE
   );
   $options = array(
     'generate_enclosure' => FALSE
   );