3e20dc2c5f
* Initial plan * Implement parameter support for /ytdlp command Co-authored-by: krau <71133316+krau@users.noreply.github.com> * Add comprehensive tests for ytdlp parameter parsing Co-authored-by: krau <71133316+krau@users.noreply.github.com> * Improve flag parsing logic and clarify argument order Co-authored-by: krau <71133316+krau@users.noreply.github.com> * Preserve critical defaults and improve comments Co-authored-by: krau <71133316+krau@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: krau <71133316+krau@users.noreply.github.com>
93 lines
2.6 KiB
Go
93 lines
2.6 KiB
Go
package handlers
|
|
|
|
import (
|
|
"net/url"
|
|
"strings"
|
|
|
|
"github.com/celestix/gotgproto/dispatcher"
|
|
"github.com/celestix/gotgproto/ext"
|
|
"github.com/charmbracelet/log"
|
|
|
|
"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem"
|
|
"github.com/krau/SaveAny-Bot/common/i18n"
|
|
"github.com/krau/SaveAny-Bot/common/i18n/i18nk"
|
|
"github.com/krau/SaveAny-Bot/pkg/enums/tasktype"
|
|
"github.com/krau/SaveAny-Bot/pkg/tcbdata"
|
|
"github.com/krau/SaveAny-Bot/storage"
|
|
)
|
|
|
|
func handleYtdlpCmd(ctx *ext.Context, update *ext.Update) error {
|
|
logger := log.FromContext(ctx)
|
|
args := strings.Split(update.EffectiveMessage.Text, " ")
|
|
if len(args) < 2 {
|
|
ctx.Reply(update, ext.ReplyTextString(i18n.T(i18nk.BotMsgYtdlpUsage)), nil)
|
|
return dispatcher.EndGroups
|
|
}
|
|
|
|
// Separate URLs and flags from arguments
|
|
var urls []string
|
|
var flags []string
|
|
|
|
for i := 1; i < len(args); i++ {
|
|
arg := strings.TrimSpace(args[i])
|
|
if arg == "" {
|
|
continue
|
|
}
|
|
|
|
// Check if it's a flag (starts with - or --)
|
|
if strings.HasPrefix(arg, "-") {
|
|
flags = append(flags, arg)
|
|
// Check if the next argument might be a value for this flag
|
|
// Don't consume it if it starts with - or looks like a URL with scheme
|
|
if i+1 < len(args) {
|
|
nextArg := strings.TrimSpace(args[i+1])
|
|
if nextArg != "" && !strings.HasPrefix(nextArg, "-") {
|
|
// Check if it's clearly a URL (has ://)
|
|
// This handles common video URLs (http://, https://)
|
|
// For other yt-dlp inputs, users should ensure proper formatting
|
|
if strings.Contains(nextArg, "://") {
|
|
// It's a URL, don't consume it as a flag value
|
|
continue
|
|
}
|
|
// Otherwise, treat it as a flag value
|
|
flags = append(flags, nextArg)
|
|
i++ // Skip the next argument as it's been consumed
|
|
}
|
|
}
|
|
} else {
|
|
// Try to parse as URL
|
|
u, err := url.Parse(arg)
|
|
if err != nil || u.Scheme == "" || u.Host == "" {
|
|
logger.Warnf("Invalid URL: %s", arg)
|
|
continue
|
|
}
|
|
urls = append(urls, arg)
|
|
}
|
|
}
|
|
|
|
if len(urls) == 0 {
|
|
ctx.Reply(update, ext.ReplyTextString(i18n.T(i18nk.BotMsgYtdlpErrorNoValidUrls)), nil)
|
|
return dispatcher.EndGroups
|
|
}
|
|
|
|
logger.Debugf("Preparing yt-dlp download for %d URL(s) with %d flag(s)", len(urls), len(flags))
|
|
|
|
// Build storage selection keyboard
|
|
markup, err := msgelem.BuildAddSelectStorageKeyboard(storage.GetUserStorages(ctx, update.GetUserChat().GetID()), tcbdata.Add{
|
|
TaskType: tasktype.TaskTypeYtdlp,
|
|
YtdlpURLs: urls,
|
|
YtdlpFlags: flags,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
ctx.Reply(update, ext.ReplyTextString(i18n.T(i18nk.BotMsgYtdlpInfoUrlsSelectStorage, map[string]any{
|
|
"Count": len(urls),
|
|
})), &ext.ReplyOpts{
|
|
Markup: markup,
|
|
})
|
|
|
|
return dispatcher.EndGroups
|
|
}
|