Changeset 29668

Timestamp:

2015-01-07T12:09:44+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Tidied up command parsing

File:

• main/trunk/package-kits/linux/files/servlet.pl (modified) (7 diffs)

main/trunk/package-kits/linux/files/servlet.pl

@@ -7 +7 @@
 use XML::Parser;
 use Data::Dumper;
+use POSIX 'isatty';
 
 # Reads the servlets partial XML file using XML::Parser,
@@ -50 +51 @@
 }
 =cut
-sub read_servlets {
-    my $file = shift;
+sub read_xml {
+    my $FH = shift;
+    local $/ = undef;
+    my $xml = <$FH>;
     # The xml needs a root element, so we wrap it in one
-    my $xml='<!DOCTYPE doc [<!ENTITY real_doc SYSTEM "' . $file . '">] >
-    <__root__>
-        &real_doc;
-    </__root__>
-';
+    $xml='<__root__>' . $xml . '</__root__>';
     # Parse the data using XML::Parser
     my $data = new XML::Parser (Style => 'Tree')->parse ($xml);
@@ -97 +96 @@
 
 # Writes a data structure to an XML file
-sub write_servlets {
-    my ($hash, $file) = @_;
-    my $OUT;
-    if ($file ne '-') {
-        open $OUT, '>', $file;
-        select $OUT;
-    }
+sub write_xml {
+    my ($hash, $FH) = @_;
+    select $FH;
     sub open_tag {
         my ($indent, $tag, $attr) = @_;
@@ -114 +109 @@
         print ">";
     }
-    sub write_xml {
+    sub write_element {
         my ($indent, $hash) = @_;
         for my $key (sort keys %$hash) {
@@ -130 +125 @@
                             /^HASH$/ && do {
                                 print "\n";
-                                write_xml ("  $indent", $element);
+                                write_element ("  $indent", $element);
                                 print $indent, "</", $key, ">\n";
                                 last;
@@ -147 +142 @@
                     } else {
                         print "\n";
-                        write_xml ("  $indent", $val);
+                        write_element ("  $indent", $val);
                         print $indent, "</", $key, ">\n";
                     }
@@ -158 +153 @@
         }
     }
-    write_xml ("", $hash);
-    if (defined $OUT) {
-        close $OUT;
-    }
+    write_element ("", $hash);
     select STDOUT;
 }
-# The code above is for generic XML read/writing
-# The code below is specific to Greenstone's servlets.xml
 
 my $hash;
-# Hackish non-interactive CLI parser
+my %commands;
+# Command structure:
+# key: Case-insensitive name of the command
+# val: Array of info about the command
+#      [0]: Description of the command
+#      [1]: Function that is run for the command
+#      [2]: Number of arguments of the command (if any)
+%commands = (
+    help => [
+        'Prints help about the available commands',
+        sub {
+            for my $cmd (sort keys %commands) {
+                printf "%-10s %s\n", $cmd, $commands{$cmd}[0];
+            }
+        },
+    ],
+    clear => [
+        'Clears the internal state',
+        sub {
+            undef $hash;
+        }
+    ],
+    read => [
+        'Parses XML from a file into the internal state',
+        sub {
+            my $file = shift @ARGV;
+            if ($file eq '-') {
+                if (isatty *STDIN) {
+                    print STDERR "Reading XML from STDIN. Press ^D to end\n";
+                }
+                $hash = read_xml *STDIN;
+            } else {
+                open FH, '<', $file;
+                $hash = read_xml *FH;
+                close FH;
+            }
+        },
+        1,
+    ],
+    write => [
+        'Writes the current internal state as XML to a file',
+        sub {
+            my $file = shift @ARGV;
+            if ($file eq '-') {
+                write_xml $hash, *STDOUT;
+            } else {
+                open FH, '>', $file;
+                write_xml $hash, *FH;
+                close FH;
+            }
+        },
+        1,
+    ],
+    debug => [
+        'Dumps the current state to stdout',
+        sub {
+            print Dumper $hash;
+        },
+    ],
+    count => [
+        'Returns the number of servlets in the internal state',
+        sub {
+            my $count = 0;
+            if (defined $hash->{servlet}) {
+                $count = 1;
+                my $servlets = $hash->{servlet};
+                if (ref $servlets eq 'ARRAY') {
+                    $count = scalar @{$hash->{servlet}};
+                }
+            }
+            print $count, "\n";
+        },
+    ],
+    list => [
+        'Lists the servlets in the current internal state',
+        sub {
+            if (defined $hash->{servlet}) {
+                my $servlets = $hash->{servlet};
+                if (ref $servlets eq 'ARRAY') {
+                    for my $servlet (@{$hash->{servlet}}) {
+                        print $servlet->{'servlet-name'}, "\n";
+                    }
+                } else {
+                    print $servlets->{'servlet-name'}, "\n";
+                }
+            } else {
+                print STDERR "No servlets found. Was valid XML provided?\n";
+            }
+        },
+    ],
+);
+
+# Check that all given commands are valid
+my $argc = 0;
+for my $cmd (@ARGV) {
+    if ($argc > 0) {
+        # skip arguments to a previous command
+        $argc --;
+    } elsif (defined $commands{$cmd}) {
+        # get the argument count of a valid command
+        $argc = @{$commands{$cmd}}[2];
+        defined $argc or ($argc = 0);
+    } else {
+        # invalid command
+        print STDERR "Valid commands are:\n";
+        @{$commands{help}}[1]->();
+        die "Invalid command '" . $cmd . "'\n";
+    }
+}
+
+# Run the commands
 while (@ARGV) {
-    for (shift) {
-        /^read$/i && do {
-            $hash = read_servlets (shift);
-            last;
-        };
-        /^write$/i && do {
-            write_servlets ($hash, shift);
-            last;
-        };
-        /^debug$/i && do {
-            print Dumper $hash;
-            last;
-        };
-        /^count$/i && do {
-            my $servlets = $hash->{servlet};
-            my $count = 1;
-            if (ref $servlets eq 'ARRAY') {
-                $count = scalar @{$hash->{servlet}};
-            }
-            print "Found ", $count, " servlets\n";
-            last;
-        };
-        /^list$/i && do {
-            print "Servlets:\n";
-            my $servlets = $hash->{servlet};
-            if (ref $servlets eq 'ARRAY') {
-                for my $servlet (@{$hash->{servlet}}) {
-                    print "  ", $servlet->{'servlet-name'}, "\n";
-                }
-            } else {
-                print "  ", $servlets->{'servlet-name'}, "\n";
-            }
-            last;
-        };
-    }
-}
+    @{$commands{lc shift}}[1]->();
+}