Changeset 56

Timestamp:

03/01/08 14:30:57 (10 months ago)

Author:

scott

Message:

Awkpaste initial revision

• Configurable values in awkpaste
• Scruffy version of cgi-lib with URL decoding
• Added paste operations to awkbot_db
• Added stream updates to awkpaste (should probably be a separate function)
• Added config changes to awkbot.conf
• Added paste.cgi bootstrap for awkpaste code…

Location:

trunk/awkbot

Files:

• bin/awkbot (modified) (1 diff)
• cgi-bin (added)
• cgi-bin/paste.cgi (added)
• etc/awkbot.conf (modified) (3 diffs)
• htdocs (added)
• htdocs/index.xhtml (added)
• src/awkbot.awk (modified) (1 diff)
• src/awkbot_db_mysql.awk (modified) (1 diff)
• src/awkpaste.awk (modified) (2 diffs)
• src/cgi-lib.awk (modified) (3 diffs)

trunk/awkbot/bin/awkbot

@@ -16 +16 @@
 # Give our continuous input through a pipe to tail.  tail -f never exits.
 # Note, that this means awkbot never exits unless killed from the outside.
+chmod 666 $livedata
 tail -f $livedata | awk -f $awkbot
 

trunk/awkbot/etc/awkbot.conf

@@ -2 +2 @@
 # IRC Stuff
 <irc>
-    nickname awktest
-    altnick awk_test
+    nickname awkbot
+    altnick awkbot-
     username awkbot
     realname AWK IRC bot
@@ -11 +11 @@
 #    channel awk perl pike
 #    channel c++
-    channel awk
+    channel awk #leapfrog
 #    channel blacksun
     debug 1
-#    startup PRIVMSG NickServ :identify darwin
+    startup PRIVMSG NickServ :identify darwin
 </irc>
 
@@ -22 +22 @@
 
 <mysql>
-    username scott
-    password scott
+    username scottmc
+    password scottmc
     database awkbot
 </mysql>
+
+<paste>
+    channel #awk
+    cgi http://awkpaste.blisted.org/cgi/paste.cgi
+    form http://awkpaste.blisted.org/
+</paste>

trunk/awkbot/src/awkbot.awk

@@ -71 +71 @@
 $1 == "say" { 
     _msg = $3
-    for (i = 4; i < NF; i++) {
+    for (i = 4; i <= NF; i++) {
         _msg = _msg " " $i
     }

trunk/awkbot/src/awkbot_db_mysql.awk

@@ -119 +119 @@
     return result
 }
+
+function awkbot_db_paste_add (nick, description, content) {
+    mysql_finish(mysql_query("INSERT INTO paste (nick, subject, content) " \
+            " VALUES (" mysql_quote(nick) "," \
+                        mysql_quote(description) "," \
+                        mysql_quote(content) ")"))
+}
+
+function awkbot_db_paste_get (id,row    ,rv) {
+    rv = mysql_query("SELECT nick, subject, content FROM paste " \
+            "WHERE paste_id = " mysql_quote(id))
+
+    mysql_fetch_assoc(rv, row)
+    mysql_finish(rv)
+}
+
+function awkbot_db_paste_last (     result,row,rv) {
+    rv = mysql_query("SELECT max(paste_id) as paste_id FROM paste");
+
+    if (mysql_fetch_assoc(rv, row)) {
+        result = row["paste_id"]
+    }
+
+    mysql_finish(rv)
+
+    return result
+}

trunk/awkbot/src/awkpaste.awk

@@ -2 +2 @@
 
 #import <cgi-lib.awk>
+#import <config.awk>
+#import <awkbot_db_mysql.awk>
 
 BEGIN {
@@ -7 +9 @@
     cgi_headers("text/plain")
 
-    for (key in query) {
-        print key, ":", query[key]
+    config_load("etc/awkbot.conf")
+    awkbot_db_init()
+
+    if (query["id"]) {
+        awkbot_db_paste_get(query["id"], paste)
+
+        id      = query["id"]
+        nick    = paste["nick"]
+        subject = paste["subject"]
+        content = paste["content"]
+
+        gsub(/\\n/, "\n", content)
     }
+    else {
+        stream  = awkbot_db_status_livefeed()
+    
+        nick    = query["name"]
+        subject = query["description"]
+        content = query["content"]
+    
+        awkbot_db_paste_add(nick, subject, content)
+        # This has synchronization issues...but what the hell, this is awk
+        id      = awkbot_db_paste_last()
+    
+        if (id) {
+            printf("say %s %s pasted %s at %s?id=%s\n",    \
+                    config("paste.channel"), nick, subject,\
+                    config("paste.cgi"), id) >> stream
+    
+            close(stream)
+        }
+    }
+
+
+    print "Id:", id
+    print "Nick:", nick
+    print "Subject:", subject
+    print content
 }

trunk/awkbot/src/cgi-lib.awk

@@ +1 @@
+
+#import <chr.awk>
+
 BEGIN {
     if (ENVIRON["REQUEST_METHOD"] == "POST") 
@@ -7 +10 @@
 # Set this globally so we don't have to ensure it happens anywhere else...
     ORS = "\r\n"
+}
 
-    # Handle uploads...
+function uri_decode (string     ,i,len,result) {
+    # for portability, we have to continuously work in the argument provided...
+    # standard awk has no Nth match
+    len = length(string)
 
-    # gawk only
-    match(HEADER["Content-Disposition"], / filename="([^;]*)"/, r)
-    filename = r[1] ? r[1] : "multipart/mixed"
-
-    if (filename && multipart) {
-        tempfilename = tempfile("cgi-awk")
+    while ((i = index(string, "%")) && i + 2 < len) {
+        result = result substr(string, 1, i - 1)
+        result = result chr(dec( substr(string, i + 1, 2) ))
+        string = substr(string, i + 3)
     }
 
-    # When it's multipart, save headers and body together
-    if (multipart) {
-        for (key in HEADER) print key ":", HEADER[key] >> tempfilename
-        print "\r\n" >> tempfilename
-    }
+    result = result string
 
-    while (buffersize < length(input)) {
-        getline i
-        print i >> tempfile
-    }
-
-    print cgi_read_buffer() >> tempfilename
+    gsub("+", " ", result)
+    return result
 }
 
@@ -35 +32 @@
     split(_cgilib_in, pairs, /\&/)
     i = 0    
+
     while (pairs[++i]) {
         split(pairs[i], each, /=/)
-        query[each[1]] = each[2]
+
+        # This assumes no encoding will exist in keys...typically a safe
+        # assumption, but not necessarily always true
+        query[each[1]] = uri_decode(each[2])
     }
 }