From b8b847fb8816b6b67bd476f279b1e79bc0678b09 Mon Sep 17 00:00:00 2001 From: Chris Oliver Date: Sat, 22 Oct 2011 11:10:59 -0500 Subject: Removed old configs and added debug to file upload --- conf/example.conf | 30 ------------------------------ conf/stylesheet.css | 18 ------------------ logbot.py | 2 +- 3 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 conf/example.conf delete mode 100644 conf/stylesheet.css diff --git a/conf/example.conf b/conf/example.conf deleted file mode 100644 index d640430..0000000 --- a/conf/example.conf +++ /dev/null @@ -1,30 +0,0 @@ -[irc] -server = irc.freenode.net -port = 6667 -server_password = password -channels = #keryx,#excid3 - -nick = Timber -nick_password = password - -# Comma separated list of owner nicks -owners = excid3 - -[log] -# Location to store the logs -folder = logs -# Location of the stylesheet -stylesheet = conf/stylesheet.css - -[format] -join = -!- %user% [%host%] has joined %channel% -kick = -!- %user% was kicked from %channel% by %kicker% [%reason%] -mode = -!- mode/%channel% [%modes% %person%] by %giver% -nick = %old% is now known as %new% -part = -!- %user% [%host%] has parted %channel% -pubmsg = <%user%> %message% -pubnotice = -%user%:%channel%- %message% -quit = -!- %user% has quit [%reason%] -topic = %user% changed topic of %channel% to: %topic% -action = * %user% %action% -help = Check out http://excid3.com \ No newline at end of file diff --git a/conf/stylesheet.css b/conf/stylesheet.css deleted file mode 100644 index 3468ee2..0000000 --- a/conf/stylesheet.css +++ /dev/null @@ -1,18 +0,0 @@ -body { - background-color: #F8F8FF; - font-family: Fixed, monospace; - font-size: 13px; -} -h1 { - font-family: sans-serif; - font-size: 24px; - text-align: center; -} -a, .time { - color: #525552; - text-decoration: none; -} -a:hover, .time:hover { text-decoration: underline; } -.person { color: #DD1144; } -.join, .part, .quit, .kick, .mode, .topic, .nick { color: #42558C; } -.notice { color: #AE768C; } \ No newline at end of file diff --git a/logbot.py b/logbot.py index c956940..6e85623 100644 --- a/logbot.py +++ b/logbot.py @@ -206,7 +206,7 @@ class Logbot(SingleServerIRCBot): full_fname = os.path.join(root, fname) remote_fname = "/".join(full_fname.split("/")[1:]) - print repr(remote_fname) + if DEBUG: print repr(remote_fname) try: self.ftp.storbinary("STOR %s" % remote_fname, open(full_fname, "rb")) except ftplib.error_perm, e: -- cgit v1.2.3-70-g09d2