From 87f6eb4d3ad1e12fd13d8a79e67e48aaa1356e35 Mon Sep 17 00:00:00 2001 From: gryf Date: Wed, 23 Nov 2016 22:00:39 +0100 Subject: [PATCH] Changing the way how arguments are passed --- scripts/slack-backup | 36 +++++++++++++++++++++++++----------- slack_backup/client.py | 20 +++++++++++--------- tests/test_client.py | 5 +++-- 3 files changed, 39 insertions(+), 22 deletions(-) diff --git a/scripts/slack-backup b/scripts/slack-backup index ea0bacd..73c3bac 100755 --- a/scripts/slack-backup +++ b/scripts/slack-backup @@ -3,40 +3,54 @@ """ Create backup for certain date for specified channel in slack """ +from six.moves import builtins import argparse -import json from slack_backup import client +from slack_backup import logger -def channel_list(string): - return string.split(',') - def main(): """Main function""" parser = argparse.ArgumentParser() parser.add_argument('-t', '--token', required=True, help='Slack token - ' 'a string, which can be generated/obtained via ' - 'https://api.slack.com/docs/oauth-test-tokens page') + 'https://api.slack.com/docs/oauth-test-tokens page.') parser.add_argument('-d', '--database', default='', - help='Path to the database file') - parser.add_argument('-f', '--format', default='text', - choices=('text', 'json', 'html', 'none'), + help='Path to the database file.') + parser.add_argument('-f', '--format', default='none', + choices=('text', 'none'), help='Output format. Default is none; only database ' 'is updated by latest messages for all/selected ' 'channels.') parser.add_argument('-c', '--channels', default=[], nargs='+', help='List of channels to perform actions on. ' - 'Default is all channels') - parser.add_argument('-t', '--team', default='', help='team name, which is' + 'Default is all channels.') + parser.add_argument('-u', '--user', default='', help='Username for your ' + 'Slack account') + parser.add_argument('-p', '--password', default='', help='Password for your ' + 'Slack account.') + parser.add_argument('-e', '--team', default='', help='Team name, which is' ' part of slack url, for example: if url is ' '"https://team.slack.com" than "team" is a name of ' 'the team.') + parser.add_argument('-a', '--assets', default='assets', help='Directory ' + 'where to put downloaded files and images, "assets" ' + 'by default.') + parser.add_argument('-v', '--verbose', help='Be verbose. Adding more "v"' + 'will increase verbosity', action="count", default=0) + parser.add_argument('-q', '--quiet', help='Be quiet. Adding more "q"' + 'will decrease verbosity', action="count", default=0) + + args = parser.parse_args() + builtins.log = logger.Logger('slack_backup')() + log.set_verbose(args.verbose, args.quiet) + slack = client.Client(args) slack.update() - # slack.generate_history(Reporter(args.format)) + slack.generate_history() if __name__ == "__main__": diff --git a/slack_backup/client.py b/slack_backup/client.py index 5980aed..89a9f2a 100644 --- a/slack_backup/client.py +++ b/slack_backup/client.py @@ -19,57 +19,59 @@ class Client(object): """ def __init__(self, args): self.slack = slackclient.SlackClient(args.token) - self.engine = db.connect(args.dbfilename) + self.engine = db.connect(args.database) self.session = db.Session() self.selected_channels = args.channels self.user = args.user self.password = args.password if not self.user and not self.password: - logging.warning('No media will be downloaded, due to not ' + log.warning('No media will be downloaded, due to not ' 'providing credentials for a slack account') elif not self.user and self.password: - logging.warning('No media will be downloaded, due to not ' + log.warning('No media will be downloaded, due to not ' 'providing username for a slack account') elif self.user and not self.password: self.password = getpass.getpass(prompt='Provide password for ' 'your slack account: ') self.q = self.session.query - self.dld = download.Download(args.user, args.password, args.team) + self.downloader = download.Download(args) def update(self): """ Perform an update, store data to db """ - self.dld.authorize() + self.downloader.authorize() self.update_users() self.update_channels() self.update_history() def update_channels(self): """Fetch and update channel list with current state in db""" + log.info("Fetching and update channels information in DB") result = self._channels_list() if not result: return - for channel_data in result: + for data in result: channel = self.q(o.Channel).\ - filter(o.Channel.slackid == channel_data['id']).one_or_none() + filter(o.Channel.slackid == data['id']).one_or_none() if not channel: channel = o.Channel() self.session.add(channel) - self._update_channel(channel, channel_data) + self._update_channel(channel, data) self.session.commit() def update_users(self): """Fetch and update user list with current state in db""" + log.info("Fetching and updating user information in DB") result = self.slack.api_call("users.list", presence=0) if not result.get("ok"): - logging.error(result['error']) + log.error(result['error']) return for user_data in result['members']: diff --git a/tests/test_client.py b/tests/test_client.py index 1f07495..7e8bdba 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -351,8 +351,9 @@ class FakeArgs(object): user = 'fake_user' password = 'fake_password' team = 'fake_team' - dbfilename = None + database = None channels = None + assets = 'assets' class TestApiCalls(TestCase): @@ -421,7 +422,7 @@ class TestMessage(TestCase): args.channels = ['general'] self.cl = client.Client(args) - self.cl.dld.authorize = MagicMock() + self.cl.downloader.authorize = MagicMock() self.cl.slack.api_call = MagicMock(return_value=USERS) self.cl.update_users()