tweeper.php: check the return value of Tweeper::tweep()

[tweeper.git] / tweeper.php

diff --git a/tweeper.php b/tweeper.php
index 817452b..0955a11 100644 (file)
--- a/tweeper.php
+++ b/tweeper.php
@@ -89,6 +89,9 @@ class Tweeper {
       CURLOPT_USERAGENT => Tweeper::$userAgent,
     ));
     $contents = curl_exec($ch);
       CURLOPT_USERAGENT => Tweeper::$userAgent,
     ));
     $contents = curl_exec($ch);

+    if (FALSE === $contents) {
+      trigger_error(curl_error($ch));
+    }

     curl_close($ch);
 
     return $contents;
     curl_close($ch);
 
     return $contents;


@@ -111,6 +114,9 @@ class Tweeper {
     ));
     curl_exec($ch);
     $url_info = curl_getinfo($ch);
     ));
     curl_exec($ch);
     $url_info = curl_getinfo($ch);

+    if (FALSE === $url_info) {
+      trigger_error(curl_error($ch));
+    }

     curl_close($ch);
 
     return $url_info;
     curl_close($ch);
 
     return $url_info;


@@ -121,7 +127,9 @@ class Tweeper {
    */
   public static function generateEnclosure($url) {
     $supported_content_types = array(
    */
   public static function generateEnclosure($url) {
     $supported_content_types = array(

+      "application/octet-stream",

       "application/ogg",
       "application/ogg",

+      "application/pdf",

       "audio/aac",
       "audio/mp4",
       "audio/mpeg",
       "audio/aac",
       "audio/mp4",
       "audio/mpeg",


@@ -132,17 +140,14 @@ class Tweeper {
       "audio/x-midi",
       "image/gif",
       "image/jpeg",
       "audio/x-midi",
       "image/gif",
       "image/jpeg",

+      "image/png",

       "video/avi",
       "video/mp4",
       "video/mpeg",
       "video/ogg",
     );
 
       "video/avi",
       "video/mp4",
       "video/mpeg",
       "video/ogg",
     );
 

-    // The RSS specification says that the enclosure element URL must be http.
-    // See http://sourceforge.net/p/feedvalidator/bugs/72/
-    $http_url = preg_replace("/^https/", "http", $url);
-
-    $url_info = Tweeper::getUrlInfo($http_url);
+    $url_info = Tweeper::getUrlInfo($url);

 
     $supported = in_array($url_info['content_type'], $supported_content_types);
     if (!$supported) {
 
     $supported = in_array($url_info['content_type'], $supported_content_types);
     if (!$supported) {


@@ -150,15 +155,17 @@ class Tweeper {
       return '';
     }
 
       return '';
     }
 

-    $dom = new DomDocument();
+    // The RSS specification says that the enclosure element URL must be http.
+    // See http://sourceforge.net/p/feedvalidator/bugs/72/
+    $http_url = preg_replace("/^https/", "http", $url_info['url']);
+
+    $dom = new DOMDocument();

     $enc = $dom->createElement('enclosure');
     $enc = $dom->createElement('enclosure');

-    $enc->setAttribute('url', $url_info['url']);
+    $enc->setAttribute('url', $http_url);

     $enc->setAttribute('length', $url_info['download_content_length']);
     $enc->setAttribute('type', $url_info['content_type']);
 
     $enc->setAttribute('length', $url_info['download_content_length']);
     $enc->setAttribute('type', $url_info['content_type']);
 

-    $dom->appendChild($enc);
-
-    return $dom->saveXML($enc);
+    return $enc;

   }
 
   /**
   }
 
   /**


@@ -196,32 +203,9 @@ class Tweeper {
   }
 
   /**
   }
 
   /**

-   * Load a stylesheet if the web site is supported.
+   * Convert json to XML.

    */
    */

-  private function loadStylesheet($host) {
-    $stylesheet = "file://" . __DIR__ . "/rss_converter_" . $host . ".xsl";
-    if (FALSE === file_exists($stylesheet)) {
-      trigger_error("Conversion to RSS not supported for $host ($stylesheet not found)", E_USER_ERROR);
-      return NULL;
-    }
-
-    $stylesheet_contents = Tweeper::getUrlContents($stylesheet);
-
-    $xslDoc = new DOMDocument();
-    $xslDoc->loadXML($stylesheet_contents);
-
-    $xsltProcessor = new XSLTProcessor();
-    $xsltProcessor->registerPHPFunctions();
-    $xsltProcessor->setParameter('', 'generate-enclosure', $this->generate_enclosure);
-    $xsltProcessor->importStylesheet($xslDoc);
-
-    return $xsltProcessor;
-  }
-
-  /**
-   * Convert json to xml.
-   */
-  private function jsonToXml($json, $root_node_name) {
+  private static function jsonToXml($json, $root_node_name) {

     // Apparently 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.
     // Apparently 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.


@@ -261,7 +245,7 @@ class Tweeper {
       return NULL;
     }
 
       return NULL;
     }
 

-    return $this->jsonToXml($matches[1], 'instagram');
+    return Tweeper::jsonToXml($matches[1], 'instagram');

   }
 
   /**
   }
 
   /**


@@ -282,7 +266,7 @@ class Tweeper {
     // Handle warnings and errors when loading invalid HTML.
     $xml_errors_value = libxml_use_internal_errors(TRUE);
 
     // Handle warnings and errors when loading invalid HTML.
     $xml_errors_value = libxml_use_internal_errors(TRUE);
 

-    // If there is a host-specific method to get the xml data, use it!
+    // If there is a host-specific method to get the XML data, use it!

     $get_xml_host_method = 'getXml' . Tweeper::toUpperCamelCase($host, '.');
     if (method_exists($this, $get_xml_host_method)) {
       $xml_data = call_user_func_array(array($this, $get_xml_host_method), array($html));
     $get_xml_host_method = 'getXml' . Tweeper::toUpperCamelCase($host, '.');
     if (method_exists($this, $get_xml_host_method)) {
       $xml_data = call_user_func_array(array($this, $get_xml_host_method), array($html));


@@ -302,6 +286,29 @@ class Tweeper {
   }
 
   /**
   }
 
   /**

+   * Load a stylesheet if the web site is supported.
+   */
+  private function loadStylesheet($host) {
+    $stylesheet = "file://" . __DIR__ . "/rss_converter_" . $host . ".xsl";
+    if (FALSE === file_exists($stylesheet)) {
+      trigger_error("Conversion to RSS not supported for $host ($stylesheet not found)", E_USER_ERROR);
+      return NULL;
+    }
+
+    $stylesheet_contents = Tweeper::getUrlContents($stylesheet);
+
+    $xslDoc = new DOMDocument();
+    $xslDoc->loadXML($stylesheet_contents);
+
+    $xsltProcessor = new XSLTProcessor();
+    $xsltProcessor->registerPHPFunctions();
+    $xsltProcessor->setParameter('', 'generate-enclosure', $this->generate_enclosure);
+    $xsltProcessor->importStylesheet($xslDoc);
+
+    return $xsltProcessor;
+  }
+
+  /**

    * Convert the site content to RSS.
    */
   public function tweep($src_url) {
    * Convert the site content to RSS.
    */
   public function tweep($src_url) {


@@ -435,4 +442,8 @@ if (!isset($options['src_url'])) {
 }
 
 $tweeper = new Tweeper($options['generate_enclosure']);
 }
 
 $tweeper = new Tweeper($options['generate_enclosure']);

-echo $tweeper->tweep($options['src_url']);
+$output = $tweeper->tweep($options['src_url']);
+if (is_null($output)) {
+  exit(1);
+}
+echo $output;