Skip to content
Snippets Groups Projects
Commit 1e237649 authored by yermak's avatar yermak
Browse files

Merge branch 'v4.x'

parents bd2df0ce d11642a2
Branches
Tags version_4.5.2
No related merge requests found
...@@ -24,7 +24,7 @@ public class AudioBookInfo { ...@@ -24,7 +24,7 @@ public class AudioBookInfo {
public AudioBookInfo(Map<String, String> tags) { public AudioBookInfo(Map<String, String> tags) {
if (tags != null) { if (tags != null) {
this.setTitle(tags.get("album")); this.setTitle(tags.get("title"));
this.setWriter(tags.get("artist")); this.setWriter(tags.get("artist"));
this.setNarrator(tags.get("album_artist")); this.setNarrator(tags.get("album_artist"));
if (StringUtils.isNotBlank(tags.get("narratedby"))) { if (StringUtils.isNotBlank(tags.get("narratedby"))) {
...@@ -33,7 +33,7 @@ public class AudioBookInfo { ...@@ -33,7 +33,7 @@ public class AudioBookInfo {
if (StringUtils.isNotBlank(tags.get("composer"))) { if (StringUtils.isNotBlank(tags.get("composer"))) {
this.setNarrator(tags.get("composer")); this.setNarrator(tags.get("composer"));
} }
// this.setSeries(tags.get("album")); this.setSeries(tags.get("album"));
if (StringUtils.isNotBlank(tags.get("date"))) { if (StringUtils.isNotBlank(tags.get("date"))) {
this.setYear(tags.get("date")); this.setYear(tags.get("date"));
} }
......
...@@ -3,7 +3,7 @@ package uk.yermak.audiobookconverter; ...@@ -3,7 +3,7 @@ package uk.yermak.audiobookconverter;
public class Version { public class Version {
private final static int MAJOR = 4; private final static int MAJOR = 4;
private final static int MINOR = 5; private final static int MINOR = 5;
private final static int BUILD = 1; private final static int BUILD = 2;
public static String getVersionString() { public static String getVersionString() {
return "AudioBookConverter-" + MAJOR + "." + MINOR + "." + BUILD; return "AudioBookConverter-" + MAJOR + "." + MINOR + "." + BUILD;
......
...@@ -109,7 +109,7 @@ public class BookInfoController { ...@@ -109,7 +109,7 @@ public class BookInfoController {
private void copyTags(AudioBookInfo bookInfo) { private void copyTags(AudioBookInfo bookInfo) {
title.setText(bookInfo.getTitle()); title.setText(bookInfo.getSeries());
writer.setText(bookInfo.getWriter()); writer.setText(bookInfo.getWriter());
narrator.setText(bookInfo.getNarrator()); narrator.setText(bookInfo.getNarrator());
genre.getEditor().setText(bookInfo.getGenre()); genre.getEditor().setText(bookInfo.getGenre());
......
AudioBookConverter-4.5.1 AudioBookConverter-4.5.2
\ No newline at end of file \ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment