Hexor/gaspar
1
0
Fork 0
mirror of https://github.com/house-of-vanity/gaspar.git synced 2025-07-06 18:24:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add /list pagination.

Browse Source
This commit is contained in:
AB
2021-12-13 18:59:58 +03:00
parent 66e43d8c18
commit 9e434ffad1
3 changed files with 80 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gaspar/__init__.py
View File

@ -1,2 +1,2 @@
import gaspar
__version__ = "0.2.1"
__version__ = "0.2.2"

99
gaspar/gaspar.py
View File

@ -63,24 +63,67 @@ def main():
update.message.reply_text(msg, parse_mode='HTML', disable_web_page_preview=True, reply_markup=reply_markup)
def list_alerts(update, context):
per_page = 5
# log.info("list_alerts update.callback_query: %s", update.callback_query.message)
try:
query = int(update.callback_query.data.split('.')[-1])
chat_id = update.callback_query.message.chat['id']
username = update.callback_query.message.chat['username']
reply = True
except:
query = 0
username = update.message.from_user.username
chat_id = update.message.chat['id']
reply = False
log.info(
"Got /list request from user [%s] %s",
update.message.chat['id'],
update.message.from_user.username)
alerts = Torrent().db.get_alerts(update.message.chat['id'])
chat_id,
username)
alerts = Torrent().db.get_alerts(chat_id)
if len(alerts) == 0:
update.message.reply_text("You have no configured alerts.")
return True
msg = "<b>Configured alerts:</b>\n"
for alert in alerts:
msg = f"<b>Configured {len(alerts)} alerts:</b>\n"
log.info("interval: %s:%s", query, per_page+query)
item_num = query + 1
for alert in alerts[query:per_page+query]:
msg += format_topic(
alert['id'],
alert['topic_title'],
alert['size'],
alert['info_hash'],
alert['reg_time'],
pre="\n")
update.message.reply_text(msg, parse_mode='HTML', disable_web_page_preview=True)
pre="\n",
item_num=item_num)
item_num += 1
log.info("list_alerts: %s", len(msg))
if len(alerts) > 5:
if len(alerts[query:per_page+query]) < per_page:
keyboard = [
[
InlineKeyboardButton("<", callback_data=f"list.{query-per_page}"),
]
]
elif query == 0:
keyboard = [
[
InlineKeyboardButton(">", callback_data=f"list.{query+per_page}"),
]
]
else:
keyboard = [
[
InlineKeyboardButton("<", callback_data=f"list.{query-per_page}"),
InlineKeyboardButton(">", callback_data=f"list.{query+per_page}"),
]
]
reply_markup = InlineKeyboardMarkup(keyboard)
if reply:
update.callback_query.edit_message_text(msg, reply_markup=reply_markup, parse_mode='HTML', disable_web_page_preview=True)
else:
update.message.reply_text(msg, reply_markup=reply_markup, parse_mode='HTML', disable_web_page_preview=True)
else:
update.message.reply_text(msg, parse_mode='HTML', disable_web_page_preview=True)
def handle_client(update, context):
u_id = update.message.chat['id']
@ -135,32 +178,36 @@ def main():
def button(update: Update, context: CallbackContext) -> None:
query = update.callback_query
log.info("button: %s", query.data)
u_id = query.message.chat['id']
if any(w in query.data for w in ['close', 'start_rpc']):
torrent_id = query.data.split('.')[1]
torrent = Torrent(torrent_id)
torrent_id = query.data.split('.')[1]
torrent = Torrent(torrent_id)
msg = format_topic(
torrent.meta['id'],
torrent.meta['topic_title'],
torrent.meta['size'],
torrent.meta['info_hash'],
torrent.meta['reg_time'],
pre='You will be alerted about\n')
if query.data.split('.')[0] == "close":
msg = format_topic(
torrent.meta['id'],
torrent.meta['topic_title'],
torrent.meta['size'],
torrent.meta['info_hash'],
torrent.meta['reg_time'],
pre='You will be alerted about\n')
if query.data.split('.')[0] == "close":
query.answer()
query.edit_message_text(text=f"{msg}", parse_mode='HTML',
disable_web_page_preview=True)
elif query.data.split('.')[0] == "start_rpc":
query.answer()
easy_send(user_id=u_id, torrent_hash=torrent.meta['info_hash'])
query.edit_message_text(text=f"{msg}📨 <b>Sent to RPC /client</b>", parse_mode='HTML',
disable_web_page_preview=True)
if 'list.' in query.data:
query.answer()
query.edit_message_text(text=f"{msg}", parse_mode='HTML',
disable_web_page_preview=True)
else:
easy_send(user_id=u_id, torrent_hash=torrent.meta['info_hash'])
query.answer()
query.edit_message_text(text=f"{msg}📨 <b>Sent to RPC /client</b>", parse_mode='HTML',
disable_web_page_preview=True)
list_alerts(update, context)
updater = Updater(token, use_context=True)
update_watcher(updater.bot)
updater.dispatcher.add_handler(CommandHandler('list', list_alerts))
updater.dispatcher.add_handler(MessageHandler(filters.Filters.regex(r'/list'), list_alerts))
updater.dispatcher.add_handler(CommandHandler('client', handle_client))
updater.dispatcher.add_handler(CommandHandler('delete_client', delete_client))
updater.dispatcher.add_handler(MessageHandler(filters.Filters.regex(r'/delete_'), delete))

8
gaspar/tools.py
View File

@ -1,7 +1,7 @@
from datetime import datetime
def format_topic(tor_id, topic_title, size, info_hash, reg_time, pre=''):
def format_topic(tor_id, topic_title, size, info_hash, reg_time, pre='', item_num=False):
def sizeof_fmt(num, suffix='B'):
num = int(num)
for unit in ['', 'Ki', 'Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi']:
@ -13,7 +13,11 @@ def format_topic(tor_id, topic_title, size, info_hash, reg_time, pre=''):
size = sizeof_fmt(size)
reg_time = datetime.utcfromtimestamp(int(reg_time)
).strftime('%b-%d-%Y')
msg = f"""{pre}<a href='https://rutracker.org/forum/viewtopic.php?t={tor_id}'><b>{topic_title}</b></a>
if item_num:
item_num = f"[{item_num}] "
else:
item_num = ''
msg = f"""{pre}<a href='https://rutracker.org/forum/viewtopic.php?t={tor_id}'><b>{item_num}{topic_title}</b></a>
<b>💿 Size:</b> <code>{size}</code>
<b>#️⃣ Hash:</b> <code>{info_hash}</code>
<b>📅 Updated:</b> <code>{reg_time}</code>