X-Git-Url: http://git.grml.org/?p=grml-tips.git;a=blobdiff_plain;f=grml-tips;h=ec790d96d625fb2bc70b2b1356a71bec41798c67;hp=77f0acf13becdd8bdce31fa28dd638621d0f9633;hb=873c857ff67e6ce682059a758a91549df9cfa9ac;hpb=17034dd1db814f3d24e0097e34eedb9e6ba62022

diff --git a/grml-tips b/grml-tips
index 77f0acf..ec790d9 100755
--- a/grml-tips
+++ b/grml-tips
@@ -10,6 +10,11 @@
 use strict;
 use Pod::Usage;
 
+use feature 'say';
+use Term::ReadKey;
+use Time::HiRes;
+use LWP::UserAgent;
+
 =head1 NAME
 
 B<grml-tips> - query a signature file for a specific keyword and display results
@@ -62,46 +67,128 @@ grml-tips was written by Alexander Wirt <formorer@grml.org>
 
 =cut
 
-
 my $grml_tips = '/usr/share/grml-tips/grml_tips';
-my $pattern = shift;
-
-if ($pattern eq '') {
-    pod2usage( {
-	    -message => 'No search pattern provided',
-	    -exitval => -1, });
-} elsif ($pattern eq  '--help') {
+my $pattern   = shift;
+
+if ( $pattern eq '' ) {
+    pod2usage(
+        {   -message => 'No search pattern provided',
+            -exitval => -1,
+        }
+    );
+}
+elsif ( $pattern eq '--help' ) {
     pod2usage();
 }
 
 my @tips;
-my $fh;
-if (! open ($fh, '<', "$grml_tips")) {
-	print "Error: $grml_tips not found.\nExiting.";
-	exit -1;
+if ( !open( my $fh, '<', "$grml_tips" ) ) {
+    say STDERR "Error: File \"$grml_tips\" not found.";
+    say STDERR "Exiting.";
+    exit -1;
+}
+else {
+    my $tip = '';
+
+    my $tips_found = 0;
+    while ( my $line = <$fh> ) {
+        if ( $line !~ /^-- $/ ) {
+            $tip .= $line;
+        }
+        else {
+            $tips_found++;
+            if ( $tip =~ /$pattern/mi ) {
+
+                #$tip .= $line;
+
+                my $header = "Grml Tip Number $tips_found\n";
+                my $line = "-" x ( length($header) - 1 ) . "\n\n";
+
+                push @tips, $header . $line . $tip . "\n";
+                $tip = '';
+            }
+            else {
+                $tip = '';
+            }
+        }
+    }
+    close($fh);
 }
 
-my $tip = '';
-my $tip_flag = 0;
-
-while (my $line = <$fh>) {
-    if ($line !~ /^-- $/) {
-	$tip .= $line;
-    } else {
-	if ( "$tip" =~ /$pattern/m ) {
-	    $tip .= $line;
-	    print "$tip";
-	    $tip = '';
-	    $tip_flag = 1;
-	} else {
-	    $tip = '';
-	}
+if (@tips) {
+    if ( !open( my $fh, '|-', 'less -FRX' ) ) {
+        say @tips;
+    }
+    else {
+        say $fh @tips;
     }
 }
-close($fh);
+else {
+    say "Sorry, could not find a tip for '$pattern'. :-(\n\n",
+        "Do you want to submit the keyword '$pattern' to grml's keyword database?\n",
+        "The grml team will write tips for the most requested and useful keywords.\n",
+        "To use and contribute to this feature you'll need a working networking connection.\n",
+        "No personal data will be transmitted to the database.\n\n",
+        "Send \"$pattern\" to grml's keyword database? [y|N] ";
+
+    ReadMode 4;    # Turn off controls keys
+    my $x;
+    while ( not defined( $x = ReadKey(-1) ) ) {
+        Time::HiRes::sleep(0.5);
+    }
+    ReadMode 0;    # Reset tty mode before exiting
+    print "\n\n";
+    if ( $x =~ /(y|j)/i ) {
+        my $version;
+        if ( -f '/etc/grml_version' ) {
+            open( my $fh, '<', '/etc/grml_version' )
+                or die "Could not open /etc/grml_version: $!";
+            $version = <$fh>;
+            chomp $version;
+            close($fh);
+        }
+        elsif ( -f '/etc/debian_version' ) {
+            open( my $fh, '<', '/etc/debian_version' )
+                or die "Could not open /etc/debian_version: $!";
+            $version = <$fh>;
+            chomp $version;
+            close($fh);
+        }
+        else {
+            $version = 'unknown';
+        }
+        my $ua = new LWP::UserAgent;
+        $ua->agent("grml-tips 0.0 ");    # set the HTTP 'browser' type
+        my $res = $ua->post(
+            'http://deb.grml.org/~formorer/submissions/keyword.cgi',
+            [   'version' => $version,
+                'keyword' => $pattern
+            ],
+        );
+        if ( $res->is_success ) {
+            my $content = $res->decoded_content;
+            if ( $content =~ /Submission received/ ) {
+                say
+                    "Keyword '$pattern' has been submitted to grml's keyword database.\nThanks.";
+            }
+            else {
+                say "Your pattern could not be submitted.\n",
+                    "Please file a bug against grml-tips at ",
+                    "http://bts.grml.org/\n",
+                    "Thanks!";
+            }
+        }
+        else {
+            print "Could not submitt '$pattern': " . $res->status_line . "\n";
+        }
 
-print "Sorry, could not find a tip for '$pattern'. :-(\n"
-    . "If you want to submit a tip please mail it to tips\@grml.org - thank "
-    . "you!\n\n" unless $tip_flag;
+    }
+    else {
+        print
+            "'$pattern' has not been sent to grml's keyword database as requested.\n";
+        print
+            "If you want to submit a tip please mail it to tips\@grml.org - thank you!\n";
+    }
+}
 
 ## END OF FILE #################################################################