diff options
Diffstat (limited to 'rhimport/fetcher.go')
| -rw-r--r-- | rhimport/fetcher.go | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/rhimport/fetcher.go b/rhimport/fetcher.go index e3280c4..f8bfa0a 100644 --- a/rhimport/fetcher.go +++ b/rhimport/fetcher.go @@ -45,14 +45,14 @@ import ( "github.com/andelf/go-curl" ) -type FetcherCurlCBData struct { +type fetcherCurlCBData struct { ctx *Context res *Result basepath string filename string remotename string metadata map[string]string - conv FetchConverter + conv fetchConverter totalSize float64 written uint64 writeError error @@ -60,7 +60,7 @@ type FetcherCurlCBData struct { func curlHeaderCallback(ptr []byte, userdata interface{}) bool { hdr := fmt.Sprintf("%s", ptr) - data := userdata.(*FetcherCurlCBData) + data := userdata.(*fetcherCurlCBData) if strings.HasPrefix(hdr, "Content-Disposition:") { if mediatype, params, err := mime.ParseMediaType(strings.TrimPrefix(hdr, "Content-Disposition:")); err == nil { @@ -73,7 +73,7 @@ func curlHeaderCallback(ptr []byte, userdata interface{}) bool { } func curlWriteCallback(ptr []byte, userdata interface{}) bool { - data := userdata.(*FetcherCurlCBData) + data := userdata.(*fetcherCurlCBData) if data.conv == nil { if data.filename == "" { name := path.Clean("/" + data.remotename) @@ -84,7 +84,7 @@ func curlWriteCallback(ptr []byte, userdata interface{}) bool { data.filename = filepath.Join(data.basepath, name) } data.ctx.OrigFilename = data.filename - conv, newFilename, err := NewFetchConverter(data.ctx, data.filename, data.metadata) + conv, newFilename, err := newFetchConverter(data.ctx, data.filename, data.metadata) if err != nil { data.ctx.stdlog.Printf("Unable to create converter for file %s: %s", data.filename, err) data.writeError = err @@ -110,7 +110,7 @@ func curlWriteCallback(ptr []byte, userdata interface{}) bool { } func curlProgressCallback(dltotal, dlnow, ultotal, ulnow float64, userdata interface{}) bool { - data := userdata.(*FetcherCurlCBData) + data := userdata.(*fetcherCurlCBData) if data.writeError != nil { return false @@ -132,7 +132,7 @@ func curlProgressCallback(dltotal, dlnow, ultotal, ulnow float64, userdata inter return true } -func checkYoutubeDL(ctx *Context, res *Result, uri *url.URL) *YoutubeDLInfo { +func checkYoutubeDL(ctx *Context, res *Result, uri *url.URL) *youtubeDLInfo { cmd := exec.Command("youtube-dl", "--no-playlist", "-f", "bestaudio/best", "--prefer-free-formats", "-J", ctx.SourceUri) var stderr, stdout bytes.Buffer cmd.Stdout = &stdout @@ -142,7 +142,7 @@ func checkYoutubeDL(ctx *Context, res *Result, uri *url.URL) *YoutubeDLInfo { } ctx.stdlog.Printf("running youtube-dl for '%s'", ctx.SourceUri) - done := make(chan *YoutubeDLInfo) + done := make(chan *youtubeDLInfo) go func() { defer func() { done <- nil @@ -151,7 +151,7 @@ func checkYoutubeDL(ctx *Context, res *Result, uri *url.URL) *YoutubeDLInfo { ctx.dbglog.Printf("youtube-dl: %v, stderr: %s", err, strings.TrimSpace(stderr.String())) return } - info, err := NewYoutubeDLInfoFromJSON(&stdout) + info, err := newYoutubeDLInfoFromJSON(&stdout) if err != nil { ctx.dbglog.Printf("youtube-dl: %v, stderr: %s", err, strings.TrimSpace(stderr.String())) return @@ -203,7 +203,7 @@ func fetchFileCurl(ctx *Context, res *Result, uri *url.URL) (err error) { } } - cbdata := &FetcherCurlCBData{ctx: ctx, res: res, remotename: path.Base(uri.Path)} + cbdata := &fetcherCurlCBData{ctx: ctx, res: res, remotename: path.Base(uri.Path)} if cbdata.basepath, err = ioutil.TempDir(ctx.conf.TempDir, "rhimportd-"); err != nil { return } @@ -356,7 +356,7 @@ func fetchFileArchiv(ctx *Context, res *Result, uri *url.URL) (err error) { return } - cbdata := &FetcherCurlCBData{ctx: ctx, res: res} + cbdata := &fetcherCurlCBData{ctx: ctx, res: res} cbdata.filename = fmt.Sprintf("%s/%s", destpath, srcfile) easy.Setopt(curl.OPT_WRITEFUNCTION, curlWriteCallback) @@ -433,8 +433,8 @@ func fetchFileDirConvert(ctx *Context, res *Result, origSrc *os.File, sizeTotal origDir, origFile := path.Split(ctx.SourceFile) ctx.OrigFilename = ctx.SourceFile - var conv FetchConverter - if conv, ctx.SourceFile, err = NewFetchConverter(ctx, filepath.Join(basepath, origFile), nil); err != nil { + var conv fetchConverter + if conv, ctx.SourceFile, err = newFetchConverter(ctx, filepath.Join(basepath, origFile), nil); err != nil { ctx.stdlog.Printf("Unable to create converter for file %s: %s", origDir+origFile, err) return } @@ -567,12 +567,12 @@ func fetchFileSilence(ctx *Context, res *Result, uri *url.URL) error { } duration := time.Duration(d) * 100 * time.Millisecond - wav, err := NewPCMWavFile(uint32(ctx.conf.SampleRate), 16, uint16(ctx.Channels), duration) + wav, err := newPCMWavFile(uint32(ctx.conf.SampleRate), 16, uint16(ctx.Channels), duration) if err != nil { return err } fileSize := wav.GetFileSize() - wav.Generator = NewSilenceGenerator() + wav.generator = NewSilenceGenerator() uri.Scheme = "attachment" uri.Host = strconv.FormatUint(uint64(fileSize), 10) @@ -606,7 +606,7 @@ func fetchFileSilence(ctx *Context, res *Result, uri *url.URL) error { return fetchFileAttachment(ctx, res, uri) } -func writeAttachmentFile(ctx *Context, res *Result, sizeTotal uint64, conv FetchConverter) error { +func writeAttachmentFile(ctx *Context, res *Result, sizeTotal uint64, conv fetchConverter) error { written := uint64(0) for { select { @@ -672,9 +672,9 @@ func fetchFileAttachment(ctx *Context, res *Result, uri *url.URL) error { ctx.SourceFile = filepath.Join(basepath, path.Clean("/"+uri.Path)) - var conv FetchConverter + var conv fetchConverter ctx.OrigFilename = ctx.SourceFile - if conv, ctx.SourceFile, err = NewFetchConverter(ctx, ctx.SourceFile, nil); err != nil { + if conv, ctx.SourceFile, err = newFetchConverter(ctx, ctx.SourceFile, nil); err != nil { ctx.stdlog.Printf("Unable to create converter for file %s: %s", ctx.OrigFilename, err) return err } @@ -709,10 +709,10 @@ func fetchFileAttachment(ctx *Context, res *Result, uri *url.URL) error { return nil } -type FetchFunc func(*Context, *Result, *url.URL) (err error) +type fetchFunc func(*Context, *Result, *url.URL) (err error) var ( - fetchers = map[string]FetchFunc{ + fetchers = map[string]fetchFunc{ "local": fetchFileLocal, "tmp": fetchFileTmp, "silence": fetchFileSilence, |