Merge pull request #453 from rusq/i452

download gifs as gifs

cmd/slackdump/internal/emoji/emoji.go

@@ -29,7 +29,7 @@ var CmdEmoji = &base.Command{
 	UsageLine:   "slackdump emoji [flags]",
 	Short:       "download workspace emoticons ಠ_ಠ",
 	Long:        emojiMD,
-	FlagMask:    cfg.OmitAll &^ cfg.OmitAuthFlags,
+	FlagMask:    cfg.OmitAll &^ cfg.OmitAuthFlags &^ cfg.OmitOutputFlag,
 	RequireAuth: true,
 	PrintFlags:  true,
 }

cmd/slackdump/internal/emoji/emojidl/emoedge.go

@@ -1,7 +1,7 @@
-// Package emojidl provides functions to dump the all slack emojis for a workspace.
-// It skips the "alias" emojis, so only original an emoji with an original name
-// is present. If you need to find the alias - lookup the index.json. The
-// directory structure is the following:
+// Package emojidl provides functions to dump the all slack emojis for a
+// workspace. It skips the "alias" emojis, so only original emoji with an
+// original name is present. If you need to find the alias - look it up in the
+// index.json. The directory structure is the following:
 //
 //	.
 //	+- emojis
@@ -24,6 +24,7 @@ import (
 	"sync"
 
 	"github.com/rusq/fsadapter"
+
 	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/cfg"
 	"github.com/rusq/slackdump/v3/internal/edge"
 )
@@ -97,7 +98,7 @@ func DlEdgeFS(ctx context.Context, sess EdgeEmojiLister, fsa fsadapter.FS, failF
 		count = 0
 		total = <-totalC // if there's a generator error, this will receive 0.
 	)
-	var emojis = make(map[string]edge.Emoji, total)
+	emojis := make(map[string]edge.Emoji, total)
 LOOP:
 	for {
 		select {

cmd/slackdump/internal/emoji/emojidl/emoji.go

@@ -27,6 +27,7 @@ import (
 	"sync"
 
 	"github.com/rusq/fsadapter"
+
 	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/cfg"
 	"github.com/rusq/slackdump/v3/internal/edge"
 )
@@ -54,7 +55,7 @@ func DlFS(ctx context.Context, sess EmojiDumper, fsa fsadapter.FS, failFast bool
 	if err != nil {
 		return fmt.Errorf("error marshalling emoji index: %w", err)
 	}
-	if err := fsa.WriteFile("index.json", bIndex, 0644); err != nil {
+	if err := fsa.WriteFile("index.json", bIndex, 0o644); err != nil {
 		return fmt.Errorf("failed writing emoji index: %w", err)
 	}
 
@@ -164,7 +165,8 @@ func fetchEmoji(ctx context.Context, fsa fsadapter.FS, dir string, name, uri str
 	}
 	defer resp.Body.Close()
 
-	filename := path.Join(dir, name+".png")
+	emojiExt := path.Ext(uri) // get the extension from the uri.
+	filename := path.Join(dir, name+emojiExt)
 	wc, err := fsa.Create(filename)
 	if err != nil {
 		return err

cmd/slackdump/internal/emoji/emojidl/emoji_test.go

@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"os"
+	"path"
 	"path/filepath"
 	"reflect"
 	"sync"
@@ -40,9 +41,10 @@ func setGlobalFetchFn(fn fetchFunc) {
 
 func Test_fetchEmoji(t *testing.T) {
 	type args struct {
-		ctx  context.Context
-		dir  string
-		name string
+		ctx       context.Context
+		dir       string
+		name      string
+		urlsuffix string
 	}
 	type serverOptions struct {
 		status int
@@ -58,15 +60,23 @@ func Test_fetchEmoji(t *testing.T) {
 	}{
 		{
 			"ok",
-			args{context.Background(), "test", "file"},
+			args{context.Background(), "test", "file", "/somepath/file.png"},
+			serverOptions{status: http.StatusOK, body: []byte("test data")},
+			false,
+			true,
+			[]byte("test data"),
+		},
+		{
+			"gif",
+			args{context.Background(), "test", "file", "/somepath/file.gif"},
 			serverOptions{status: http.StatusOK, body: []byte("test data")},
 			false,
 			true,
 			[]byte("test data"),
 		},
 		{
 			"404",
-			args{context.Background(), "test", "file"},
+			args{context.Background(), "test", "file", "/somepath/file.png"},
 			serverOptions{status: http.StatusNotFound, body: nil},
 			true,
 			true,
@@ -89,11 +99,12 @@ func Test_fetchEmoji(t *testing.T) {
 				t.Fatalf("failed to create test dir: %s", err)
 			}
 
-			if err := fetchEmoji(tt.args.ctx, fsa, tt.args.dir, tt.args.name, server.URL); (err != nil) != tt.wantErr {
+			if err := fetchEmoji(tt.args.ctx, fsa, tt.args.dir, tt.args.name, server.URL+tt.args.urlsuffix); (err != nil) != tt.wantErr {
 				t.Errorf("fetch() error = %v, wantErr %v", err, tt.wantErr)
 			}
 
-			testfile := filepath.Join(dir, tt.args.dir, tt.args.name+".png")
+			ext := path.Ext(tt.args.urlsuffix)
+			testfile := filepath.Join(dir, tt.args.dir, tt.args.name+ext)
 			_, err = os.Stat(testfile)
 			if notExist := os.IsNotExist(err); notExist != !tt.wantFileExist {
 				t.Errorf("os.IsNotExist=%v tt.wantFileExist=%v", notExist, tt.wantFileExist)