jeena/smooth-operator
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Use ',' rather than 'and' in .select() queries

Browse source 
This closes #11
This commit is contained in:
Jonatan Pålsson 2017-06-10 11:22:54 +02:00
parent 6292af08e6
commit 924fad4320
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
logbot.py
View file

@ -115,13 +115,13 @@ def search(channel = None, nickname = None):
try: try:
channel = Channel.get(Channel.name == channel) channel = Channel.get(Channel.name == channel)
messages = LogMessage.select() \ messages = LogMessage.select() \
.where(LogMessage.channel == channel and \ .where(LogMessage.channel == channel, \
LogMessage.message.contains(query)) LogMessage.message.contains(query))
except: except:
pass # No such channel pass # No such channel
elif nickname: elif nickname:
messages = LogMessage.select() \ messages = LogMessage.select() \
.where(LogMessage.nickname == nickname and \ .where(LogMessage.nickname == nickname, \
LogMessage.message.contains(query)) LogMessage.message.contains(query))
else: else:
messages = LogMessage.select() \ messages = LogMessage.select() \
@ -135,13 +135,13 @@ def search(channel = None, nickname = None):
@flaskapp.route("/channels/<channel>/") @flaskapp.route("/channels/<channel>/")
@flaskapp.route("/channels/<channel>/<day>/") @flaskapp.route("/channels/<channel>/<day>/")
def channel(channel, day = None, query = None): def channel(channel, day = None):
channel = Channel.get(Channel.name == channel) channel = Channel.get(Channel.name == channel)
if day: if day:
d = Day.get(Day.date == day) d = Day.get(Day.date == day)
messages = LogMessage.select() \ messages = LogMessage.select() \
.where(LogMessage.day == d and \ .where(LogMessage.day == d, \
LogMessage.channel == channel) LogMessage.channel == channel)
return render_template("messages.html", return render_template("messages.html",