Merge to head

This commit is contained in:
gryf committed 2016-11-26 19:23:03 +01:00
commit b5e9c150ed
2 files changed
+3 -5

No files matched your search

+1 -1
View File
@@ -7,7 +7,7 @@ Slack backup
.. image:: https://img.shields.io/pypi/v/slack-backup.svg .. image:: https://img.shields.io/pypi/v/slack-backup.svg
:target: https://pypi.python.org/pypi/slack-backup :target: https://pypi.python.org/pypi/slack-backup
This project aim is to collect conversations from Slack using its API and The project aim is to collect conversations from Slack using its API and
optionally user account information, and provides convenient way to represent optionally user account information, and provides convenient way to represent
as a log. as a log.
+2 -4
View File
@@ -204,7 +204,6 @@ class TextReporter(Reporter):
"""return formatter for file""" """return formatter for file"""
groups = self._slackid_pat[0].match(msg.text).groupdict() groups = self._slackid_pat[0].match(msg.text).groupdict()
text = msg.text.replace(groups['replace'], '') text = msg.text.replace(groups['replace'], '')
text = self._filter_slackid(msg.text)
filename = msg.file.filepath filename = msg.file.filepath
if filename: if filename:
filename = os.path.relpath(msg.file.filepath, start=self.out) filename = os.path.relpath(msg.file.filepath, start=self.out)
@@ -212,9 +211,8 @@ class TextReporter(Reporter):
filename = msg.file.url filename = msg.file.url
if not filename: if not filename:
logging.warning("There is have a file object, but nothing has " logging.warning("There is a file object, but without filename."
"found. Name of the file object is `%s'", "Name of the file object is `%s'", msg.file.name)
msg.file.name)
filename = msg.file.name filename = msg.file.name
text = self._filter_slackid(text) text = self._filter_slackid(text)