Split parsing CLI options from parsing QUERY_STRING ones

[tweeper.git] / tweeper.php

diff --git a/tweeper.php b/tweeper.php
index c0db320..11e062b 100644 (file)
--- a/tweeper.php
+++ b/tweeper.php
@@ -142,25 +142,47 @@ function usage($argv)
   return "usage: $usage";
 }
 
   return "usage: $usage";
 }
 

-if (isset($_GET['src_url'])) {
-  $src_url = $_GET['src_url'];
-} else if (isset($argv[1])) {
-  if ($argv[1] == "-h" || $argv[1] == "--help") {
+function parse_options_cli($argv, $argc)
+{
+  $options = array();
+
+  if ($argc < 2)
+    return $options;
+
+  if ($argv[1] == "-h" || $argv[1] == "--help")

     echo usage($argv);
     echo usage($argv);

-    return 0;
-  }
-  $src_url = $argv[1];
-} else {
-  die(usage($argv));
+  else
+    $options['src_url'] = $argv[1];
+
+  return $options;
+}
+
+function parse_options_query_string()
+{
+  $options = array();
+
+  if (isset($_GET['src_url']))
+    $options['src_url'] = $_GET['src_url'];
+
+  return $options;

 }
 
 }
 

-$url = parse_url($src_url);
+
+if (php_sapi_name() != 'cli')
+  $options = parse_options_query_string();
+else
+  $options = parse_options_cli($argv, $argc);
+
+if (!isset($options['src_url']))
+  die(usage($argv));
+
+$url = parse_url($options['src_url']);

 if (FALSE === $url || empty($url["host"]))
 if (FALSE === $url || empty($url["host"]))

-  die("Invalid url: $src_url\n");
+  die("Invalid url: ${options['src_url']}\n");

 
 $stylesheet = __DIR__ . "/rss_converter_" . $url["host"] . ".xsl";
 if (FALSE === file_exists($stylesheet))
   die("Conversion to RSS not supported: {$url["host"]}\n");
 
 $tweeper = new Tweeper($stylesheet);
 
 $stylesheet = __DIR__ . "/rss_converter_" . $url["host"] . ".xsl";
 if (FALSE === file_exists($stylesheet))
   die("Conversion to RSS not supported: {$url["host"]}\n");
 
 $tweeper = new Tweeper($stylesheet);

-echo $tweeper->tweep($src_url);
+echo $tweeper->tweep($options['src_url']);