Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Oliver <excid3@gmail.com>2011-10-22 11:10:59 -0500
committerChris Oliver <excid3@gmail.com>2011-10-22 11:10:59 -0500
commitb8b847fb8816b6b67bd476f279b1e79bc0678b09 (patch)
treed0cf887dc7524cd12e794f55df37f422c36b0c45
parentaa7bfe56aec2d3fcf8dde6ff38599f192937f5f6 (diff)
Removed old configs and added debug to file upload
-rw-r--r--conf/example.conf30
-rw-r--r--conf/stylesheet.css18
-rw-r--r--logbot.py2
3 files changed, 1 insertions, 49 deletions
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 = -!- <span class="join">%user%</span> [%host%] has joined %channel%
-kick = -!- <span class="kick">%user%</span> was kicked from %channel% by %kicker% [%reason%]
-mode = -!- mode/<span class="mode">%channel%</span> [%modes% %person%] by %giver%
-nick = <span class="nick">%old%</span> is now known as <span class="nick">%new%</span>
-part = -!- <span class="part">%user%</span> [%host%] has parted %channel%
-pubmsg = <span class="person" style="color:%color%">&lt;%user%&gt;</span> %message%
-pubnotice = <span class="notice">-%user%:%channel%-</span> %message%
-quit = -!- <span class="quit">%user%</span> has quit [%reason%]
-topic = <span class="topic">%user%</span> changed topic of <span class="topic">%channel%</span> to: %topic%
-action = <span class="person" style="color:%color%">* %user% %action%</span>
-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: