Rewrite to use flask and peewee
This commit is contained in:
Jonatan Pålsson
parent
7d4cfd702e
commit
0b0ff1b8c8
7 changed files with 442 additions and 238 deletions
60
Db.py
Normal file
60
Db.py
Normal file
|
|
@ -0,0 +1,60 @@
|
||||||
|
from peewee import *
|
||||||
|
import datetime
|
||||||
|
|
||||||
|
DATABASE = "irc.db"
|
||||||
|
|
||||||
|
database = SqliteDatabase(DATABASE)
|
||||||
|
|
||||||
|
class BaseModel(Model):
|
||||||
|
class Meta:
|
||||||
|
database = database
|
||||||
|
|
||||||
|
class Day(BaseModel):
|
||||||
|
date = CharField()
|
||||||
|
|
||||||
|
class Channel(BaseModel):
|
||||||
|
name = CharField(unique = True)
|
||||||
|
|
||||||
|
class LogMessage(BaseModel):
|
||||||
|
day = ForeignKeyField(Day)
|
||||||
|
channel = ForeignKeyField(Channel)
|
||||||
|
nickname = CharField()
|
||||||
|
datetime = DateTimeField()
|
||||||
|
message_type = CharField()
|
||||||
|
message = CharField()
|
||||||
|
|
||||||
|
|
||||||
|
def create_tables():
|
||||||
|
database.connect()
|
||||||
|
try:
|
||||||
|
database.create_tables([LogMessage, Day, Channel])
|
||||||
|
except OperationalError:
|
||||||
|
pass # Database already exists
|
||||||
|
|
||||||
|
def get_current_day():
|
||||||
|
today = datetime.date.today()
|
||||||
|
try:
|
||||||
|
return Day.get(Day.date == today)
|
||||||
|
except:
|
||||||
|
Day.create(date = today)
|
||||||
|
return Day.get(Day.date == today)
|
||||||
|
|
||||||
|
def get_channel(c):
|
||||||
|
try:
|
||||||
|
return Channel.get(Channel.name == c)
|
||||||
|
except:
|
||||||
|
Channel.create(name = c)
|
||||||
|
return Channel.get(Channel.name == c)
|
||||||
|
|
||||||
|
def add_log_message(channel, nickname, message_type, message = None):
|
||||||
|
msg = LogMessage.create(
|
||||||
|
day = get_current_day(),
|
||||||
|
channel = get_channel(channel),
|
||||||
|
nickname = nickname,
|
||||||
|
datetime = datetime.datetime.now().strftime("%H:%m:%S"),
|
||||||
|
message_type = message_type,
|
||||||
|
message = message)
|
||||||
|
|
||||||
|
def show_all_messages():
|
||||||
|
for message in LogMessage.select():
|
||||||
|
print "<%s> %s" % (message.nickname, message.message)
|
||||||
335
logbot.py
335
logbot.py
|
|
@ -56,11 +56,17 @@ from threading import Timer
|
||||||
|
|
||||||
import re
|
import re
|
||||||
from pullrequest import PullRequest
|
from pullrequest import PullRequest
|
||||||
|
from Db import *
|
||||||
|
from flask import *
|
||||||
|
import threading
|
||||||
|
|
||||||
pat1 = re.compile(r"(^|[\n ])(([\w]+?://[\w\#$%&~.\-;:=,?@\[\]+]*)(/[\w\#$%&~/.\-;:=,?@\[\]+]*)?)", re.IGNORECASE | re.DOTALL)
|
pat1 = re.compile(r"(^|[\n ])(([\w]+?://[\w\#$%&~.\-;:=,?@\[\]+]*)(/[\w\#$%&~/.\-;:=,?@\[\]+]*)?)", re.IGNORECASE | re.DOTALL)
|
||||||
|
|
||||||
#urlfinder = re.compile("(?i)\b((?:[a-z][\w-]+:(?:/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'\".,<>?«»“”‘’]))")
|
#urlfinder = re.compile("(?i)\b((?:[a-z][\w-]+:(?:/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'\".,<>?«»“”‘’]))")
|
||||||
|
|
||||||
|
flaskapp = Flask(__name__)
|
||||||
|
flaskapp.config["TEMPLATES_AUTO_RELOAD"] = True
|
||||||
|
|
||||||
def urlify2(value):
|
def urlify2(value):
|
||||||
return pat1.sub(r'\1<a href="\2" target="_blank">\3</a>', value)
|
return pat1.sub(r'\1<a href="\2" target="_blank">\3</a>', value)
|
||||||
#return urlfinder.sub(r'<a href="\1">\1</a>', value)
|
#return urlfinder.sub(r'<a href="\1">\1</a>', value)
|
||||||
|
|
@ -91,80 +97,63 @@ FTP_FOLDER = ""
|
||||||
# The amount of messages to wait before uploading to the FTP server
|
# The amount of messages to wait before uploading to the FTP server
|
||||||
FTP_WAIT = 25
|
FTP_WAIT = 25
|
||||||
|
|
||||||
CHANNEL_LOCATIONS_FILE = os.path.expanduser("~/.logbot-channel_locations.conf")
|
|
||||||
DEFAULT_TIMEZONE = 'UTC'
|
DEFAULT_TIMEZONE = 'UTC'
|
||||||
|
|
||||||
default_format = {
|
### Web interface
|
||||||
"help" : HELP_MESSAGE,
|
|
||||||
"action" : '<p class="pperson">%time% <span class="person" style="color:%color%">* %user% %message%</span></p>',
|
|
||||||
"join" : '<p class="pjoin">%time% -!- <span class="join">%user%</span> [%host%] has joined %channel%</p>',
|
|
||||||
"kick" : '<p class="pkick">%time% -!- <span class="kick">%user%</span> was kicked from %channel% by %kicker% [%reason%]</p>',
|
|
||||||
"mode" : '<p class="pmode">%time% -!- mode/<span class="mode">%channel%</span> [%modes% %person%] by %giver%</p>',
|
|
||||||
"nick" : '<p class="pnick">%time% <span class="nick">%old%</span> is now known as <span class="nick">%new%</span></p>',
|
|
||||||
"part" : '<p class="ppart">%time% -!- <span class="part">%user%</span> [%host%] has parted %channel%</p>',
|
|
||||||
"pubmsg" : '<p class="pperson">%time% <span class="person" style="color:%color%"><%user%></span> %message%</p>',
|
|
||||||
"pubnotice" : '<p class="pnotice">%time% <span class="notice">-%user%:%channel%-</span> %message%</p>',
|
|
||||||
"quit" : '<p class="pquit">%time% -!- <span class="quit">%user%</span> has quit [%message%]</p>',
|
|
||||||
"topic" : '<p class="ptopic">%time% <span class="topic">%user%</span> changed topic of <span class="topic">%channel%</span> to: %message%</p>',
|
|
||||||
}
|
|
||||||
|
|
||||||
html_header = """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
@flaskapp.route("/search/nickname/<nickname>/")
|
||||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
@flaskapp.route("/search/channel/<channel>/")
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
@flaskapp.route("/search/")
|
||||||
<head>
|
def search(channel = None, nickname = None):
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
messages = []
|
||||||
<title>%title%</title>
|
query = request.args.get('query')
|
||||||
<script>
|
if channel:
|
||||||
function modClass(c, disp) {
|
try:
|
||||||
var elems = document.querySelectorAll(c);
|
channel = Channel.get(Channel.name == channel)
|
||||||
for (var i = 0; i < elems.length; i++) {
|
messages = LogMessage.select() \
|
||||||
elems[i].style.display = disp;
|
.where(LogMessage.channel == channel and \
|
||||||
}
|
LogMessage.message.contains(query))
|
||||||
}
|
except:
|
||||||
|
pass # No such channel
|
||||||
|
elif nickname:
|
||||||
|
messages = LogMessage.select() \
|
||||||
|
.where(LogMessage.nickname == nickname and \
|
||||||
|
LogMessage.message.contains(query))
|
||||||
|
else:
|
||||||
|
messages = LogMessage.select() \
|
||||||
|
.where(LogMessage.message.contains(query))
|
||||||
|
|
||||||
function toggleClass(c) {
|
return render_template("messages.html",
|
||||||
var elem = document.querySelectorAll(c)[0];
|
messages=messages,
|
||||||
if (elem.style.display == "none") {
|
back_button=False,
|
||||||
modClass(c, "");
|
date=True,
|
||||||
} else {
|
channel=channel)
|
||||||
modClass(c, "none");
|
|
||||||
}
|
@flaskapp.route("/channels/<channel>/")
|
||||||
}
|
@flaskapp.route("/channels/<channel>/<day>/")
|
||||||
</script>
|
def channel(channel, day = None, query = None):
|
||||||
<style type="text/css">
|
channel = Channel.get(Channel.name == channel)
|
||||||
body {
|
|
||||||
background-color: #F8F8FF;
|
if day:
|
||||||
font-family: Fixed, monospace;
|
d = Day.get(Day.date == day)
|
||||||
font-size: 13px;
|
messages = LogMessage.select() \
|
||||||
}
|
.where(LogMessage.day == d and \
|
||||||
h1 {
|
LogMessage.channel == channel)
|
||||||
font-family: sans-serif;
|
|
||||||
font-size: 24px;
|
return render_template("messages.html",
|
||||||
text-align: center;
|
messages=messages,
|
||||||
}
|
back_button=True,
|
||||||
p {
|
date=False,
|
||||||
padding: 0;
|
channel=channel)
|
||||||
margin: 0;
|
else:
|
||||||
}
|
days = LogMessage.select(LogMessage.day).distinct()
|
||||||
a, .time {
|
days = [ day.day for day in days ]
|
||||||
color: #525552;
|
return render_template("days.html", back_button=True, days=days, channel=channel)
|
||||||
text-decoration: none;
|
|
||||||
}
|
@flaskapp.route("/")
|
||||||
a:hover, .time:hover { text-decoration: underline; }
|
@flaskapp.route("/channels/")
|
||||||
.person { color: #DD1144; }
|
def channels():
|
||||||
.join, .part, .quit, .kick, .mode, .topic, .nick { color: #42558C; }
|
return render_template("channels.html", back_button=True, channels = Channel.select())
|
||||||
.notice { color: #AE768C; }
|
|
||||||
.time:target { color: red; }
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<h1>%title%</h1>
|
|
||||||
<a href="..">Back</a>
|
|
||||||
<button onclick="toggleClass('.pjoin'); toggleClass('.ppart');">Toggle joins & parts</button>
|
|
||||||
<br />
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
"""
|
|
||||||
|
|
||||||
|
|
||||||
### Helper functions
|
### Helper functions
|
||||||
|
|
@ -198,58 +187,20 @@ def pairs(items):
|
||||||
while True:
|
while True:
|
||||||
yield next(items), next(items)
|
yield next(items), next(items)
|
||||||
|
|
||||||
def html_color(input):
|
|
||||||
"""
|
|
||||||
>>> html_color("This is plain but [30m this is in color")
|
|
||||||
'This is plain but <span style="color: #000316"> this is in color</span>'
|
|
||||||
>>> html_color("[32mtwo[37mcolors")
|
|
||||||
'<span style="color: #00aa00">two</span><span style="color: #F5F1DE">colors</span>'
|
|
||||||
"""
|
|
||||||
first = []
|
|
||||||
parts = color_pattern.split(input)
|
|
||||||
if len(parts) % 2:
|
|
||||||
# an odd number of parts occurred - first part is uncolored
|
|
||||||
first = [parts.pop(0)]
|
|
||||||
rest = itertools.starmap(replace_color, pairs(parts))
|
|
||||||
return ''.join(itertools.chain(first, rest))
|
|
||||||
|
|
||||||
def replace_color(code, text):
|
|
||||||
code = code.lstrip('[').rstrip('m')
|
|
||||||
colors = {
|
|
||||||
'30': '000316',
|
|
||||||
'31': 'aa0000',
|
|
||||||
'32': '00aa00',
|
|
||||||
'33': 'aa5500',
|
|
||||||
'34': '0000aa',
|
|
||||||
'35': 'E850A8',
|
|
||||||
'36': '00aaaa',
|
|
||||||
'37': 'F5F1DE',
|
|
||||||
}
|
|
||||||
if code not in colors:
|
|
||||||
return text
|
|
||||||
return '<span style="color: #%(color)s">%(text)s</span>' % dict(
|
|
||||||
color = colors[code],
|
|
||||||
text = text,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
### Logbot class
|
### Logbot class
|
||||||
|
|
||||||
class Logbot(SingleServerIRCBot):
|
class Logbot(SingleServerIRCBot):
|
||||||
def __init__(self, server, port, server_pass=None, channels=[],
|
def __init__(self, server, port, server_pass=None, channels=[],
|
||||||
nick="timber", nick_pass=None, format=default_format):
|
nick="pelux", nick_pass=None):
|
||||||
SingleServerIRCBot.__init__(self,
|
SingleServerIRCBot.__init__(self,
|
||||||
[(server, port, server_pass)],
|
[(server, port, server_pass)],
|
||||||
nick,
|
nick,
|
||||||
nick)
|
nick)
|
||||||
|
|
||||||
self.chans = [x.lower() for x in channels]
|
self.chans = [x.lower() for x in channels]
|
||||||
self.format = format
|
|
||||||
self.set_ftp()
|
self.set_ftp()
|
||||||
self.count = 0
|
|
||||||
self.nick_pass = nick_pass
|
self.nick_pass = nick_pass
|
||||||
|
|
||||||
self.load_channel_locations()
|
|
||||||
print "Logbot %s" % __version__
|
print "Logbot %s" % __version__
|
||||||
print "Connecting to %s:%i..." % (server, port)
|
print "Connecting to %s:%i..." % (server, port)
|
||||||
print "Press Ctrl-C to quit"
|
print "Press Ctrl-C to quit"
|
||||||
|
|
@ -263,115 +214,24 @@ class Logbot(SingleServerIRCBot):
|
||||||
def set_ftp(self, ftp=None):
|
def set_ftp(self, ftp=None):
|
||||||
self.ftp = ftp
|
self.ftp = ftp
|
||||||
|
|
||||||
def format_event(self, name, event, params):
|
def write_event(self, event_name, event, params={}):
|
||||||
msg = self.format[name]
|
if event_name == "nick":
|
||||||
for key, val in params.iteritems():
|
message = params["new"]
|
||||||
msg = msg.replace(key, val)
|
elif event_name == "kick":
|
||||||
|
message = "%s kicked %s from %s. Reason: %s" % (nm_to_n(params["kicker"]),
|
||||||
# Always replace %user% with e.source()
|
params["user"], params["channel"], params["reason"])
|
||||||
# and %channel% with e.target()
|
elif event_name == "mode":
|
||||||
msg = msg.replace("%user%", nm_to_n(event.source()))
|
message = "%s changed mode on %s: %s" % (params["giver"],
|
||||||
msg = msg.replace("%host%", event.source())
|
params["person"], params["modes"])
|
||||||
try: msg = msg.replace("%channel%", event.target())
|
elif len(event.arguments()) > 0:
|
||||||
except: pass
|
message = event.arguments()[0]
|
||||||
msg = msg.replace("%color%", self.color(nm_to_n(event.source())))
|
|
||||||
try:
|
|
||||||
user_message = cgi.escape(event.arguments()[0])
|
|
||||||
msg = msg.replace("%message%", html_color(user_message))
|
|
||||||
except: pass
|
|
||||||
|
|
||||||
return msg
|
|
||||||
|
|
||||||
def write_event(self, name, event, params={}):
|
|
||||||
# Format the event properly
|
|
||||||
if name == 'nick' or name == 'quit':
|
|
||||||
chans = params["%chan%"]
|
|
||||||
else:
|
else:
|
||||||
chans = event.target()
|
message = ""
|
||||||
msg = self.format_event(name, event, params)
|
|
||||||
msg = urlify2(msg)
|
|
||||||
|
|
||||||
# In case there are still events that don't supply a channel name (like /quit and /nick did)
|
add_log_message(event.target(),
|
||||||
if not chans or not chans.startswith("#"):
|
nm_to_n(event.source()),
|
||||||
chans = self.chans
|
event_name,
|
||||||
else:
|
message)
|
||||||
chans = [chans]
|
|
||||||
|
|
||||||
for chan in chans:
|
|
||||||
self.append_log_msg(chan, msg)
|
|
||||||
|
|
||||||
self.count += 1
|
|
||||||
|
|
||||||
if self.ftp and self.count > FTP_WAIT:
|
|
||||||
self.count = 0
|
|
||||||
print "Uploading to FTP..."
|
|
||||||
for root, dirs, files in os.walk("logs"):
|
|
||||||
#TODO: Create folders
|
|
||||||
|
|
||||||
for fname in files:
|
|
||||||
full_fname = os.path.join(root, fname)
|
|
||||||
|
|
||||||
if sys.platform == 'win32':
|
|
||||||
remote_fname = "/".join(full_fname.split("\\")[1:])
|
|
||||||
else:
|
|
||||||
remote_fname = "/".join(full_fname.split("/")[1:])
|
|
||||||
if DEBUG: print repr(remote_fname)
|
|
||||||
|
|
||||||
# Upload!
|
|
||||||
try: self.ftp.storbinary("STOR %s" % remote_fname, open(full_fname, "rb"))
|
|
||||||
# Folder doesn't exist, try creating it and storing again
|
|
||||||
except ftplib.error_perm, e: #code, error = str(e).split(" ", 1)
|
|
||||||
if str(e).split(" ", 1)[0] == "553":
|
|
||||||
self.ftp.mkd(os.path.dirname(remote_fname))
|
|
||||||
self.ftp.storbinary("STOR %s" % remote_fname, open(full_fname, "rb"))
|
|
||||||
else: raise e
|
|
||||||
# Reconnect on timeout
|
|
||||||
except ftplib.error_temp, e: self.set_ftp(connect_ftp())
|
|
||||||
# Unsure of error, try reconnecting
|
|
||||||
except: self.set_ftp(connect_ftp())
|
|
||||||
|
|
||||||
print "Finished uploading"
|
|
||||||
|
|
||||||
def append_log_msg(self, channel, msg):
|
|
||||||
print "%s >>> %s" % (channel, msg)
|
|
||||||
#Make sure the channel is always lowercase to prevent logs with other capitalisations to be created
|
|
||||||
channel_title = channel
|
|
||||||
channel = channel.lower()
|
|
||||||
|
|
||||||
# Create the channel path if necessary
|
|
||||||
chan_path = "%s/%s" % (LOG_FOLDER, channel)
|
|
||||||
if not os.path.exists(chan_path):
|
|
||||||
os.makedirs(chan_path)
|
|
||||||
|
|
||||||
# Create channel index
|
|
||||||
write_string("%s/index.html" % chan_path, html_header.replace("%title%", "%s | Logs" % channel_title))
|
|
||||||
|
|
||||||
# Append channel to log index
|
|
||||||
append_line("%s/index.html" % LOG_FOLDER, '<a href="%s/index.html">%s</a>' % (channel.replace("#", "%23"), channel_title))
|
|
||||||
|
|
||||||
# Current log
|
|
||||||
try:
|
|
||||||
localtime = datetime.now(timezone(self.channel_locations.get(channel,DEFAULT_TIMEZONE)))
|
|
||||||
time = localtime.strftime("%H:%M:%S")
|
|
||||||
date = localtime.strftime("%Y-%m-%d")
|
|
||||||
except:
|
|
||||||
time = strftime("%H:%M:%S")
|
|
||||||
date = strftime("%Y-%m-%d")
|
|
||||||
|
|
||||||
log_path = "%s/%s/%s.html" % (LOG_FOLDER, channel, date)
|
|
||||||
|
|
||||||
# Create the log date index if it doesnt exist
|
|
||||||
if not os.path.exists(log_path):
|
|
||||||
write_string(log_path, html_header.replace("%title%", "%s | Logs for %s" % (channel_title, date)))
|
|
||||||
|
|
||||||
# Append date log
|
|
||||||
append_line("%s/index.html" % chan_path, '<a href="%s.html">%s</a>' % (date, date))
|
|
||||||
|
|
||||||
# Append current message
|
|
||||||
time = "<a href=\"#%s\" name=\"%s\" class=\"time\">[%s]</a>" % \
|
|
||||||
(time, time, time)
|
|
||||||
msg = msg.replace("%time%", time)
|
|
||||||
append_line(log_path, msg)
|
|
||||||
|
|
||||||
def check_for_prs(self, c):
|
def check_for_prs(self, c):
|
||||||
p = PullRequest()
|
p = PullRequest()
|
||||||
|
|
@ -420,17 +280,17 @@ class Logbot(SingleServerIRCBot):
|
||||||
|
|
||||||
def on_kick(self, c, e):
|
def on_kick(self, c, e):
|
||||||
self.write_event("kick", e,
|
self.write_event("kick", e,
|
||||||
{"%kicker%" : e.source(),
|
{"kicker" : e.source(),
|
||||||
"%channel%" : e.target(),
|
"channel" : e.target(),
|
||||||
"%user%" : e.arguments()[0],
|
"user" : e.arguments()[0],
|
||||||
"%reason%" : e.arguments()[1],
|
"reason" : e.arguments()[1],
|
||||||
})
|
})
|
||||||
|
|
||||||
def on_mode(self, c, e):
|
def on_mode(self, c, e):
|
||||||
self.write_event("mode", e,
|
self.write_event("mode", e,
|
||||||
{"%modes%" : e.arguments()[0],
|
{"modes" : e.arguments()[0],
|
||||||
"%person%" : e.arguments()[1] if len(e.arguments()) > 1 else e.target(),
|
"person" : e.arguments()[1] if len(e.arguments()) > 1 else e.target(),
|
||||||
"%giver%" : nm_to_n(e.source()),
|
"giver" : nm_to_n(e.source()),
|
||||||
})
|
})
|
||||||
|
|
||||||
def on_nick(self, c, e):
|
def on_nick(self, c, e):
|
||||||
|
|
@ -439,25 +299,25 @@ class Logbot(SingleServerIRCBot):
|
||||||
for chan in self.channels:
|
for chan in self.channels:
|
||||||
if old_nick in [x.lstrip('~%&@+') for x in self.channels[chan].users()]:
|
if old_nick in [x.lstrip('~%&@+') for x in self.channels[chan].users()]:
|
||||||
self.write_event("nick", e,
|
self.write_event("nick", e,
|
||||||
{"%old%" : old_nick,
|
{"old" : old_nick,
|
||||||
"%new%" : e.target(),
|
"new" : e.target(),
|
||||||
"%chan%": chan,
|
"chan": chan,
|
||||||
})
|
})
|
||||||
|
|
||||||
def on_part(self, c, e):
|
def on_part(self, c, e):
|
||||||
self.write_event("part", e)
|
self.write_event("part", e)
|
||||||
|
|
||||||
def on_pubmsg(self, c, e):
|
def on_pubmsg(self, c, e):
|
||||||
if e.arguments()[0].startswith(NICK):
|
# if e.arguments()[0].startswith(NICK):
|
||||||
c.privmsg(e.target(), self.format["help"])
|
# c.privmsg(e.target(), self.format["help"])
|
||||||
self.write_event("pubmsg", e)
|
self.write_event("pubmsg", e)
|
||||||
|
|
||||||
def on_pubnotice(self, c, e):
|
def on_pubnotice(self, c, e):
|
||||||
self.write_event("pubnotice", e)
|
self.write_event("pubnotice", e)
|
||||||
|
|
||||||
def on_privmsg(self, c, e):
|
def on_privmsg(self, c, e):
|
||||||
print nm_to_n(e.source()), e.arguments()
|
# c.privmsg(nm_to_n(e.source()), self.format["help"])
|
||||||
c.privmsg(nm_to_n(e.source()), self.format["help"])
|
pas
|
||||||
|
|
||||||
def on_quit(self, c, e):
|
def on_quit(self, c, e):
|
||||||
nick = nm_to_n(e.source())
|
nick = nm_to_n(e.source())
|
||||||
|
|
@ -469,14 +329,6 @@ class Logbot(SingleServerIRCBot):
|
||||||
def on_topic(self, c, e):
|
def on_topic(self, c, e):
|
||||||
self.write_event("topic", e)
|
self.write_event("topic", e)
|
||||||
|
|
||||||
# Loads the channel - timezone-location pairs from the CHANNEL_LOCATIONS_FILE
|
|
||||||
# See the README for details and example
|
|
||||||
def load_channel_locations(self):
|
|
||||||
self.channel_locations = {}
|
|
||||||
if os.path.exists(CHANNEL_LOCATIONS_FILE):
|
|
||||||
f = open(CHANNEL_LOCATIONS_FILE, 'r')
|
|
||||||
self.channel_locations = dict((k.lower(), v) for k, v in dict([line.strip().split(None,1) for line in f.readlines()]).iteritems())
|
|
||||||
|
|
||||||
def connect_ftp():
|
def connect_ftp():
|
||||||
print "Using FTP %s..." % (FTP_SERVER)
|
print "Using FTP %s..." % (FTP_SERVER)
|
||||||
f = ftplib.FTP(FTP_SERVER, FTP_USER, FTP_PASS)
|
f = ftplib.FTP(FTP_SERVER, FTP_USER, FTP_PASS)
|
||||||
|
|
@ -484,6 +336,12 @@ def connect_ftp():
|
||||||
return f
|
return f
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
# Start up database
|
||||||
|
create_tables()
|
||||||
|
|
||||||
|
t = threading.Thread(target=flaskapp.run, args=())
|
||||||
|
t.start()
|
||||||
|
|
||||||
# Create the logs directory
|
# Create the logs directory
|
||||||
if not os.path.exists(LOG_FOLDER):
|
if not os.path.exists(LOG_FOLDER):
|
||||||
os.makedirs(LOG_FOLDER)
|
os.makedirs(LOG_FOLDER)
|
||||||
|
|
@ -500,6 +358,7 @@ def main():
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
if FTP_SERVER: bot.ftp.quit()
|
if FTP_SERVER: bot.ftp.quit()
|
||||||
bot.quit()
|
bot.quit()
|
||||||
|
t.join()
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|
|
||||||
49
static/style.css
Normal file
49
static/style.css
Normal file
|
|
@ -0,0 +1,49 @@
|
||||||
|
body {
|
||||||
|
background-color: #F8F8FF;
|
||||||
|
font-family: Fixed, monospace;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#searchform {
|
||||||
|
display: inline;
|
||||||
|
}
|
||||||
|
|
||||||
|
#navbar {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
p {
|
||||||
|
margin: 0px;
|
||||||
|
padding: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
p:target {
|
||||||
|
background-color:#ffcccc
|
||||||
|
}
|
||||||
|
|
||||||
|
p:target a {
|
||||||
|
color:red;
|
||||||
|
}
|
||||||
|
|
||||||
|
.join .marker {
|
||||||
|
color: blue;
|
||||||
|
}
|
||||||
|
|
||||||
|
.action .nick {
|
||||||
|
color: gray;
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
|
|
||||||
|
.action .message {
|
||||||
|
color: gray;
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
|
a:link {
|
||||||
|
color: black;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
a:focus {
|
||||||
|
color: red;
|
||||||
|
}
|
||||||
|
|
||||||
6
templates/base.html
Normal file
6
templates/base.html
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
<!doctype html>
|
||||||
|
<title>List of channels</title>
|
||||||
|
|
||||||
|
{% for channel in channels %}
|
||||||
|
<li><a href="/channel/{{ channel.name|urlencode }}">{{ channel.name }}</a></li>
|
||||||
|
{% endfor %}
|
||||||
20
templates/channels.html
Normal file
20
templates/channels.html
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
<!doctype html>
|
||||||
|
<head>
|
||||||
|
<title>List of channels</title>
|
||||||
|
<link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<div id="navbar">
|
||||||
|
{% if back_button %}
|
||||||
|
<a href="..">Back</a>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<form id="searchform" method="get" action="/search/">
|
||||||
|
<input type="text" name="query"/>
|
||||||
|
<input type="submit" value="Search"/>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% for channel in channels %}
|
||||||
|
<li><a href="/channels/{{ channel.name|urlencode }}">{{ channel.name }}</a></li>
|
||||||
|
{% endfor %}
|
||||||
24
templates/days.html
Normal file
24
templates/days.html
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
<!doctype html>
|
||||||
|
<head>
|
||||||
|
<title>Days with logs for {{ channel.name }}</title>
|
||||||
|
<link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<div id="navbar">
|
||||||
|
{% if back_button %}
|
||||||
|
<a href="..">Back</a>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<form id="searchform" method="get" action="/search/channel/{{channel.name|urlencode}}/">
|
||||||
|
<input type="text" name="query"/>
|
||||||
|
<input type="submit" value="Search"/>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% for day in days %}
|
||||||
|
<li>
|
||||||
|
<a href="/channels/{{ channel.name|urlencode }}/{{ day.date }}">
|
||||||
|
{{ day.date }}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% endfor %}
|
||||||
186
templates/messages.html
Normal file
186
templates/messages.html
Normal file
|
|
@ -0,0 +1,186 @@
|
||||||
|
<!doctype html>
|
||||||
|
<head>
|
||||||
|
<title>List of messages</title>
|
||||||
|
<link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<div id="navbar">
|
||||||
|
{% if back_button %}
|
||||||
|
<a href="..">Back</a>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<form id="searchform" method="get" action="/search/channel/{{channel.name|urlencode}}/">
|
||||||
|
<input type="text" name="query"/>
|
||||||
|
<input type="submit" value="Search"/>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% for message in messages %}
|
||||||
|
{% if message.message_type == "pubmsg" %}
|
||||||
|
<p class="pubmsg" id="{{message.datetime}}">
|
||||||
|
<a href="#{{message.datetime}}">
|
||||||
|
<span class="date">
|
||||||
|
{% if date %}
|
||||||
|
{{ message.day.date }}
|
||||||
|
{% endif %}
|
||||||
|
{{message.datetime}}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
<span class="chat_message_marker">
|
||||||
|
<
|
||||||
|
</span>
|
||||||
|
<span class="nickname">
|
||||||
|
{{ message.nickname }}
|
||||||
|
</span>
|
||||||
|
<span class="chat_message_marker">
|
||||||
|
>
|
||||||
|
</span>
|
||||||
|
<span class="chat_message">
|
||||||
|
{{ message.message }}
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
{% elif message.message_type == "join" %}
|
||||||
|
<p class="join" id="{{message.datetime}}">
|
||||||
|
<a href="#{{message.datetime}}">
|
||||||
|
<span class="date">
|
||||||
|
{% if date %}
|
||||||
|
{{ message.day.date }}
|
||||||
|
{% endif %}
|
||||||
|
{{message.datetime}}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
<span class="marker">
|
||||||
|
-!-
|
||||||
|
</span>
|
||||||
|
<span class="message">
|
||||||
|
{{ message.nickname }} joined {{ message.channel.name }}
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
{% elif message.message_type == "nick" %}
|
||||||
|
<p class="nick" id="{{message.datetime}}">
|
||||||
|
<a href="#{{message.datetime}}">
|
||||||
|
<span class="date">
|
||||||
|
{% if date %}
|
||||||
|
{{ message.day.date }}
|
||||||
|
{% endif %}
|
||||||
|
{{message.datetime}}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
<span class="marker">
|
||||||
|
-!-
|
||||||
|
</span>
|
||||||
|
<span class="old">
|
||||||
|
{{ message.nickname }}
|
||||||
|
</span>
|
||||||
|
<span>
|
||||||
|
is now known as
|
||||||
|
</span>
|
||||||
|
<span class="new">
|
||||||
|
{{ message.message }}
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
{% elif message.message_type == "action" %}
|
||||||
|
<p class="action" id="{{message.datetime}}">
|
||||||
|
<a href="#{{message.datetime}}">
|
||||||
|
<span class="date">
|
||||||
|
{% if date %}
|
||||||
|
{{ message.day.date }}
|
||||||
|
{% endif %}
|
||||||
|
{{message.datetime}}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
<span class="nick">
|
||||||
|
{{ message.nickname }}
|
||||||
|
</span>
|
||||||
|
<span class="message">
|
||||||
|
{{ message.message }}
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
{% elif message.message_type == "kick" %}
|
||||||
|
<p class="kick" id="{{message.datetime}}">
|
||||||
|
<a href="#{{message.datetime}}">
|
||||||
|
<span class="date">
|
||||||
|
{% if date %}
|
||||||
|
{{ message.day.date }}
|
||||||
|
{% endif %}
|
||||||
|
{{message.datetime}}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
<span class="marker">
|
||||||
|
-!-
|
||||||
|
</span>
|
||||||
|
<span class="message">
|
||||||
|
{{ message.message }}
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
{% elif message.message_type == "mode" %}
|
||||||
|
<p class="mode" id="{{message.datetime}}">
|
||||||
|
<a href="#{{message.datetime}}">
|
||||||
|
<span class="date">
|
||||||
|
{% if date %}
|
||||||
|
{{ message.day.date }}
|
||||||
|
{% endif %}
|
||||||
|
{{message.datetime}}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
<span class="marker">
|
||||||
|
-!-
|
||||||
|
</span>
|
||||||
|
<span class="message">
|
||||||
|
{{ message.message }}
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
{% elif message.message_type == "part" %}
|
||||||
|
<p class="part" id="{{message.datetime}}">
|
||||||
|
<a href="#{{message.datetime}}">
|
||||||
|
<span class="date">
|
||||||
|
{% if date %}
|
||||||
|
{{ message.day.date }}
|
||||||
|
{% endif %}
|
||||||
|
{{message.datetime}}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
<span class="user">
|
||||||
|
{{ message.nickname }}
|
||||||
|
</span>
|
||||||
|
<span class="text">
|
||||||
|
left channel
|
||||||
|
</span>
|
||||||
|
<span class="channel">
|
||||||
|
{{ message.channel.name }}
|
||||||
|
</span>
|
||||||
|
<span class="text">
|
||||||
|
with reason:
|
||||||
|
</span>
|
||||||
|
<span class="message">
|
||||||
|
{{ message.message }}
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
{% elif message.message_type == "topic" %}
|
||||||
|
<p class="topic" id="{{message.datetime}}">
|
||||||
|
<a href="#{{message.datetime}}">
|
||||||
|
<span class="date">
|
||||||
|
{% if date %}
|
||||||
|
{{ message.day.date }}
|
||||||
|
{% endif %}
|
||||||
|
{{message.datetime}}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
<span class="user">
|
||||||
|
{{ message.nickname }}
|
||||||
|
</span>
|
||||||
|
<span class="text">
|
||||||
|
changed topic of
|
||||||
|
</span>
|
||||||
|
<span class="channel">
|
||||||
|
{{ message.channel.name }}
|
||||||
|
</span>
|
||||||
|
<span class="text">
|
||||||
|
to:
|
||||||
|
</span>
|
||||||
|
<span class="message">
|
||||||
|
{{ message.message }}
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue