From b6150ee96863d915328e6c5ee028f8c239a882d5 Mon Sep 17 00:00:00 2001 From: Vasily Zubarev Date: Thu, 13 Feb 2020 14:04:20 +0100 Subject: [PATCH] Little renaming --- parsing/telegram/telegram.py | 10 +++++----- parsing/views.py | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/parsing/telegram/telegram.py b/parsing/telegram/telegram.py index 93e3110..26ca935 100644 --- a/parsing/telegram/telegram.py +++ b/parsing/telegram/telegram.py @@ -24,17 +24,16 @@ def get_channel(channel_id, messages_limit): except ValueError: raise ParsingException(f"No channel named '{channel_id}'") - channel.messages = __get_channel_messages(client, channel, messages_limit) + channel.messages = get_channel_messages(client, channel, messages_limit) return channel -def __get_channel_messages(client, channel, messages_limit): +def get_channel_messages(client, channel, messages_limit): def get_messages_indexes(messages, grouped_id, type=None, inverse=False): type_predicate = lambda m: m != type if inverse else m == type indexes = [] - for i in range(len(messages)): - message = messages[i] + for i, message in enumerate(messages): if type_predicate(message) and message.grouped_id == grouped_id: indexes.append(i) return indexes @@ -51,7 +50,7 @@ def __get_channel_messages(client, channel, messages_limit): try: messages.remove(i) except ValueError: - pass # skip missing indexes + pass # skip missing messages else: indexes = get_messages_indexes( messages, new_message.grouped_id, type=MessageType.TEXT @@ -60,6 +59,7 @@ def __get_channel_messages(client, channel, messages_limit): messages.append(new_message) channel_messages = [] + for t_message in client.iter_messages(channel.channel_id, limit=messages_limit): parser = Parser.from_message(channel, t_message) if parser is not None: diff --git a/parsing/views.py b/parsing/views.py index 453b37a..a1e6240 100644 --- a/parsing/views.py +++ b/parsing/views.py @@ -10,12 +10,10 @@ class TelegramChannelFeed(Feed): FEED_ITEMS = 30 def get_object(self, request, channel): - feed_items = ( - int(request.GET["size"]) if "size" in request.GET else self.FEED_ITEMS - ) + limit = int(request.GET["size"]) if "size" in request.GET else self.FEED_ITEMS try: - return get_channel(channel, feed_items) + return get_channel(channel, limit) except ParsingException: raise Http404()