1
0

♻️ Check input string as file path or use it as FileID in upload

This commit is contained in:
Maxim Lebedev 2018-02-15 02:53:40 +05:00
parent aa60f9c5fb
commit 10d27ddfbd
No known key found for this signature in database
GPG Key ID: F8978F46FF0FFA4F

View File

@ -8,7 +8,7 @@ import (
// "io/ioutil" // "io/ioutil"
"mime/multipart" "mime/multipart"
"net/url" "net/url"
// "os" "os"
log "github.com/kirillDanshin/dlog" log "github.com/kirillDanshin/dlog"
json "github.com/pquerna/ffjson/ffjson" json "github.com/pquerna/ffjson/ffjson"
@ -67,12 +67,12 @@ func (bot *Bot) upload(file InputFile, fieldName, fileName, method string, args
switch f := file.(type) { switch f := file.(type) {
case string: // Send by 'file_id' case string: // Send by 'file_id'
err := multi.WriteField(fieldName, f) if _, err = os.Stat(f); os.IsNotExist(err) {
if err != nil { err = multi.WriteField(fieldName, f)
return nil, err if err != nil {
} return nil, err
}
/* } else {
src, err := os.Open(f) src, err := os.Open(f)
if err != nil { if err != nil {
return nil, err return nil, err
@ -86,7 +86,7 @@ func (bot *Bot) upload(file InputFile, fieldName, fileName, method string, args
if _, err = io.Copy(formFile, src); err != nil { if _, err = io.Copy(formFile, src); err != nil {
return nil, err return nil, err
} }
*/ }
case []byte: // Upload new case []byte: // Upload new
formFile, err := multi.CreateFormFile(fieldName, fileName) formFile, err := multi.CreateFormFile(fieldName, fileName)
if err != nil { if err != nil {