CHANGELOG.md

@@ -5,6 +5,16 @@
 и [Семантическом версионировании](http://semver.org/lang/ru/spec/v2.0.0.html).
 
 ## [Новое]
+
+## [2.1.2] - 2017-12-08
+### Исправлено
+- Обновлен алгоритм дешифрации адресов mp3 файлов (#20).
+- Упрощен (обновлен) Gradle скрипт сборки проекта.
+
+### Изменено
+- Gradle обновлен до 4.4.
+
+## [2.1.1] - 2017-10-29
 ### Добавлено
 - Установочные пакеты приложения для Windows, Unix, MacOS со встроенной JRE.
 - Установлена иконка (#14). 
@@ -64,5 +74,7 @@
 
 
 [Новое]: https://github.com/ruslanys/vkmusic/compare/HEAD...2.x.x.SWING
+[2.1.2]: https://github.com/ruslanys/vkmusic/compare/v2.1.1...v2.1.2
+[2.1.1]: https://github.com/ruslanys/vkmusic/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/ruslanys/vkmusic/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/ruslanys/vkmusic/compare/e04e606...v2.0.0

README.md

@@ -35,4 +35,4 @@ VKMusic написан на Java 8 с применением нижеследу
 * JPA/Hibernate
 * SQLite
 * Swing
-* Java FX
+* JavaFX

build.gradle

@@ -1,47 +1,46 @@
-buildscript {
-    ext {
-        springBootVersion = '1.5.8.RELEASE'
-        jacksonVersion = '2.9.2'
-    }
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-    }
+plugins {
+    id 'java'
+    id 'org.springframework.boot' version '1.5.9.RELEASE'
 }
 
-apply plugin: 'java'
-apply plugin: 'org.springframework.boot'
-
 group = 'me.ruslanys'
-version = '2.1.1'
+version = '2.1.2'
 sourceCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
     mavenCentral()
 }
 
 
+ext.jacksonVersion = '2.9.2'
+
 dependencies {
+    // Spring
     compile('org.springframework.boot:spring-boot-starter')
     compile('org.springframework.boot:spring-boot-starter-cache')
     compile('org.springframework.boot:spring-boot-starter-data-jpa')
 
+    // DB
     compile('com.enigmabridge:hibernate4-sqlite-dialect:0.1.2')
     compile('org.xerial:sqlite-jdbc:3.20.0')
-    compile('com.fasterxml.jackson.core:jackson-databind:' + jacksonVersion)
-    compile('com.fasterxml.jackson.core:jackson-annotations:' + jacksonVersion)
-    compile('com.fasterxml.jackson.core:jackson-core:' + jacksonVersion)
-    compile('commons-cli:commons-cli:1.3.1')
+
+    // Jackson
+    compile("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
+    compile("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
+    compile("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
+
+    // Utils
     compile('commons-codec:commons-codec:1.10')
+    compile('org.apache.commons:commons-text:1.1')
     compile('org.apache.commons:commons-lang3:3.6')
-    compile('com.mpatric:mp3agic:0.9.0')
     compile('com.google.guava:guava:23.0')
     compile('org.jsoup:jsoup:1.10.3')
+    compile('com.mpatric:mp3agic:0.9.0')
 
+    // DevTools
     compileOnly('org.projectlombok:lombok')
 
+    // Tests
     testCompile('org.springframework.boot:spring-boot-starter-test')
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Oct 27 16:56:23 MSK 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

gradlew.bat

@@ -1,84 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

src/main/java/me/ruslanys/vkmusic/component/impl/ScraperVkClient.java

@@ -7,8 +7,8 @@
 import me.ruslanys.vkmusic.entity.Audio;
 import me.ruslanys.vkmusic.exception.VkException;
 import me.ruslanys.vkmusic.util.JsonUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.jsoup.Connection;
 import org.jsoup.Jsoup;
 import org.springframework.stereotype.Component;
@@ -17,6 +17,7 @@
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -42,8 +43,22 @@ public class ScraperVkClient implements VkClient {
     private static final int SLEEP_INTERVAL = 5_000;
 
     private final ScriptEngine scriptEngine = new ScriptEngineManager().getEngineByName("JavaScript");
+    private final String script;
+
     private final Map<String, String> cookies = new HashMap<>();
 
+
+    public ScraperVkClient() throws IOException {
+        StringBuilder sb = new StringBuilder();
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(getClass().getClassLoader().getResourceAsStream("decrypt.js")))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                sb.append(line).append(System.lineSeparator());
+            }
+        }
+        script = sb.toString();
+    }
+
     @Override
     public void addCookies(Map<String, String> cookies) {
         this.cookies.putAll(cookies);
@@ -121,12 +136,13 @@ public List<Audio> getAudio(Long ownerId) {
 
     @SneakyThrows
     @Override
-    public void fetchUrls(List<Audio> audioList) {
+    public void fetchUrls(List<Audio> audioList) { // TODO: refactor
         Map<Long, Audio> audioMap = new HashMap<>(audioList.size());
         for (Audio audio : audioList) {
             audioMap.put(audio.getId(), audio);
         }
 
+        Long userId = fetchUserId();
         int sleepInterval = SLEEP_INTERVAL;
         int fromIndex = 0;
         int toIndex = Math.min(fromIndex + 10, audioList.size());
@@ -167,7 +183,7 @@ public void fetchUrls(List<Audio> audioList) {
             for (List object : lists) {
                 Audio audio = audioMap.get(((Number) object.get(0)).longValue());
                 String url = (String) object.get(2);
-                url = decrypt(url);
+                url = decrypt(userId, url);
 
                 audio.setUrl(url);
             }
@@ -180,13 +196,12 @@ public void fetchUrls(List<Audio> audioList) {
     }
 
     @SneakyThrows
-    private String decrypt(String url) {
-        try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(getClass().getClassLoader().getResourceAsStream("decrypt.js")))) {
-            scriptEngine.eval(bufferedReader);
+    private String decrypt(Long vkId, String url) {
+        String script = this.script.replace("${vkId}", vkId.toString()); // TODO: replace with bindings
+        scriptEngine.eval(script);
 
-            Invocable inv = (Invocable) scriptEngine;
-            return (String) inv.invokeFunction("decode", url);
-        }
+        Invocable inv = (Invocable) scriptEngine;
+        return (String) inv.invokeFunction("decode", url);
     }
 
     @Data