From cd189b1ddad0158ec7f41c0063e648c84f201186 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Tue, 10 Oct 2023 23:15:11 +0300
Subject: [PATCH] fixed id3v2 meta

---
 .../lite/music/converter/ts/FFMpeg.java       | 40 +++++--------------
 1 file changed, 10 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java b/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java
index 99f8cc44a..e8c4cf1dd 100644
--- a/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java
+++ b/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java
@@ -1,9 +1,14 @@
 package ru.vtosters.lite.music.converter.ts;
 
 import com.arthenica.ffmpegkit.FFmpegKit;
+import com.vk.dto.music.Artist;
 import com.vk.dto.music.MusicTrack;
+import ru.vtosters.lite.music.downloader.M3UDownloader;
+import ru.vtosters.lite.utils.IOUtils;
 
 import java.io.File;
+import java.text.Normalizer;
+import java.util.stream.Collectors;
 
 public class FFMpeg {
 
@@ -13,47 +18,22 @@ public class FFMpeg {
      * @param track Track to be converted
      * @return True if success, else false
      */
-    public static void convert(File in, String out, MusicTrack track) throws Throwable {
+    public static void convert(File in, String out, MusicTrack track) {
         // convert .ts file to .mp3 file via ffmpeg
         var cmd = " -y -i \"" + in.getAbsolutePath() + '"'
                 + " -map 0 -dn"
                 + " -loglevel error"
                 + " -hide_banner"
                 + " -write_id3v2 1"
-//                +" -metadata title=\""+IOUtils.getValidFileName(M3UDownloader.getTitle(track))+'"'
-//                +" -metadata artist=\""+normalizeMetadata(track.L.stream().map(Artist::w1).collect(Collectors.joining(", ")))+'"'
-//                +" -metadata album=\""+normalizeMetadata(track.I.getTitle())+'"'
+                + " -metadata title=\"" + IOUtils.getValidFileName(M3UDownloader.getTitle(track)) + '"'
+                + " -metadata artist=\"" + normalizeMetadata(track.L.stream().map(Artist::w1).collect(Collectors.joining(", "))) + '"'
+                + " -metadata album=\"" + normalizeMetadata(track.I.getTitle()) + '"'
                 + " -c copy \"" + out + '"';
         var ses = FFmpegKit.execute(cmd);
         if (ses.getReturnCode().isValueCancel()) throw new RuntimeException(ses.getLogsAsString());
     }
 
     private static String normalizeMetadata(String in) {
-        return in.replace('"', '‟');
+        return in.replaceAll("[\\\\/:*?\"<>|]", "");
     }
-
-//    private static void copyAssets()
-//    throws IOException
-//    {
-//        try
-//        {
-//            for (var filename:AndroidUtils.getGlobalContext().getAssets().list("ffmpeg"))
-//                if(filename.endsWith(".so"))
-//                    IOUtils.writeToFile(
-//                        new File(AndroidUtils.getGlobalContext().getFilesDir(),filename),
-//                        IOUtils.readFully(AndroidUtils.getGlobalContext().getAssets().open("ffmpeg"+File.separator+filename)));
-//        }
-//        catch(IOException e)
-//        { throw e; }
-//    }
-//
-//    private static void checkFFMpegLibs()
-//    {
-//        var lib=new File(AndroidUtils.getGlobalContext().getFilesDir(),"libffmpegkit_abidetect.so");
-//        if(!lib.exists())
-//        {
-//            ToastUtils.a(R.string.ffmpegkit_copy);
-//            copyAssets();
-//        }
-//    }
 }