Merge branch 'dev'

Former-commit-id: 0774c5bb78b848a8a3a52eabfb9c86f6e8e8378c [formerly cbab4ca]
Former-commit-id: 745a3b0d7f95684a724e267ddf366f6986a21dad

.github/ISSUE_TEMPLATE.md

@@ -3,7 +3,7 @@ Please make sure these boxes are checked before submitting your issue – thank
 - [ ] You can actually watch the video in your browser, but not download them with `GUI-YouGet`.
 - [ ] Your `GUI-YouGet` is up-to-date.
 - [ ] Your downloading core is up-to-date.
-Please paste the full `log/debug.log` inside the fences:
+Please paste the full `app/log/debug.log` inside the fences:
 
 ```
 [PASTE IN ME]
@@ -18,7 +18,7 @@ If there's anything else you would like to say(e.g some new features) fill in th
 - [ ] 您的`GUI-YouGet`为最新版。
 - [ ] 您的下载引擎为最新版。
 
-请将`log/debug.log`文件内容粘贴在下面：
+请将`app/log/debug.log`文件内容粘贴在下面：
 
 ```
 [在这里粘贴完整日志]

.gitignore

@@ -2,9 +2,11 @@
 .idea/
 build/
 out/
-app.properties
+/app.properties
 conf/
 gradle/
 gradlew
 gradlew.bat
 log/
+/engine/
+GUI-YouGet.iml

README.md

@@ -1,5 +1,5 @@
 # GUI-YouGet
-![](https://img.shields.io/badge/v0.2.1-pass-green.svg)
+![](https://img.shields.io/badge/v0.2.2-pass-green.svg)
 ![](https://img.shields.io/github/forks/ingbyr/GUI-YouGet.svg)
 ![](https://img.shields.io/github/stars/ingbyr/GUI-YouGet.svg)
 ![](https://img.shields.io/badge/license-MIT-blue.svg)
@@ -8,18 +8,16 @@
 > [中文说明](http://www.ingbyr.com/2016/06/18/youget-zh/)
 
 # Download
-> **NOTICE:** Before you run the GUI-YouGet, you need to install [jre8 ](http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html)(recommended) or [jdk8](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) first.
+[Download Page](https://github.com/ingbyr/GUI-YouGet/releases)
 
-[GUI-YouGet Download Page](https://github.com/ingbyr/GUI-YouGet/releases)
-
-# Screenshot
-![](screenshot/main.png)
-![](screenshot/medias.png)
-![](screenshot/download.png)
+# Screenshots
+![](screenshots/main.png)
+![](screenshots/medias.png)
+![](screenshots/download.png)
 
 # Feedback bugs
 If something is broken and `GUI-YouGet` can't get you things you want, don't panic. (Yes, this happens all the time!)
-Open a new issue on [GitHub](https://github.com/ingbyr/GUI-YouGet/issues), with detailed `/log/debug.log` output attached.
+Open a new issue on [GitHub](https://github.com/ingbyr/GUI-YouGet/issues), with detailed `app/log/debug.log` output attached.
 
 # Legal Issues
 

build.gradle

@@ -1,47 +1,58 @@
-group 'com.ingbyr.guiyouget'
-version '0.2.1'
+group "com.ingbyr.guiyouget"
+version "0.2.2"
 
 buildscript {
-    ext.kotlin_version = '1.1.60'
+    ext.kotlin_version = "1.2.20"
 
     repositories {
         mavenCentral()
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath group: "de.dynamicfiles.projects.gradle.plugins", name: "javafx-gradle-plugin", version: "8.8.2"
     }
 }
 
-apply plugin: 'kotlin'
-
-jar {
-    manifest {
-        attributes('Main-Class': 'com.ingbyr.guiyouget.MainKt')
-    }
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-}
-
+apply plugin: "kotlin"
+apply plugin: "javafx-gradle-plugin"
 
 sourceCompatibility = 1.8
 
-
 repositories {
-    mavenCentral()
     jcenter()
+    mavenCentral()
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
-    compile 'no.tornado:tornadofx:1.7.10'
-    compile 'com.jfoenix:jfoenix:1.4.0'
-    compile 'com.beust:klaxon:0.30'
-    compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
-    compile 'com.squareup.okhttp3:okhttp:3.9.0'
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    compile "no.tornado:tornadofx:1.7.14"
+    compile "com.jfoenix:jfoenix:1.11.1"
+    compile "com.beust:klaxon:0.30"
+    compile group: "ch.qos.logback", name: "logback-classic", version: "1.2.3"
+    compile "com.github.kittinunf.fuel:fuel:1.12.0"
 }
 
 compileKotlin {
     kotlinOptions.jvmTarget = "1.8"
 }
+
 compileTestKotlin {
     kotlinOptions.jvmTarget = "1.8"
+}
+
+jfx {
+    verbose = false
+    mainClass = "com.ingbyr.guiyouget.MainKt"
+    jfxMainAppJarName="GUI-YouGet.jar"
+    vendor = "ingbyr"
+    appName = "GUI-YouGet"
+    additionalAppResources = "src/main/deploy"
+    skipMainClassScanning = true
+    jvmProperties = ["-Dfile.encoding": "UTF-8"]
+    nativeReleaseVersion = "0.2.2"
+    bundler = 'exe'
+    needShortcut = true
+    bundleArguments = [
+            installdirChooser: 'true'
+    ]
 }

src/main/deploy/app.properties

@@ -0,0 +1,8 @@
+version=0.2.2
+you-get-version=0.4.985
+youtube-dl-version=2018.01.18
+proxy-port=
+proxy-type=
+proxy-address=
+storage-path=
+download-core=youtube-dl

src/main/deploy/engine/you-get.exe.REMOVED.git-id

@@ -0,0 +1 @@
+29ec6541f4f140bea844df64d7c5b87a28a66400

src/main/deploy/engine/youtube-dl.exe.REMOVED.git-id

@@ -0,0 +1 @@
+9ae2ad2118e26dd1df2aab680f5ed6b7ebf6c1e7

src/main/kotlin/com/ingbyr/guiyouget/controllers/MainController.kt

@@ -1,10 +1,10 @@
 package com.ingbyr.guiyouget.controllers
 
-import com.ingbyr.guiyouget.core.YouGet
-import com.ingbyr.guiyouget.core.YoutubeDL
+import com.ingbyr.guiyouget.engine.YouGet
+import com.ingbyr.guiyouget.engine.YoutubeDL
 import com.ingbyr.guiyouget.events.RequestMediasWithYouGet
 import com.ingbyr.guiyouget.events.RequestMediasWithYoutubeDL
-import com.ingbyr.guiyouget.utils.CoreUtils
+import com.ingbyr.guiyouget.utils.ContentsUtil
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import tornadofx.*
@@ -14,28 +14,28 @@ class MainController : Controller() {
     private val logger: Logger = LoggerFactory.getLogger(MainController::class.java)
 
     fun requestMediaInfo(url: String) {
-        val core = app.config[CoreUtils.DOWNLOAD_CORE]
-        logger.debug("download core is $core")
+        val core = app.config[ContentsUtil.DOWNLOAD_CORE]
+        logger.debug("download engine is $core")
 
         // Init the request args
         when (core) {
-            CoreUtils.YOUTUBE_DL -> {
+            ContentsUtil.YOUTUBE_DL -> {
                 fire(RequestMediasWithYoutubeDL(YoutubeDL(url)))
             }
 
-            CoreUtils.YOU_GET -> {
+            ContentsUtil.YOU_GET -> {
                 fire(RequestMediasWithYouGet(YouGet(url)))
             }
 
             else -> {
-                logger.error("bad downloading core $core")
+                logger.error("bad downloading engine $core")
             }
         }
 
     }
 
 
     fun updateGUI() {
-        hostServices.showDocument(CoreUtils.APP_UPDATE_URL)
+        hostServices.showDocument(ContentsUtil.APP_UPDATE_URL)
     }
 }

src/main/kotlin/com/ingbyr/guiyouget/controllers/MediaListController.kt

@@ -31,8 +31,7 @@ class MediaListController : Controller() {
             } catch (e: Exception) {
                 logger.error(e.toString())
                 fire(DisplayMediasWithYoutubeDL(JsonObject(mapOf(
-                        "title" to messages["getInfoFailed"],
-                        "description" to messages["getInfoFailedDes"]))))
+                        "title" to messages["failed"]))))
             }
         }
 
@@ -42,7 +41,7 @@ class MediaListController : Controller() {
                 fire(DisplayMediasWithYouGet(json))
             } catch (e: Exception) {
                 logger.error(e.toString())
-                fire(DisplayMediasWithYouGet(JsonObject(mapOf("title" to messages["getInfoFailed"]))))
+                fire(DisplayMediasWithYouGet(JsonObject(mapOf("title" to messages["failed"]))))
             }
         }
     }

src/main/kotlin/com/ingbyr/guiyouget/controllers/ProgressController.kt

@@ -1,7 +1,7 @@
 package com.ingbyr.guiyouget.controllers
 
-import com.ingbyr.guiyouget.core.YouGet
-import com.ingbyr.guiyouget.core.YoutubeDL
+import com.ingbyr.guiyouget.engine.YouGet
+import com.ingbyr.guiyouget.engine.YoutubeDL
 import com.ingbyr.guiyouget.events.DownloadingRequestWithYouGet
 import com.ingbyr.guiyouget.events.DownloadingRequestWithYoutubeDL
 import com.ingbyr.guiyouget.events.ResumeDownloading