From f73b6c435752b57624332a846b777d0bff54e980 Mon Sep 17 00:00:00 2001 From: Gabriel Garrido Date: Thu, 9 May 2024 10:03:08 +0200 Subject: [PATCH] Skip 'images' folder --- client/client.go | 2 +- files/files.go | 23 ++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/client/client.go b/client/client.go index a45c0cd..22ed9c8 100644 --- a/client/client.go +++ b/client/client.go @@ -26,7 +26,7 @@ type MediaAttachment struct { Url string `json:"url"` Description string `json:"description"` Id string `json:"id"` - Path string + Path string } func (ma MediaAttachment) SetPath(path string) { diff --git a/files/files.go b/files/files.go index e609940..d7c76d9 100644 --- a/files/files.go +++ b/files/files.go @@ -67,24 +67,21 @@ func (f FileWriter) Write(post client.Post) error { file, err = os.Create(filename) } else { dir := filepath.Join(f.dir, post.Id) - imagedir := filepath.Join(dir, "images") - os.Mkdir(dir, os.ModePerm) - os.Mkdir(imagedir, os.ModePerm) for i := 0; i < len(post.MediaAttachments); i++ { - media := &post.MediaAttachments[i] + media := &post.MediaAttachments[i] if media.Type != "image" { continue } - image, err := downloadAttachment(imagedir, media.Id, media.Url) + imageFilename, err := downloadAttachment(dir, media.Id, media.Url) if err != nil { return err } - media.Path = fmt.Sprintf("images/%s", image) + media.Path = imageFilename } if err != nil { @@ -150,21 +147,21 @@ func downloadAttachment(dir string, id string, url string) (string, error) { return filename, err } - var ext string - urlExt := filepath.Ext(url) + var extension string + urlExtension := filepath.Ext(url) for _, i := range extensions { - if i == urlExt { - ext = i + if i == urlExtension { + extension = i break } } - if ext == "" { - return filename, fmt.Errorf("Could not match extension for media") + if extension == "" { + return filename, fmt.Errorf("could not match extension for media") } - filename = fmt.Sprintf("%s%s", id, ext) + filename = fmt.Sprintf("%s%s", id, extension) file, err := os.Create(filepath.Join(dir, filename)) if err != nil {