Skip to content

feat(up,uploader): add --video/--audio flags and forced media type handling #1053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Andre-cc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(up,uploader): add --video/--audio flags and forced media type handling #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions app/up/up.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ type Options struct {
Excludes []string
Remove bool
Photo bool
// Force type overrides auto-detection
Video bool
Audio bool
}

func Run(ctx context.Context, c *telegram.Client, kvd storage.Storage, opts Options) (rerr error) {
Expand Down Expand Up @@ -54,10 +57,12 @@ func Run(ctx context.Context, c *telegram.Client, kvd storage.Storage, opts Opti
prog.EnablePS(ctx, upProgress)

options := uploader.Options{
Client: pool.Default(ctx),
Threads: viper.GetInt(consts.FlagThreads),
Iter: newIter(files, to, opts.Photo, opts.Remove, viper.GetDuration(consts.FlagDelay)),
Progress: newProgress(upProgress),
Client: pool.Default(ctx),
Threads: viper.GetInt(consts.FlagThreads),
Iter: newIter(files, to, opts.Photo, opts.Remove, viper.GetDuration(consts.FlagDelay)),
Progress: newProgress(upProgress),
ForceVideo: opts.Video,
ForceAudio: opts.Audio,
}

up := uploader.New(options)
Expand Down
5 changes: 5 additions & 0 deletions cmd/up.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,13 @@ func NewUpload() *cobra.Command {
cmd.Flags().BoolVar(&opts.Remove, "rm", false, "remove the uploaded files after uploading")
cmd.Flags().BoolVar(&opts.Photo, "photo", false, "upload the image as a photo instead of a file")

// force type flags (mutually exclusive)
cmd.Flags().BoolVar(&opts.Video, "video", false, "force upload as video (override auto-detection)")
cmd.Flags().BoolVar(&opts.Audio, "audio", false, "force upload as audio (override auto-detection)")

// completion and validation
_ = cmd.MarkFlagRequired(path)
cmd.MarkFlagsMutuallyExclusive("video", "audio")

return cmd
}
65 changes: 45 additions & 20 deletions core/uploader/uploader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ type Options struct {
Threads int
Iter Iter
Progress Progress
// Force type overrides auto-detection
ForceVideo bool
ForceAudio bool
}

func New(o Options) *Uploader {
Expand Down Expand Up @@ -112,28 +115,50 @@ func (u *Uploader) upload(ctx context.Context, elem Elem) error {

var media message.MediaOption = doc

switch {
case mediautil.IsImage(mime.String()) && elem.AsPhoto():
// webp should be uploaded as document
if mime.String() == "image/webp" {
break
}
// upload as photo
media = message.UploadedPhoto(f, caption...)
case mediautil.IsVideo(mime.String()):
// reset reader
if _, err = elem.File().Seek(0, io.SeekStart); err != nil {
return errors.Wrap(err, "seek file")
}
if dur, w, h, err := mediautil.GetMP4Info(elem.File()); err == nil {
// #132. There may be some errors, but we can still upload the file
media = doc.Video().
Duration(time.Duration(dur)*time.Second).
Resolution(w, h).
SupportsStreaming()
// Forced overriding by CLI flags
if u.opts.ForceVideo {
if _, err = elem.File().Seek(0, io.SeekStart); err == nil {
if dur, w, h, err := mediautil.GetMP4Info(elem.File()); err == nil {
// override MIME to video to avoid audio/misclassification
doc = doc.MIME("video/mp4")
media = doc.Video().
Duration(time.Duration(dur)*time.Second).
Resolution(w, h).
SupportsStreaming()
} else {
doc = doc.MIME("video/mp4")
media = doc.Video().SupportsStreaming()
}
} else {
doc = doc.MIME("video/mp4")
media = doc.Video().SupportsStreaming()
}
case mediautil.IsAudio(mime.String()):
} else if u.opts.ForceAudio {
media = doc.Audio().Title(fsutil.GetNameWithoutExt(elem.File().Name()))
} else {
switch {
case mediautil.IsImage(mime.String()) && elem.AsPhoto():
// webp should be uploaded as document
if mime.String() == "image/webp" {
break
}
// upload as photo
media = message.UploadedPhoto(f, caption...)
case mediautil.IsVideo(mime.String()):
// reset reader
if _, err = elem.File().Seek(0, io.SeekStart); err != nil {
return errors.Wrap(err, "seek file")
}
if dur, w, h, err := mediautil.GetMP4Info(elem.File()); err == nil {
// #132. There may be some errors, but we can still upload the file
media = doc.Video().
Duration(time.Duration(dur)*time.Second).
Resolution(w, h).
SupportsStreaming()
}
case mediautil.IsAudio(mime.String()):
media = doc.Audio().Title(fsutil.GetNameWithoutExt(elem.File().Name()))
}
}

_, err = message.NewSender(u.opts.Client).
Expand Down