mirror of
https://github.com/gryf/slack-backup.git
synced 2025-12-17 11:30:25 +01:00
Fix returned channel list
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
Reporters module.
|
||||
|
||||
@@ -8,6 +9,7 @@ import os
|
||||
import logging
|
||||
|
||||
from slack_backup import objects as o
|
||||
from slack_backup import utils
|
||||
|
||||
|
||||
class Reporter(object):
|
||||
@@ -22,19 +24,19 @@ class Reporter(object):
|
||||
|
||||
def _get_channels(self, selected_channels):
|
||||
"""
|
||||
Retrive channels from db and return those which names matched from
|
||||
Retrieve channels from db and return those which names matched from
|
||||
selected_channels list
|
||||
"""
|
||||
result = []
|
||||
all_channels = self.q(o.Channel).all()
|
||||
if not selected_channels:
|
||||
return all_channels
|
||||
|
||||
result = []
|
||||
for channel in all_channels:
|
||||
if channel.name in selected_channels:
|
||||
result.append(channel)
|
||||
|
||||
return channel
|
||||
return result
|
||||
|
||||
def generate(self):
|
||||
"""Generate raport it's a dummmy one - for use with none reporter"""
|
||||
@@ -53,10 +55,22 @@ class TextReporter(Reporter):
|
||||
"""Text aka IRC reporter"""
|
||||
ext = '.log'
|
||||
|
||||
def __init__(self, args, query):
|
||||
super().__init__(args, query)
|
||||
utils.makedirs(self.out)
|
||||
self._line = ""
|
||||
|
||||
def _prepare_line(self, channel):
|
||||
users = [m.user for m in channel.messages]
|
||||
users = set([u.name for u in users])
|
||||
|
||||
return
|
||||
|
||||
def generate(self):
|
||||
"""Generate raport"""
|
||||
for channel in self.channels:
|
||||
log_path = self.get_log_path(channel.name)
|
||||
self._prepare_line(channel)
|
||||
for message in self.q(o.Message).\
|
||||
filter(o.Message.channel == channel).\
|
||||
order_by(o.Message.ts).all():
|
||||
@@ -64,6 +78,18 @@ class TextReporter(Reporter):
|
||||
|
||||
def write_msg(self, message, log):
|
||||
"""Write message to file"""
|
||||
with open(log, "a") as fobj:
|
||||
fobj.write(self._format_message(message))
|
||||
|
||||
def _format_message(self, msg):
|
||||
"""
|
||||
Check what kind of message we are dealing with and do appropriate
|
||||
formatting
|
||||
"""
|
||||
return msg.text
|
||||
return (msg.datetime().strftime("%Y-%m-%d %H:%M:%S"),
|
||||
msg.user.name,
|
||||
msg.text)
|
||||
|
||||
|
||||
def get_reporter(args, query):
|
||||
|
||||
Reference in New Issue
Block a user