From 305b0753654733d60a3586da7694f2d3bcbeced3 Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Mon, 13 Dec 2021 15:01:44 +0530 Subject: [PATCH] [Tag Editor] Changed JAudioTagger to https://github.com/Kaned1as/jaudiotagger - We should be able to read and write to opus files - We should be able to set artwork to Flac and other files --- app/build.gradle | 2 +- .../retromusic/activities/tageditor/TagWriter.kt | 14 +++++++------- .../glide/audiocover/AudioFileCoverUtils.java | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8c2e9fda6..9fa7b981c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -153,7 +153,7 @@ dependencies { implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0' implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5' - implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3' + implementation 'com.github.Adonai:jaudiotagger:2.3.14' implementation 'com.anjlab.android.iab.v3:library:2.0.3' implementation 'com.r0adkll:slidableactivity:2.1.0' implementation 'com.heinrichreimersoftware:material-intro:2.0.0' diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/TagWriter.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/TagWriter.kt index 4fcea20f2..9bc20f100 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/TagWriter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/TagWriter.kt @@ -21,8 +21,8 @@ import org.jaudiotagger.audio.exceptions.CannotWriteException import org.jaudiotagger.audio.exceptions.InvalidAudioFrameException import org.jaudiotagger.audio.exceptions.ReadOnlyFileException import org.jaudiotagger.tag.TagException +import org.jaudiotagger.tag.images.AndroidArtwork import org.jaudiotagger.tag.images.Artwork -import org.jaudiotagger.tag.images.ArtworkFactory import java.io.File import java.io.FileOutputStream import java.io.IOException @@ -58,11 +58,11 @@ class TagWriter { try { albumArtFile = createAlbumArtFile(context).canonicalFile info.artworkInfo.artwork.compress( - Bitmap.CompressFormat.PNG, - 0, + Bitmap.CompressFormat.JPEG, + 100, FileOutputStream(albumArtFile) ) - artwork = ArtworkFactory.createArtworkFromFile(albumArtFile) + artwork = AndroidArtwork.createArtworkFromFile(albumArtFile) } catch (e: IOException) { e.printStackTrace() } @@ -131,11 +131,11 @@ class TagWriter { try { albumArtFile = createAlbumArtFile(context).canonicalFile info.artworkInfo.artwork.compress( - Bitmap.CompressFormat.PNG, - 0, + Bitmap.CompressFormat.JPEG, + 100, FileOutputStream(albumArtFile) ) - artwork = ArtworkFactory.createArtworkFromFile(albumArtFile) + artwork = AndroidArtwork.createArtworkFromFile(albumArtFile) } catch (e: IOException) { e.printStackTrace() } diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverUtils.java b/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverUtils.java index 5ffe040cc..5c7fa7aad 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverUtils.java +++ b/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverUtils.java @@ -14,6 +14,7 @@ package code.name.monkey.retromusic.glide.audiocover; +import org.jaudiotagger.audio.exceptions.CannotReadException; import org.jaudiotagger.audio.exceptions.InvalidAudioFrameException; import org.jaudiotagger.audio.exceptions.ReadOnlyFileException; import org.jaudiotagger.audio.mp3.MP3File; @@ -45,7 +46,7 @@ public class AudioFileCoverUtils { } } // If there are any exceptions, we ignore them and continue to the other fallback method - } catch (ReadOnlyFileException | InvalidAudioFrameException | TagException | IOException ignored) { + } catch (ReadOnlyFileException | InvalidAudioFrameException | TagException | IOException | CannotReadException ignored) { } // Method 2: look for album art in external files