From 137f9bbac69bb91db7b354f9644c3dec4f1fc2e3 Mon Sep 17 00:00:00 2001 From: gryf Date: Sat, 26 Nov 2016 15:13:43 +0100 Subject: [PATCH] Fix for files object db store --- slack_backup/client.py | 3 ++- tests/test_client.py | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/slack_backup/client.py b/slack_backup/client.py index 8ebbd54..60b803a 100644 --- a/slack_backup/client.py +++ b/slack_backup/client.py @@ -188,6 +188,7 @@ class Client(object): data['url_private_download']) priv_url = data['url_private_download'] message.file.filepath = self.downloader.download(priv_url, 'file') + self.session.add(message.file) def _att_data(self, message, data): """ @@ -229,7 +230,7 @@ class Client(object): def _update_channel(self, channel, data): """Update a channel with provided data""" - logging.info("Update channel `%s' information in DB", channel.name) + logging.info("Update channel `%s' information in DB", data['name']) channel.update(data) channel.user = self.q(o.User).filter(o.User.slackid == diff --git a/tests/test_client.py b/tests/test_client.py index c61fa75..71d5e13 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -356,7 +356,9 @@ class FakeArgs(object): team = 'fake_team' database = None channels = None - assets = 'assets' + + def __contains__(self, key): + return hasattr(self, key) class TestApiCalls(TestCase): @@ -377,6 +379,7 @@ class TestApiCalls(TestCase): cl = client.Client(FakeArgs()) cl.slack.api_call = MagicMock(return_value=USERS) + cl.downloader._download = MagicMock(return_value=None) cl.update_users() cl.slack.api_call = MagicMock(return_value=CHANNELS) @@ -406,6 +409,7 @@ class TestClient(TestCase): def test_update_users(self): cl = client.Client(FakeArgs()) cl.slack.api_call = MagicMock(return_value=USERS) + cl.downloader._download = MagicMock(return_value=None) cl.update_users() users = cl.session.query(o.User).all() self.assertEqual(len(users), 4) @@ -427,6 +431,7 @@ class TestMessage(TestCase): self.cl = client.Client(args) self.cl.downloader.authorize = MagicMock() self.cl.slack.api_call = MagicMock(return_value=USERS) + self.cl.downloader._download = MagicMock(return_value=None) self.cl.update_users() self.cl.slack.api_call = MagicMock(return_value=CHANNELS) @@ -436,6 +441,7 @@ class TestMessage(TestCase): def test_update_history(self): + self.cl.downloader._download = MagicMock(return_value=None) self.cl.slack.api_call.side_effect = [MSGS, MSG3] self.cl.update_history() self.assertEqual(len(self.cl.q(o.Message).all()), 5)