From 524df694508c1638914fc46d228b2ee8aa681624 Mon Sep 17 00:00:00 2001
From: Ruslan Molchanov <ruslanys@gmail.com>
Date: Fri, 19 Oct 2018 19:35:36 +0300
Subject: [PATCH] Fix MP3 grabbing algorithm

---
 CHANGELOG.md                                     |  7 +++++++
 .../vkmusic/component/ScraperVkClient.kt         | 16 +++++++++++++---
 .../kotlin/me/ruslanys/vkmusic/domain/Audio.kt   |  1 +
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2795af..667a1f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@
 и [Семантическом версионировании](http://semver.org/lang/ru/spec/v2.0.0.html).
 
 ## [Новое]
+### Исправлено
+- Обновлен алгоритм выгрузки адресов MP3 файлов,
+в соответствии с правками, внесенными на стороне VK.
+
+### Изменено
+- Spring Boot обновлен до версии 2.0.6.
+- Gradle обновлен до 4.10.2
 
 ## [3.1.2] - 2018-09-14
 ### Исправлено
diff --git a/src/main/kotlin/me/ruslanys/vkmusic/component/ScraperVkClient.kt b/src/main/kotlin/me/ruslanys/vkmusic/component/ScraperVkClient.kt
index 5127e4d..5b7bf4d 100644
--- a/src/main/kotlin/me/ruslanys/vkmusic/component/ScraperVkClient.kt
+++ b/src/main/kotlin/me/ruslanys/vkmusic/component/ScraperVkClient.kt
@@ -29,6 +29,7 @@ class ScraperVkClient : VkClient {
         private const val JSON_DELIMITER = "<!json>"
         private const val BLOCK_DELIMITER = "<!>"
         private const val SLEEP_INTERVAL = 5000L
+        private const val CHUNK_SIZE = 5
 
         private val SCRIPT_ENGINE = ScriptEngineManager().getEngineByName("JavaScript")
         private val log = LoggerFactory.getLogger(ScraperVkClient::class.java)
@@ -115,7 +116,7 @@ class ScraperVkClient : VkClient {
         val userId = fetchUserId()
         var sleepInterval = SLEEP_INTERVAL
 
-        val chunks = audioList.chunked(10)
+        val chunks = audioList.chunked(CHUNK_SIZE)
         var chunkNumber = 0
         while (chunkNumber < chunks.size) {
             val chunkContent = chunks[chunkNumber]
@@ -139,7 +140,8 @@ class ScraperVkClient : VkClient {
 
     private fun fetchUrlsChunk(userId: Long, audioList: List<Audio>) {
         val audioMap = audioList.associateBy { it.id }.toSortedMap()
-        val ids = audioList.joinToString(",") { "${it.ownerId}_${it.id}" }
+        val ids = audioList.joinToString(",") { "${it.ownerId}_${it.id}_${it.hash}" }
+                .plus(",${audioList.first().ownerId}_${audioList.first().id}")
 
         val response = Jsoup.connect("$PATH_BASE/al_audio.php")
                 .userAgent(USER_AGENT).cookies(cookies).method(Connection.Method.POST)
@@ -188,7 +190,15 @@ class ScraperVkClient : VkClient {
                         (it[1] as Number).toLong(),
                         StringEscapeUtils.unescapeHtml4(it[4] as String),
                         StringEscapeUtils.unescapeHtml4(it[3] as String),
-                        it[5] as Int
+                        it[5] as Int,
+                        (it[13] as String).split("/") // hash
+                                .reduceIndexed { index, acc, s ->
+                                    when (index) {
+                                        2 -> s
+                                        5 -> acc + "_" + s
+                                        else -> acc
+                                    }
+                                }
                 )
             }.toList()
     ) {
diff --git a/src/main/kotlin/me/ruslanys/vkmusic/domain/Audio.kt b/src/main/kotlin/me/ruslanys/vkmusic/domain/Audio.kt
index b9fd0c0..6779ff4 100644
--- a/src/main/kotlin/me/ruslanys/vkmusic/domain/Audio.kt
+++ b/src/main/kotlin/me/ruslanys/vkmusic/domain/Audio.kt
@@ -10,6 +10,7 @@ data class Audio(
         val artist: String,
         val title: String,
         val durationInSec: Int,
+        val hash: String,
 
         var status: DownloadStatus = DownloadStatus.NEW,
         var url: String? = null,