1 files changed, 3 insertions, 2 deletions
diff --git a/cutter b/cutter
index 46e0a90..895b494 100755
--- a/cutter
+++ b/cutter
@@ -282,15 +282,16 @@ class CueSplitter:
 			"artist": self.opt.artist or track.get("performer")
 				or self.cue.get("performer"),
 			"composer": self.opt.composer or track.get("songwriter")
+				or self.cue.get("songwriter")
 		})
 
 		try:
-			name = fmt.format(**tags) + "." + self.TRACK_SUFFIX
+			name = fmt.format(year=tags["date"], **tags)
 		except KeyError as err:
 			printerr("invalid format key: %s", err)
 			sys.exit(1)
 
-		return self.TrackInfo(name, tags)
+		return self.TrackInfo(name + "." + self.TRACK_SUFFIX, tags)
 
 	def find_realfile(self, name):
 		if not name.endswith(".wav"):