Skip to content

Commit

Permalink
minor bug fix and README update
Browse files Browse the repository at this point in the history
  • Loading branch information
@raaifr
raaifr committed Jan 27, 2025
1 parent 9287618 commit 11101d0
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 33 deletions.
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ These are the default commands:
- `/start`: start adding a series or movie to Sonarr/Radarr
- `/delete`: remove a series or movie from Sonarr/Radarr
- `/movie` (en-us) - `/film` (nl-be, it-it, de-de, fr-fr) - `/file` (pt-pt) - `/Película` (es-es): start adding a movie to Radarr
You can also pass the title after the command: `/movie dory` or the IMDB/TMDB ID: `/movie IMDB:tt29268110`
- `/series` (en-us) - `/serie` (nl-be, it-it, pt-pt, es-es, de-de, fr-fr) : start adding a series to Sonarr
You can also pass the title after the command: `/movie dory`
You can also pass the title after the command: `/series jimmy` or the movies TVDB ID: `/series tvdb:270261`
- `/allSeries`: receive a list of all the series on Sonarr
- `/allMovies`: receive a list of all the movies on Radarr
- `/transmission`: change the download/upload speed of Transmission from Temporary Speed Limit to normal or the other way around
Expand Down
70 changes: 40 additions & 30 deletions src/addarr.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,19 +238,19 @@ def main():
],
GIVE_OPTION: [
CallbackQueryHandler(storeSelection, pattern=f'(?i)^({i18n.t("addarr.Actions.Add")})$'),
CallbackQueryHandler(prevOption, pattern=f'(?i)^({i18n.t("addarr.SearchResults.PreviousResult")})$'),
CallbackQueryHandler(nextOption, pattern=f'(?i)^({i18n.t("addarr.SearchResults.NextResult")})$'),
CallbackQueryHandler(prevOption, pattern=f'(?i)^({i18n.t("addarr.General.PreviousResult")})$'),
CallbackQueryHandler(nextOption, pattern=f'(?i)^({i18n.t("addarr.General.NextResult")})$'),
CallbackQueryHandler(startNewMedia, pattern=f'(?i)^({i18n.t("addarr.General.New")})$'),
MessageHandler(
filters.Regex(f'(?i)^({i18n.t("addarr.Actions.Add")})$'),
storeSelection
),
MessageHandler(
filters.Regex(f'(?i)^({i18n.t("addarr.SearchResults.PreviousResult")})$'),
filters.Regex(f'(?i)^({i18n.t("addarr.General.PreviousResult")})$'),
prevOption
),
MessageHandler(
filters.Regex(f'(?i)^({i18n.t("addarr.SearchResults.NextResult")})$'),
filters.Regex(f'(?i)^({i18n.t("addarr.General.NextResult")})$'),
nextOption
),
MessageHandler(
Expand Down Expand Up @@ -458,11 +458,12 @@ async def startNewMedia(update : Update, context: ContextTypes.DEFAULT_TYPE):
markup = InlineKeyboardMarkup(keyboard)

if not config.get("update_msg"):
await context.bot.send_message(
msg = await context.bot.send_message(
chat_id=update.effective_message.chat_id,
text=i18n.t("addarr.General.SelectAnInstance"),
reply_markup=markup,
)
context.user_data["update_msg"] = msg.message_id
else:
await context.bot.edit_message_text(
message_id=context.user_data["update_msg"],
Expand Down Expand Up @@ -512,12 +513,20 @@ async def startNewMedia(update : Update, context: ContextTypes.DEFAULT_TYPE):

markup = InlineKeyboardMarkup(keyboard)

await context.bot.edit_message_text(
message_id=context.user_data["update_msg"],
chat_id=update.effective_message.chat_id,
text=i18n.t("addarr.General.SelectAnInstance"),
reply_markup=markup,
)
if not config.get("update_msg"):
msg = await context.bot.send_message(
chat_id=update.effective_message.chat_id,
text=i18n.t("addarr.General.SelectAnInstance"),
reply_markup=markup,
)
context.user_data["update_msg"] = msg.message_id
else:
await context.bot.edit_message_text(
message_id=context.user_data["update_msg"],
chat_id=update.effective_message.chat_id,
text=i18n.t("addarr.General.SelectAnInstance"),
reply_markup=markup,
)

return GIVE_INSTANCE

Expand Down Expand Up @@ -696,13 +705,14 @@ async def storeTitle(update : Update, context: ContextTypes.DEFAULT_TYPE):

markup = InlineKeyboardMarkup(keyboard)

if not context.user_data.get("update_msg"):
await context.bot.send_message(
if not config.get("update_msg"):
msg = await context.bot.send_message(
chat_id=update.effective_message.chat_id,
text=i18n.t("addarr.General.SelectAnInstance"),
reply_markup=markup,
)
else:
context.user_data["update_msg"] = msg.message_id
else:
await context.bot.edit_message_text(
message_id=context.user_data["update_msg"],
chat_id=update.effective_message.chat_id,
Expand Down Expand Up @@ -749,13 +759,13 @@ async def storeInstance(update : Update, context: ContextTypes.DEFAULT_TYPE):
logger.warning("No results found.")
await context.bot.send_message(
chat_id=update.effective_message.chat_id,
text=i18n.t("addarr.searchresults", count=0),
text=i18n.t("addarr.SearchResults", count=0),
)
clearUserData(context)
return ConversationHandler.END

context.user_data["output"] = service.giveTitles(searchResult)
message=i18n.t("addarr.searchresults", count=len(searchResult))
message=i18n.t("addarr.SearchResults", count=len(searchResult))
message += f"\n\n*{context.user_data['output'][position]['title']} ({context.user_data['output'][position]['year']})*"

if "update_msg" in context.user_data:
Expand Down Expand Up @@ -794,15 +804,15 @@ async def storeInstance(update : Update, context: ContextTypes.DEFAULT_TYPE):
if position > 0:
prev_next_row.append(
InlineKeyboardButton(
'\U000023EE ' + i18n.t("addarr.SearchResults.PreviousResult"),
callback_data=i18n.t("addarr.SearchResults.PreviousResult")
'\U000023EE ' + i18n.t("addarr.General.PreviousResult"),
callback_data=i18n.t("addarr.General.PreviousResult")
)
)
if position < len(context.user_data["output"]) - 1:
prev_next_row.append(
InlineKeyboardButton(
'\U000023ED ' + i18n.t("addarr.SearchResults.NextResult"),
callback_data=i18n.t("addarr.SearchResults.NextResult")
'\U000023ED ' + i18n.t("addarr.General.NextResult"),
callback_data=i18n.t("addarr.General.NextResult")
)
)

Expand Down Expand Up @@ -848,7 +858,7 @@ async def nextOption(update: Update, context: ContextTypes.DEFAULT_TYPE):
searchResult = context.user_data["output"]
choice = context.user_data["choice"]

message=i18n.t("addarr.searchresults", count=len(searchResult))
message=i18n.t("addarr.SearchResults", count=len(searchResult))
message += f"\n\n*{context.user_data['output'][position]['title']} ({context.user_data['output'][position]['year']})*"

await context.bot.edit_message_text(
Expand All @@ -872,15 +882,15 @@ async def nextOption(update: Update, context: ContextTypes.DEFAULT_TYPE):
if position > 0:
prev_next_row.append(
InlineKeyboardButton(
'\U000023EE ' + i18n.t("addarr.SearchResults.PreviousResult"),
callback_data=i18n.t("addarr.SearchResults.PreviousResult")
'\U000023EE ' + i18n.t("addarr.General.PreviousResult"),
callback_data=i18n.t("addarr.General.PreviousResult")
)
)
if position < len(context.user_data["output"]) - 1:
prev_next_row.append(
InlineKeyboardButton(
'\U000023ED ' + i18n.t("addarr.SearchResults.NextResult"),
callback_data=i18n.t("addarr.SearchResults.NextResult")
'\U000023ED ' + i18n.t("addarr.General.NextResult"),
callback_data=i18n.t("addarr.General.NextResult")
)
)

Expand Down Expand Up @@ -939,7 +949,7 @@ async def prevOption(update: Update, context: ContextTypes.DEFAULT_TYPE):
searchResult = context.user_data["output"]
choice = context.user_data["choice"]

message=i18n.t("addarr.searchresults", count=len(searchResult))
message=i18n.t("addarr.SearchResults", count=len(searchResult))
message += f"\n\n*{context.user_data['output'][position]['title']} ({context.user_data['output'][position]['year']})*"

await context.bot.edit_message_text(
Expand All @@ -963,15 +973,15 @@ async def prevOption(update: Update, context: ContextTypes.DEFAULT_TYPE):
if position > 0:
prev_next_row.append(
InlineKeyboardButton(
'\U000023EE ' + i18n.t("addarr.SearchResults.PreviousResult"),
callback_data=i18n.t("addarr.SearchResults.PreviousResult")
'\U000023EE ' + i18n.t("addarr.General.PreviousResult"),
callback_data=i18n.t("addarr.General.PreviousResult")
)
)
if position < len(context.user_data["output"]) - 1:
prev_next_row.append(
InlineKeyboardButton(
'\U000023ED ' + i18n.t("addarr.SearchResults.NextResult"),
callback_data=i18n.t("addarr.SearchResults.NextResult")
'\U000023ED ' + i18n.t("addarr.General.NextResult"),
callback_data=i18n.t("addarr.General.NextResult")
)
)

Expand Down
4 changes: 2 additions & 2 deletions translations/addarr.en-us.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ en-us:
New: New search
Season: Season
End: The current operation terminated by user.
PreviousResult: Previous
NextResult: Next
SelectAnInstance: Please select an instance
SelectAPath: Please select a path for the movie or series
SelectAQuality: Please select a quality profile for the movie or series
Expand Down Expand Up @@ -60,8 +62,6 @@ en-us:
zero: No results found
one: One search result
other: "%{count} search results"
PreviousResult: Previous
NextResult: Next

Transmission:
NotEnabled: The Transmission function is not activated.
Expand Down

0 comments on commit 11101d0

Please sign in to comment.