X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/cabaa4bbe13d8c0df16ac224c96f07525ec9377c..d38cac35c8e0aed0a223533bb54e46958c693212:/tweeper.php?ds=sidebyside

diff --git a/tweeper.php b/tweeper.php
index c0db320..45bc786 100644
--- a/tweeper.php
+++ b/tweeper.php
@@ -137,30 +137,61 @@ function usage($argv)
   if (php_sapi_name() != 'cli')
     $usage = htmlentities("{$_SERVER['SCRIPT_NAME']}?src_url=<src_url>");
   else
-    $usage = "{$argv[0]} <src_url>\n";
+    $usage = "{$argv[0]} [-h|--help] <src_url>\n";
 
   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") {
-    echo usage($argv);
-    return 0;
+function parse_options_cli($argv, $argc)
+{
+  $options = array();
+
+  if ($argc < 2)
+    return $options;
+
+  $cli_options = getopt("h", array("help"));
+  foreach ($cli_options as $opt => $val) {
+    switch ($opt) {
+    case 'h':
+    case 'help':
+      echo usage($argv);
+      exit(0);
+    default:
+      die(usage($argv));
+    }
   }
-  $src_url = $argv[1];
-} else {
-  die(usage($argv));
+
+  $options['src_url'] = $argv[count($cli_options) + 1];
+
+  return $options;
 }
 
-$url = parse_url($src_url);
+function parse_options_query_string()
+{
+  $options = array();
+
+  if (isset($_GET['src_url']))
+    $options['src_url'] = $_GET['src_url'];
+
+  return $options;
+}
+
+
+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"]))
-  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);
-echo $tweeper->tweep($src_url);
+echo $tweeper->tweep($options['src_url']);