Refactor Format struct

rylio · Dec 27, 2019 · 6532141 · 6532141
1 parent 92eff6f
commit 6532141
Show file tree

Hide file tree

Showing 9 changed files with 639 additions and 591 deletions.
diff --git a/cmd/ytdl/main.go b/cmd/ytdl/main.go
@@ -194,7 +194,7 @@ func handler(identifier string, options options) {
 				fps = format.ValueForKey("fps").(string)
 			}
 
-			data = append(data, []string{strconv.Itoa(format.Itag), format.Extension, format.Resolution, fps, format.VideoEncoding, format.AudioEncoding, strconv.Itoa(format.AudioBitrate)})
+			data = append(data, []string{strconv.Itoa(format.Itag.Itag), format.Itag.Extension, format.Resolution(), fps, format.Itag.VideoEncoding, format.Itag.AudioEncoding, strconv.Itoa(format.Itag.AudioBitrate)})
 		}
 
 		table := tablewriter.NewWriter(os.Stdout)
@@ -260,9 +260,9 @@ func handler(identifier string, options options) {
 		var fileName string
 		fileName, err = createFileName(options.outputFile, outputFileName{
 			Title:         sanitizeFileNamePart(info.Title),
-			Ext:           sanitizeFileNamePart(format.Extension),
+			Ext:           sanitizeFileNamePart(format.Itag.Extension),
 			DatePublished: sanitizeFileNamePart(info.DatePublished.Format("2006-01-02")),
-			Resolution:    sanitizeFileNamePart(format.Resolution),
+			Resolution:    sanitizeFileNamePart(format.Resolution()),
 			Duration:      sanitizeFileNamePart(info.Duration.String()),
 		})
 		if err != nil {