mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2024-11-29 22:23:12 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replaced cursored calls for manual calls to function with return_cursors. This way we will avoid hitting TWitter Rate limits accidentally

Browse Source
This commit is contained in:
Manuel Cortez 2021-01-27 13:20:47 -06:00
parent 6688dc1163
commit 9444939c35
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/controller/buffers/twitterBuffers.py
View File

@ -172,12 +172,14 @@ class baseBufferController(baseBuffers.buffer):
else: else:
count = self.session.settings["general"]["max_tweets_per_call"] count = self.session.settings["general"]["max_tweets_per_call"]
# try to retrieve the cursor for the current buffer. # try to retrieve the cursor for the current buffer.
cursor = self.session.db["cursors"].get(self.name)
try: try:
# We need to assign all results somewhere else so the cursor variable would b generated. val = getattr(self.session.twitter, self.function)(return_cursors=True, count=count, *self.args, **self.kwargs)
val = Cursor(getattr(self.session.twitter, self.function), count=count, *self.args, **self.kwargs).items(count) if type(val) == tuple:
val, cursor = val
if type(cursor) == tuple:
cursor = cursor[1]
self.session.db["cursors"][self.name] = cursor
results = [i for i in val] results = [i for i in val]
self.session.db["cursors"][self.name] = val.page_iterator.next_cursor
val = results val = results
val.reverse() val.reverse()
log.debug("Retrieved %d items from the cursored search on function %s." %(len(val), self.function)) log.debug("Retrieved %d items from the cursored search on function %s." %(len(val), self.function))
@ -221,7 +223,7 @@ class baseBufferController(baseBuffers.buffer):
else: else:
last_id = self.session.db[self.name][-1].id last_id = self.session.db[self.name][-1].id
try: try:
items = Cursor(getattr(self.session.twitter, self.function), max_id=last_id, count=self.session.settings["general"]["max_tweets_per_call"], *self.args, **self.kwargs).items(self.session.settings["general"]["max_tweets_per_call"]) items = getattr(self.session.twitter, self.function)(max_id=last_id, count=self.session.settings["general"]["max_tweets_per_call"], *self.args, **self.kwargs)
except TweepError as e: except TweepError as e:
log.error("Error %s: %s" % (e.api_code, e.reason)) log.error("Error %s: %s" % (e.api_code, e.reason))
return return
@ -639,9 +641,13 @@ class directMessagesController(baseBufferController):
# try to retrieve the cursor for the current buffer. # try to retrieve the cursor for the current buffer.
cursor = self.session.db["cursors"].get(self.name) cursor = self.session.db["cursors"].get(self.name)
try: try:
items = Cursor(getattr(self.session.twitter, self.function), cursor=cursor, count=count, *self.args, **self.kwargs).items(count) items = getattr(self.session.twitter, self.function)(return_cursors=True, cursor=cursor, count=count, *self.args, **self.kwargs)
if type(items) == tuple:
items, cursor = items
if type(cursor) == tuple:
cursor = cursor[1]
self.session.db["cursors"][self.name] = cursor
results = [i for i in items] results = [i for i in items]
self.session.db["cursors"][self.name] = items.page_iterator.next_cursor
items = results items = results
log.debug("Retrieved %d items for cursored search in function %s" % (len(items), self.function)) log.debug("Retrieved %d items for cursored search in function %s" % (len(items), self.function))
except TweepError as e: except TweepError as e:
@ -873,13 +879,14 @@ class peopleBufferController(baseBufferController):
self.execution_time = current_time self.execution_time = current_time
log.debug("Starting stream for %s buffer, %s account" % (self.name, self.account,)) log.debug("Starting stream for %s buffer, %s account" % (self.name, self.account,))
log.debug("args: %s, kwargs: %s" % (self.args, self.kwargs)) log.debug("args: %s, kwargs: %s" % (self.args, self.kwargs))
# try to retrieve the cursor for the current buffer.
cursor = self.session.db["cursors"].get(self.name)
try: try:
# We need to assign all results somewhere else so the cursor variable would b generated. val = getattr(self.session.twitter, self.function)(return_cursors=True, count=self.session.settings["general"]["max_tweets_per_call"], *self.args, **self.kwargs)
val = Cursor(getattr(self.session.twitter, self.function), count=self.session.settings["general"]["max_tweets_per_call"], *self.args, **self.kwargs).items(self.session.settings["general"]["max_tweets_per_call"]) if type(val) == tuple:
val, cursor = val
if type(cursor) == tuple:
cursor = cursor[1]
self.session.db["cursors"][self.name] = cursor
results = [i for i in val] results = [i for i in val]
self.session.db["cursors"][self.name] = val.page_iterator.next_cursor
val = results val = results
val.reverse() val.reverse()
log.debug("Retrieved %d items from cursored search in function %s" % (len(val), self.function)) log.debug("Retrieved %d items from cursored search in function %s" % (len(val), self.function))
@ -902,9 +909,13 @@ class peopleBufferController(baseBufferController):
def get_more_items(self): def get_more_items(self):
try: try:
cursor = self.session.db["cursors"].get(self.name) cursor = self.session.db["cursors"].get(self.name)
items = Cursor(getattr(self.session.twitter, self.function), users=True, cursor=cursor, count=self.session.settings["general"]["max_tweets_per_call"], *self.args, **self.kwargs).items(self.session.settings["general"]["max_tweets_per_call"]) items = getattr(self.session.twitter, self.function)(return_cursors=True, users=True, cursor=cursor, count=self.session.settings["general"]["max_tweets_per_call"], *self.args, **self.kwargs)
if type(items) == tuple:
items, cursor = items
if type(cursor) == tuple:
cursor = cursor[1]
self.session.db["cursors"][self.name] = cursor
results = [i for i in items] results = [i for i in items]
self.session.db["cursors"][self.name] = items.page_iterator.next_cursor
items = results items = results
log.debug("Retrieved %d items from cursored search in function %s" % (len(items), self.function)) log.debug("Retrieved %d items from cursored search in function %s" % (len(items), self.function))
except TweepError as e: except TweepError as e: