Bump jaudio tagger version

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
master
Andrew DeMaria 8 years ago
parent 856733d639
commit 6f3ede33d9
No known key found for this signature in database
GPG Key ID: 0A3F5E91F8364EDF
  1. 15
      libresonic-main/pom.xml
  2. 3
      libresonic-main/src/main/java/org/libresonic/player/dao/MediaFileDao.java
  3. 2
      libresonic-main/src/main/java/org/libresonic/player/service/metadata/JaudiotaggerParser.java
  4. 16
      libresonic-main/src/main/java/org/libresonic/player/util/Util.java
  5. 4
      pom.xml

@ -194,9 +194,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org</groupId> <groupId>net.jthink</groupId>
<artifactId>jaudiotagger</artifactId> <artifactId>jaudiotagger</artifactId>
<version>2.0.3</version> <version>2.2.3</version>
</dependency> </dependency>
<dependency> <dependency>
@ -398,6 +398,17 @@
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.24</version> <version>1.7.24</version>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.8.7</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.8.7</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

@ -24,6 +24,7 @@ import org.libresonic.player.domain.Genre;
import org.libresonic.player.domain.MediaFile; import org.libresonic.player.domain.MediaFile;
import org.libresonic.player.domain.MusicFolder; import org.libresonic.player.domain.MusicFolder;
import org.libresonic.player.domain.RandomSearchCriteria; import org.libresonic.player.domain.RandomSearchCriteria;
import org.libresonic.player.util.Util;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.RowMapper;
@ -165,6 +166,8 @@ public class MediaFileDao extends AbstractDao {
"version=? " + "version=? " +
"where path=?"; "where path=?";
logger.trace("Updating media file {}", Util.debugObject(file));
int n = update(sql, int n = update(sql,
file.getFolder(), file.getMediaType().name(), file.getFormat(), file.getTitle(), file.getAlbumName(), file.getArtist(), file.getFolder(), file.getMediaType().name(), file.getFormat(), file.getTitle(), file.getAlbumName(), file.getArtist(),
file.getAlbumArtist(), file.getDiscNumber(), file.getTrackNumber(), file.getYear(), file.getGenre(), file.getBitRate(), file.getAlbumArtist(), file.getDiscNumber(), file.getTrackNumber(), file.getYear(), file.getGenre(), file.getBitRate(),

@ -26,7 +26,7 @@ import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.audio.AudioHeader; import org.jaudiotagger.audio.AudioHeader;
import org.jaudiotagger.tag.FieldKey; import org.jaudiotagger.tag.FieldKey;
import org.jaudiotagger.tag.Tag; import org.jaudiotagger.tag.Tag;
import org.jaudiotagger.tag.datatype.Artwork; import org.jaudiotagger.tag.images.Artwork;
import org.jaudiotagger.tag.reference.GenreTypes; import org.jaudiotagger.tag.reference.GenreTypes;
import org.libresonic.player.Logger; import org.libresonic.player.Logger;
import org.libresonic.player.domain.MediaFile; import org.libresonic.player.domain.MediaFile;

@ -19,12 +19,16 @@
*/ */
package org.libresonic.player.util; package org.libresonic.player.util;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.libresonic.player.Logger; import org.libresonic.player.Logger;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.*; import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/** /**
* Miscellaneous general utility methods. * Miscellaneous general utility methods.
@ -102,4 +106,14 @@ public final class Util {
} }
return result; return result;
} }
static ObjectMapper objectMapper = new ObjectMapper();
public static String debugObject(Object object) {
try {
return objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(object);
} catch (JsonProcessingException e) {
LOG.warn("Cant output debug object", e);
return "";
}
}
} }

@ -35,6 +35,10 @@
<name>teleal</name> <name>teleal</name>
<url>http://teleal.org/m2</url> <url>http://teleal.org/m2</url>
</repository> </repository>
<repository>
<id>jaudiotagger-repository</id>
<url>https://dl.bintray.com/ijabz/maven</url>
</repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>

Loading…
Cancel
Save