setting room_path back to self.output + message.room in download() and write_log()

This commit is contained in:
manetta 2021-02-17 17:15:11 +01:00
parent 7f3fd2c375
commit ad1cb276b9

View File

@ -22,7 +22,7 @@ def del_from_db(self, message, key):
def write_log(self, message): def write_log(self, message):
template = jinja2.Template(open('template.html').read()) template = jinja2.Template(open('template.html').read())
log_path = os.path.join(self.room_path, 'index.html') log_path = os.path.join(self.output, message.room, 'index.html')
with open(log_path,'w') as out: with open(log_path,'w') as out:
html = template.render(title=self.db[message.room]['title'], db=self.db[message.room]['messages']) html = template.render(title=self.db[message.room]['title'], db=self.db[message.room]['messages'])
out.write(html) out.write(html)
@ -48,7 +48,7 @@ def download(self, message):
parsed_url = urlparse(message.url) parsed_url = urlparse(message.url)
filename = os.path.basename(parsed_url.path).replace(' ','_').replace('%20','_') # safe url's filename = os.path.basename(parsed_url.path).replace(' ','_').replace('%20','_') # safe url's
print('as the file: ', filename) print('as the file: ', filename)
path = os.path.join(self.room_path, media_type) path = os.path.join(self.output, message.room media_type)
if not os.path.isdir(path): if not os.path.isdir(path):
os.mkdir(path) os.mkdir(path)
file_path = os.path.join(path, filename) file_path = os.path.join(path, filename)
@ -94,10 +94,13 @@ logbot @uptime: To check how long @logbot has been around
@bots: To see who is around :) @bots: To see who is around :)
''' '''
def setup(self): def setup(self):
print('INFO ', f'Output folder is set to: { self.output }')
for room in self.rooms: for room in self.rooms:
roomname = str(re.match(r'.*@', room).group()).replace('@','') roomname = str(re.match(r'.*@', room).group()).replace('@','')
self.room_path = os.path.join(self.output, roomname) self.room_path = os.path.join(self.output, roomname)
print('INFO ', f'Room path is set to: { self.room_path }')
# Check if the room is in the database already # Check if the room is in the database already
if not room in self.db.keys(): if not room in self.db.keys():
@ -113,9 +116,6 @@ logbot @uptime: To check how long @logbot has been around
print('INFO ', f'Created a folder for: { room }') print('INFO ', f'Created a folder for: { room }')
print('INFO ', f'Copied stylesheet.css to: { room }') print('INFO ', f'Copied stylesheet.css to: { room }')
print('INFO ', f'Output folder is set to: { self.output }')
print('INFO ', f'Room path is set to: { self.room_path }')
def group(self, message): def group(self, message):
# to debug in the terminal # to debug in the terminal
@ -132,7 +132,7 @@ logbot @uptime: To check how long @logbot has been around
media_type = media_type.replace('images', 'image') # linguistic hack! media_type = media_type.replace('images', 'image') # linguistic hack!
reply = f'Thanks for that { media_type }!' reply = f'Thanks for that { media_type }!'
else: else:
reply = 'Sorry, can\'t touch that :(' reply = 'Sorry, can\'t process that :('
elif '@add' in message.text: elif '@add' in message.text:
add_to_db(self, message) add_to_db(self, message)