Changeset 47 for trunk

Timestamp:

07/26/07 01:54:10 (18 months ago)

Author:

scott

Message:

Beginning awkpaste phase #1

• Adds a status record to the schema, with triggers making it a singleton.
• Migrated from awkpp to cpp
• Added status tracking to awkbot
• Adds a socket library to the lib/ tree
• A bootstrap is created so a temporary file can be allocated before awkbot actually starts.
  • This boot strap makes use of tempfile.awk, a new little function in it's own place
  • The bootstrap is called as a part of a larger, sh based bootstrapping which handles calls to cpp
• Removes awkpp

NOTE: The code is kind of dirty as of this commit, particularly
trunk/awkbot/lib/awkbot.awk. It includes a lot of cruft which
can be removed or abstracted away. Further tickets should be created
to make sure this happens!

closes #52 & #53

Location:

trunk/awkbot

Files:

• awkbot.sql (modified) (1 diff)
• bin/awkbot (added)
• bin/awkpp (deleted)
• bin/awkpp.awk (deleted)
• etc/awkbot.conf (modified) (2 diffs)
• lib/awkbot-boot.awk (added)
• lib/awkbot.awk (modified) (8 diffs)
• lib/awkbot_db_mysql.awk (modified) (2 diffs)
• lib/awkpaste.awk (modified) (1 diff)
• lib/cgi-lib.awk (modified) (1 diff)
• lib/irc.awk (modified) (3 diffs)
• lib/socket.awk (added)

trunk/awkbot/awkbot.sql

@@ -46 +46 @@
 INSERT INTO `qna` VALUES ('mysql.awk','http://www.blisted.org/svn/modules/mysql.awk/ until tag writes documentation');
 
+
+CREATE TABLE `status` (
+    `running` boolean not null default false,
+    `livefeed` varchar(120) default null
+);
+
+INSERT INTO `status` (running, livefeed) VALUES (FALSE, NULL);
+
+-- Make status a table with only one record, always
+-- Mysql is ghetto like that... we can't raise errors, we have to actually just
+-- create one with an invalid statement...
+
+DELIMITER / 
+
+CREATE TRIGGER t_status_final BEFORE INSERT ON status
+FOR EACH ROW
+BEGIN
+    DECLARE temp integer;
+    SELECT `INSERT is not allowed` INTO temp FROM status;
+END;
+/
+
+CREATE TRIGGER t_status_final_d BEFORE DELETE ON status
+FOR EACH ROW
+BEGIN
+    DECLARE temp integer;
+    SELECT `DELETE is not allowed` INTO temp FROM status;
+END;
+/
+
+DELIMITER ;

trunk/awkbot/etc/awkbot.conf

@@ -2 +2 @@
 # IRC Stuff
 <irc>
-    nickname awkbot-test
-    altnick awkbot_test
+    nickname awktest
+    altnick awk_test
     username awkbot
     realname AWK IRC bot
@@ -22 +22 @@
 
 <mysql>
-    username tag
-    password darwin
+    username scott
+    password scott
     database awkbot
 </mysql>

trunk/awkbot/lib/awkbot.awk

@@ -7 +7 @@
 # -----------------------------------------------------------------------------
 
-#include <assert.awk>
-#include <config.awk>
-#include <awkbot_db_mysql.awk>
-#include <irc.awk>
-#include <awkdoc.awk>
-#include <join.awk>
-#include <queue.awk>
+#import <assert.awk>
+#import <config.awk>
+#import <awkbot_db_mysql.awk>
+#import <irc.awk>
+#import <awkdoc.awk>
+#import <join.awk>
+#import <queue.awk>
 
 #define TEST 1
@@ -29 +29 @@
 
 BEGIN {
-#    assert(irc,            "Awkbot depends on irc.awk")
-#    assert(awkbot_config,  "Awkbot depends on config.awk")
-
     VERSION = "awkbot $Revision: 412 $"
 
@@ -41 +38 @@
     assert(config("irc.server"), "server not specified in config")
 
+    awkbot_db_init()
+
     irc_set("debug",    config("irc.debug"))
 
@@ -50 +49 @@
     irc_register("privmsg")
     irc_register("ctcp")
-
+    irc_register("error")
+
+    print "Using", awkbot_db_status_livefeed(), "as live feed from awkbot"
+
+    # XXX Nasty hack, make this not need direct access to the irc array!
+    irc["tempfile"] = awkbot_db_status_livefeed()
+    irc_connect(config("irc.server"))
+}
+
+END {
+    awkbot_db_status_connected(0)
+}
+
+# Nasty hack to clean up every few records
+NR % 3 == 0 {
+    print "DEBUG: Truncating file.."
+    printf "" > irc["tempfile"] 
+    fflush(irc["tempfile"])
+    close(irc["tempfile"])
+}
+$1 == "say" { 
+    _msg = $3
+    for (i = 4; i < NF; i++) {
+        _msg = _msg " " $i
+    }
+    print "Saying " _msg " to " $2
+    irc_privmsg($2, _msg)
+}
+
+function irc_handler_error () {
     irc_connect(config("irc.server"))
 }
@@ -61 +89 @@
 
     if (msg) irc_sockwrite(msg "\r\n")
+
+    awkbot_db_status_connected(1)
 }
 
@@ -76 +106 @@
 }
 
+func calc (expr ,result,bc) {
+    bc = "bc -q"
+    print "scale=10" |& bc
+    print expr       |& bc
+    print "quit"     |& bc
+    bc |& getline result
+    close(bc)
+
+    # coerce to number
+    return result + 0
+}
+
 function irc_handler_privmsg (nick, host, recipient, message, arg  \
     ,direct,target,address,action,c_msg,argc,t,q,a) {
@@ -118 +160 @@
         # It's only numbers and stuff
         else if (c_msg ~ /^[0-9^.*+\/() -]*$/) {
-            action = "bc -q"
-            print "scale=10" |& action
-            print c_msg      |& action
-            print "quit"     |& action
-            action |& getline a
-            close(action)
-            irc_privmsg(target, address (a + 0)) 
-                # Coerce the result into an array
+            irc_privmsg(target, address calc(c_msg)) 
         }
         else {
@@ -161 +196 @@
         }
     }
+    else if (arg[1] == nick) {
+        irc_privmsg(target, address "Talking about yourself, are we?")
+    }
 }
 

trunk/awkbot/lib/awkbot_db_mysql.awk

@@ -7 +7 @@
 # deps: assert.awk mysql.awk
 
-#include <assert.awk>
-#include <mysql.awk>
+#import <assert.awk>
+#import <config.awk>
+#import <mysql.awk>
 
-BEGIN {
-    # Config wont get parsed until awkbot's BEGIN {} block
-    irc_register("initialize")
-}
-
-function irc_handler_initialize () {
+function awkbot_db_init () {
     mysql_login(config("mysql.username"), config("mysql.password"))
     mysql_db(config("mysql.database"))
@@ -78 +74 @@
 }
 
+function awkbot_db_status_running (running) {
+    mysql_finish(mysql_query("UPDATE status SET running = " \
+        running ? 1 : 0))
+
+    if (! running) 
+        mysql_finish(mysql_query("UPDATE status SET livefeed = null"))
+}
+
+function awkbot_db_status_connected (connected) {
+    mysql_finish(mysql_query("UPDATE status SET connected = " \
+        connected ? 1 : 0))
+}
+
+function awkbot_db_status_livefeed (filename    ,rv,row) {
+    if (filename) {
+        mysql_finish(mysql_query("UPDATE status SET livefeed = " \
+                    mysql_quote(filename)))
+    }
+    else {
+        rv = mysql_query("SELECT livefeed FROM status")
+        
+        mysql_fetch_row(rv, row)
+        filename = row[1]
+
+        mysql_finish(rv)
+    }
+
+    return filename
+}
+
 function awkbot_db_info (keyword    ,result,rv,row) {
     rv = mysql_query("select keyword, text from info where keyword like " \

trunk/awkbot/lib/awkpaste.awk

@@ -1 +1 @@
 #!/usr/bin/awk -f
 
-#include <cgi-lib.awk>
+#import <cgi-lib.awk>
 
 BEGIN {

trunk/awkbot/lib/cgi-lib.awk

@@ -7 +7 @@
 # Set this globally so we don't have to ensure it happens anywhere else...
     ORS = "\r\n"
+
+    # Handle uploads...
+
+    # gawk only
+    match(HEADER["Content-Disposition"], / filename="([^;]*)"/, r)
+    filename = r[1] ? r[1] : "multipart/mixed"
+
+    if (filename && multipart) {
+        tempfilename = tempfile("cgi-awk")
+    }
+
+    # When it's multipart, save headers and body together
+    if (multipart) {
+        for (key in HEADER) print key ":", HEADER[key] >> tempfilename
+        print "\r\n" >> tempfilename
+    }
+
+    while (buffersize < length(input)) {
+        getline i
+        print i >> tempfile
+    }
+
+    print cgi_read_buffer() >> tempfilename
 }
 

trunk/awkbot/lib/irc.awk

@@ -10 +10 @@
 # -----------------------------------------------------------------------------
 
-# Init
+# This library implements the IRC protocol only.  An example of how to make it
+# work with gawk's /inet/tcp is provided below.
 
-BEGIN {
-    if (!irc["tempfile"]) irc["tempfile"] = irc_allocate_tempfile()
-
-    print "INIT" > irc["tempfile"]
-    close(irc["tempfile"])
-
-    ARGV[ARGC++] = irc["tempfile"] 
-}
-
-END {
-    system(sprintf("rm %s", irc["tempfile"]))
-}
-
+#import <socket.awk>
 
 # -----------------------------------------------------------------------------
@@ -84 +73 @@
 # Connection API
 function irc_privmsg (target, message) {
-    irc_sockwrite(sprintf("PRIVMSG %s :%s\r\n", target, message))
+    irc_sockwrite(sprintf("PRIVMSG %s :%s", target, message))
 }
 
 function irc_ctcp (target, type, arg) {
-    irc_sockwrite(sprintf("PRIVMSG %s :\x01%s %s\x01\r\n", target, type, arg))
+    irc_sockwrite(sprintf("PRIVMSG %s :\x01%s %s\x01", target, type, arg))
 }
 
 function irc_ctcp_reply (target, type, arg) {
-    irc_sockwrite(sprintf("NOTICE %s :\x01%s %s\x01\r\n", target, type, arg))
+    irc_sockwrite(sprintf("NOTICE %s :\x01%s %s\x01", target, type, arg))
 }
 
 function irc_join (channel) {
-    irc_sockwrite(sprintf("JOIN %s\r\n", channel))
+    irc_sockwrite(sprintf("JOIN %s", channel))
 }
 
 function irc_part (channel, message) {
-    irc_sockwrite(sprintf("PART %s :%s\r\n", channel, message))
+    irc_sockwrite(sprintf("PART %s :%s", channel, message))
 }
 
 function irc_quit (message) {
-    irc_sockwrite(sprintf("QUIT :%s\r\n", message))
+    irc_sockwrite(sprintf("QUIT :%s", message))
 }
 
-function irc_connect (host, port) { 
-    irc_sockopen(host, port) 
-    irc_sockwrite("NICK " irc["nickname"] "\n")
-    irc_sockwrite("USER " irc["username"] " a a :" irc["realname"] "\r\n")
+function irc_connect (server    ,t,host,port) { 
+    # Pull host and port from host:port string
+    split(server, t, /:/)
+
+    host = t[1]
+    port = t[2] ? t[2] : 6667
+
+    socket_init(irc_socket, irc["tempfile"], !irc["tailpipe"])
+    socket_connect(irc_socket, host, port)
+
+    irc_sockwrite("NICK " irc["nickname"])
+    irc_sockwrite("USER " irc["username"] " a a :" irc["realname"])
 }
 
@@ -118 +115 @@
 # Raw internals
 
-function irc_allocate_tempfile (    mktemp,tempfile) {
-    if (! irc["command", "mktemp"]) mktemp = "mktemp /tmp/irc.awk.XXXXXX"
-    else mktemp = irc["command", "mktemp"]
-
-    mktemp | getline tempfile
-    close(mktemp)
-
-    return tempfile
+# Now just wraps socket_write
+function irc_sockwrite (data) {
+    socket_write(irc_socket, data "\r\n")
 }
 
-function irc_sockwrite (data) {
-    if (irc["socket"]) printf data |& irc["socket"]
-    else irc_error("Attempt to write" data " to closed socket")
+# Just wraps socket_close
+function irc_sockclose () {
+    if (irc_socket) {
+        socket_close(irc_socket)
+    }
 
-    if (irc["debug"]) printf "> %s\n", data
-}
-
-function irc_sockopen (host,port    ,t) {
-    if (! irc["socket"]) {
-        if (! port) {
-            if (host !~ /:/) {
-                irc_error("irc_sockopen called without port number")
-            }
-
-            split(host,t,/:/)
-            host = t[1]
-            port = t[2]
-        }
-
-        irc["socket"] = "/inet/tcp/0/" host "/" port
-    }
-}
-
-function irc_sockclose () {
-    if (irc["socket"]) {
-        close(irc["socket"])
-        delete irc["socket"]
-    }
     else irc_error("irc_sockclose called with no open socket")
 }
 
 # -----------------------------------------------------------------------------
-# Main loop
-
-{ 
-    if (irc["socket"]) {
-        # Get next line from socket and put in file for parsing
-        irc["socket"] |& getline
-    
-        # Cycle Tempfile every 1000th line.
-        if (FNR == 1000) {
-            print > irc["tempfile"]
-            ARGV[ARGC++] = FILENAME
-            delete ARGV[ARGC - 2]
-        } 
-        
-        # Write to tempfile for next iteration
-        else print >> irc["tempfile"] 
-        close(irc["tempfile"])
-
-        if (irc["debug"]) print
-    }
-}
+# This is an example main loop, awkbot used to use it.  I keep it in this
+# source file only as an example, and will some day soon move it out into a
+# test suite or some other bit of code.  This code is well tested, and works
+# like a charm, without flooding the filesystem with too much data.
+#
+# # Initialization
+#
+# BEGIN {
+#     if (!irc["tempfile"]) irc["tempfile"] = irc_allocate_tempfile()
+# 
+#     print "INIT" > irc["tempfile"]
+#     close(irc["tempfile"])
+# 
+#     ARGV[ARGC++] = irc["tempfile"] 
+# }
+# 
+# # Cleanup
+#
+# END {
+#     system(sprintf("rm %s", irc["tempfile"]))
+# }
+# 
+# # Main loop
+# 
+# { 
+#
+#     if (irc["using_inet_tcp"] && irc["socket"]) {
+#         # Get next line from socket and put in file for parsing
+#         irc["socket"] |& getline
+#     
+#         # Cycle Tempfile every 1000th line.
+#         if (FNR == 1000) {
+#             print > irc["tempfile"]
+#             ARGV[ARGC++] = FILENAME
+#             delete ARGV[ARGC - 2]
+#         } 
+#         
+#         # Write to tempfile for next iteration
+#         else print >> irc["tempfile"] 
+#         close(irc["tempfile"])
+# 
+#         if (irc["debug"]) print
+#     }
+# }
 
 END { if (irc["socket"]) close(irc["socket"]) }