MrZaiko/Jarvis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix torrent api bug
All checks were successful
Build and Deploy / build (push) Successful in 3m41s
Details

Browse Source
This commit is contained in:
Sami Abuzakuk
2025-04-19 22:16:25 +02:00
parent 29617a07a5
commit ee32057c0b
4 changed files with 98 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
main.py
View File

@@ -10,92 +10,124 @@ import api.torrent as torrent
TOKEN = "7396669954:AAH8_I0Y-qg3j_LfbUdRTOLPDKh80NdijMo"
# --- Menu Definitions ---
def main_menu_keyboard():
return InlineKeyboardMarkup([
[InlineKeyboardButton("Torrents", callback_data='status_downloading')],
[InlineKeyboardButton("Status", callback_data='menu_status')]
])
return InlineKeyboardMarkup(
[
[InlineKeyboardButton("Torrents", callback_data="status_downloading")],
[InlineKeyboardButton("Status", callback_data="menu_status")],
]
)
def torrents_menu_keyboard():
return InlineKeyboardMarkup([
# First row: Display the status counts for downloading, paused, seeding
[InlineKeyboardButton(f"Downloading", callback_data='status_downloading')],
[InlineKeyboardButton(f"Active", callback_data='status_active')],
[InlineKeyboardButton(f"All", callback_data='status_all')],
# Second row: Back button
[InlineKeyboardButton("🔙 Back", callback_data='menu_main')]
])
return InlineKeyboardMarkup(
[
# First row: Display the status counts for downloading, paused, seeding
[InlineKeyboardButton(f"Downloading", callback_data="status_downloading")],
[InlineKeyboardButton(f"Active", callback_data="status_active")],
[InlineKeyboardButton(f"All", callback_data="status_all")],
# Second row: Back button
[InlineKeyboardButton("🔙 Back", callback_data="menu_main")],
]
)
def status_menu_keyboard():
return InlineKeyboardMarkup([
[InlineKeyboardButton("🔙 Back", callback_data='menu_main')]
])
return InlineKeyboardMarkup(
[[InlineKeyboardButton("🔙 Back", callback_data="menu_main")]]
)
# --- Command Handlers ---
async def start(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
await update.message.reply_text("Choose an option:", reply_markup=main_menu_keyboard())
try:
await update.message.reply_text(
"Choose an option:", reply_markup=main_menu_keyboard()
)
except Exception as e:
await update.message.reply_text(f"An error occurred: {e}")
# Optionally log the error
print(f"Error: {e}")
def format_torrents(torrents):
if len(torrents) == 0:
return "No torrents."
text = ""
i = 0
for torrent in torrents:
if i > 10:
if i > 5:
text += "...\n"
return text
text += f"Name: {torrent['name']}\n"
text += f"State: {torrent['state']}\n"
text += f"Progress: {torrent['progress']:.2f}%\n"
text += f"ETA: {torrent['eta']}\n"
text += "-" * 20 + "\n"
text += f"- {torrent['name']} - {torrent['progress']} ({torrent['eta']})\n"
i += 1
return text
# --- Callback Query Handler ---
async def handle_menu(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
query = update.callback_query
await query.answer()
match query.data:
case 'menu_main':
await query.edit_message_text("Choose an option:", reply_markup=main_menu_keyboard())
case "menu_main":
await query.edit_message_text(
"Choose an option:", reply_markup=main_menu_keyboard()
)
case 'status_downloading':
case "status_downloading":
t_api = context.bot_data.get("torrent_api", {})
torrents = t_api.get_filtered_torrents("downloading")
text = format_torrents(torrents)
if len(torrents) == 0:
text = "No downloading torrents."
else:
text = format_torrents(torrents)
await query.edit_message_text(text, reply_markup=torrents_menu_keyboard())
case 'status_active':
case "status_active":
t_api = context.bot_data.get("torrent_api", {})
torrents = t_api.get_filtered_torrents("active")
text = format_torrents(torrents)
if len(torrents) == 0:
text = "No active torrents."
else:
text = format_torrents(torrents)
await query.edit_message_text(text, reply_markup=torrents_menu_keyboard())
case 'status_all':
case "status_all":
t_api = context.bot_data.get("torrent_api", {})
torrents = t_api.get_filtered_torrents("all")
text = format_torrents(torrents)
if len(torrents) == 0:
text = "No torrents."
else:
text = format_torrents(torrents)
await query.edit_message_text(text, reply_markup=torrents_menu_keyboard())
case 'menu_status':
case "menu_status":
k_api = context.bot_data.get("kuma_api", {})
monitors = k_api.get_status()
up_text, down_text, paused_text = "", "", ""
for _, monitor in monitors.items():
status = monitor['status']
status = monitor["status"]
if status == MonitorStatus.UP:
up_text += f" - {monitor['name']}\n"
elif status == MonitorStatus.DOWN:
@@ -103,21 +135,27 @@ async def handle_menu(update: Update, context: ContextTypes.DEFAULT_TYPE) -> Non
else:
paused_text += f" - {monitor['name']}\n"
status_text = f"📡 *Status:*\n\n 🟢 Up:\n{up_text}\n🔴 Down\n{down_text}\n⏸️ Paused\n{paused_text}"
await query.edit_message_text(status_text, reply_markup=status_menu_keyboard())
await query.edit_message_text(
status_text, reply_markup=status_menu_keyboard()
)
case _:
await query.edit_message_text("Unknown option selected.", reply_markup=main_menu_keyboard())
await query.edit_message_text(
"Unknown option selected.", reply_markup=main_menu_keyboard()
)
# --- Main Function ---
def main():
print("Starting Jarvis...")
# Initiate api
kuma_api = kuma.KumaAPI("http://192.168.1.2:36667", "k!PTfyvoIJho9o*gX6F1")
torrent_api = torrent.TorrentApi("http://192.168.1.17:8112", "tMHNjrJr7nhjyhJrYsahi4anq2h6LJ")
torrent_api = torrent.TorrentApi(
"http://192.168.1.17:8112", "tMHNjrJr7nhjyhJrYsahi4anq2h6LJ"
)
app = Application.builder().token(TOKEN).build()
app.bot_data["kuma_api"] = kuma_api
@@ -129,5 +167,6 @@ def main():
print("Bot is running... Press Ctrl+C to stop.")
app.run_polling()
if __name__ == "__main__":
main()