Use cover instead of fron cover. (5b064218) · Commits · Canek Peláez / Music Library Maintainer · GitLab

lib/mlm/file-tags.vala

+9 −9

Original line number	Diff line number	Diff line
		@@ -116,11 +116,11 @@ namespace MLM {
		}
		private string _original;

		public uint8[] front_cover_picture {
		get { return _front_cover_picture; }
		set { define_front_cover_picture(value); }
		public uint8[] cover_picture {
		get { return _cover_picture; }
		set { define_cover_picture(value); }
		}
		private uint8[] _front_cover_picture;
		private uint8[] _cover_picture;

		public uint8[] artist_picture {
		get { return _artist_picture; }
		@@ -128,7 +128,7 @@ namespace MLM {
		}
		private uint8[] _artist_picture;

		public string front_cover_picture_description { get; private set; }
		public string cover_picture_description { get; private set; }
		public string artist_picture_description { get; private set; }
		public bool has_tags { get; private set; }

		@@ -211,9 +211,9 @@ namespace MLM {
		} else if (frame.id == FrameId.PICTURE) {
		var fc_data = frame.get_picture(Id3Tag.PictureType.COVERFRONT);
		if (fc_data != null) {
		_front_cover_picture = fc_data;
		_cover_picture = fc_data;
		data_frames[Id3Tag.PictureType.COVERFRONT] = new GLib.Bytes(fc_data);
		front_cover_picture_description = frame.get_picture_description();
		cover_picture_description = frame.get_picture_description();
		}
		var a_data = frame.get_picture(Id3Tag.PictureType.ARTIST);
		if (a_data != null) {
		@@ -386,11 +386,11 @@ namespace MLM {
		string_frames[FrameId.ORIGINAL] : null;
		}

		private void define_front_cover_picture(uint8[] value) {
		private void define_cover_picture(uint8[] value) {
		Id3Tag.PictureType pt = Id3Tag.PictureType.COVERFRONT;
		define_data_value(pt, value, (album != null) ?
		album + " cover" : "");
		_front_cover_picture = data_frames.has_key(pt) ?
		_cover_picture = data_frames.has_key(pt) ?
		data_frames[pt].get_data() : null;
		}

src/application/application.vala

+2 −2

Original line number	Diff line number	Diff line
		@@ -122,7 +122,7 @@ namespace MLM {
		window.comment = tags.comment != null ? tags.comment : "";
		window.composer = tags.composer != null ? tags.composer : "";
		window.original = tags.original != null ? tags.original : "";
		window.cover_data = tags.front_cover_picture;
		window.cover_data = tags.cover_picture;
		window.artist_data = tags.artist_picture;
		window.disable(UIItemFlags.SAVE);
		window.current = index;
		@@ -174,7 +174,7 @@ namespace MLM {
		t.comment = window.comment;
		t.composer = window.composer;
		t.original = window.original;
		t.front_cover_picture = window.cover_data;
		t.cover_picture = window.cover_data;
		t.artist_picture = window.artist_data;
		}

src/copy-tags/copy-tags.vala

+2 −2

Original line number	Diff line number	Diff line
		@@ -64,8 +64,8 @@ namespace MLM {
		target_tags.composer = source_tags.composer;
		if (source_tags.original != null)
		target_tags.original = source_tags.original;
		if (source_tags.front_cover_picture != null)
		target_tags.front_cover_picture = source_tags.front_cover_picture;
		if (source_tags.cover_picture != null)
		target_tags.cover_picture = source_tags.cover_picture;
		if (source_tags.artist_picture != null)
		target_tags.artist_picture = source_tags.artist_picture;
		if (source_tags.band != null)

src/tags/tags.vala

+4 −4

Original line number	Diff line number	Diff line
		@@ -204,8 +204,8 @@ Format for printing:
		box.add_body_key_value("Composer", file_tags.composer);
		if (file_tags.original != null)
		box.add_body_key_value("Original artist", file_tags.original);
		var desc = file_tags.front_cover_picture_description;
		if (file_tags.front_cover_picture != null)
		var desc = file_tags.cover_picture_description;
		if (file_tags.cover_picture != null)
		box.add_body_key_value("Front cover picture", desc);
		desc = file_tags.artist_picture_description;
		if (file_tags.artist_picture != null)
		@@ -298,7 +298,7 @@ Format for printing:
		string type = null;
		switch (picture_type) {
		case PictureType.COVER:
		data = file_tags.front_cover_picture;
		data = file_tags.cover_picture;
		type = "front cover";
		break;
		case PictureType.ARTIST:
		@@ -358,7 +358,7 @@ Format for printing:
		if (s_genre != null)
		ft.genre = genre;
		if (cover_picture != null)
		ft.front_cover_picture = cover_picture_data;
		ft.cover_picture = cover_picture_data;
		if (artist_picture != null)
		ft.artist_picture = artist_picture_data;
		if (band != null)

test/test-file-tags.vala

+11 −11

Original line number	Diff line number	Diff line
		@@ -437,23 +437,23 @@ namespace MLM.Test {
		uint8[] val1, uint8[] val2) {
		var path = file.get_path();
		var tags = new FileTags(path);
		assert_bytes_equal(tags.front_cover_picture, original);
		tags.front_cover_picture = val1;
		GLib.assert(tags.front_cover_picture != null);
		assert_bytes_equal(tags.front_cover_picture, val1);
		assert_bytes_equal(tags.cover_picture, original);
		tags.cover_picture = val1;
		GLib.assert(tags.cover_picture != null);
		assert_bytes_equal(tags.cover_picture, val1);
		tags.update();
		tags = null;
		tags = new FileTags(path);
		GLib.assert(tags.front_cover_picture != null);
		assert_bytes_equal(tags.front_cover_picture, val1);
		tags.front_cover_picture = val2;
		GLib.assert(tags.front_cover_picture != null);
		assert_bytes_equal(tags.front_cover_picture, val2);
		GLib.assert(tags.cover_picture != null);
		assert_bytes_equal(tags.cover_picture, val1);
		tags.cover_picture = val2;
		GLib.assert(tags.cover_picture != null);
		assert_bytes_equal(tags.cover_picture, val2);
		tags.update();
		tags = null;
		tags = new FileTags(path);
		GLib.assert(tags.front_cover_picture != null);
		assert_bytes_equal(tags.front_cover_picture, val2);
		GLib.assert(tags.cover_picture != null);
		assert_bytes_equal(tags.cover_picture, val2);
		}

		/**