From 593086d3b1dffbd38e443c80825912181904ca1a Mon Sep 17 00:00:00 2001
From: Vologhat <47892605+vologhat@users.noreply.github.com>
Date: Sat, 17 Sep 2022 21:47:52 +0300
Subject: [PATCH] fixed ffmpeg convertation

---
 .../itaysonlab/libvkx/client/LibVKXClient.java            | 8 ++++----
 .../main/java/ru/vtosters/lite/music/M3UDownloader.java   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java b/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java
index 444c9d1a1..37236da9b 100644
--- a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java
+++ b/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java
@@ -82,10 +82,10 @@ public class LibVKXClient {
     }
 
     public static String asId(MusicTrack musicTrack) {
-        String str = musicTrack.e + "_" + musicTrack.d;
-        if (musicTrack.O == null || musicTrack.O.equals("")) {
-            return str;
+        String id = musicTrack.e + "_" + musicTrack.d;
+        if (musicTrack.O != null && !musicTrack.O.equals("")) {
+            id += "_" + musicTrack.O;
         }
-        return str + "_" + musicTrack.O;
+        return id;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java b/app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java
index 997518bcf..0ea58fdf2 100644
--- a/app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java
+++ b/app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java
@@ -60,7 +60,7 @@ public class M3UDownloader implements ITrackDownloader {
         var tsesDir = new File(outDir, String.valueOf(payload.hashCode()));
         tsesDir.mkdirs();
         var resultTs = new File(tsesDir, "result.ts");
-        var fileName = IOUtils.getValidFileName(cache ? LibVKXClient.asId(track) : track.toString() + ".mp3");
+        var fileName = IOUtils.getValidFileName((cache ? LibVKXClient.asId(track) : track.toString()) + ".mp3");
         var resultMp3 = new File(outDir, fileName);
 
         callback.onProgress(5);