Merge branch 'dev'

Former-commit-id: 3a45658de7d5670af96bceec1fbd8f1232a25273 [formerly 823e64b]
Former-commit-id: abfdf1f56d4cdc241aa9cb9217236330ea60687a

.gitignore

@@ -9,4 +9,6 @@ gradlew
 gradlew.bat
 log/
 /engine/
+/src/main/deploy/engine/you-get.exe
+/src/main/deploy/engine/youtube-dl.exe
 GUI-YouGet.iml

README.md

@@ -1,5 +1,5 @@
 # GUI-YouGet
-![](https://img.shields.io/badge/v0.2.2-pass-green.svg)
+![](https://img.shields.io/badge/v0.2.3-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,23 +8,24 @@
 > [中文说明](http://www.ingbyr.com/post/youget-zh/)
 
 # Download
+[Download Page](https://github.com/ingbyr/GUI-YouGet/releases)
+
+- You can install GUI-YouGet by downloading GUI-YouGet.exe directly
+- If you know how to run the jar file,  just download the `GUI-YouGet-NEEDJRE.zip`(Requires the [JRE8 ](http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html)or [JDK8](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html))
 
-| Github | Tencent Mirror |
-| :---- | :----------- |
-| [All](https://github.com/ingbyr/GUI-YouGet/releases) | [GUI-YouGet.exe](https://share.weiyun.com/7580673363d31a07d5cbf24f0f7c741d) |
-| | [GUI-YouGet-NEEDJRE-0.2.2.zip](https://share.weiyun.com/d8a03914225c913ad49ebbe05a85814b)
 
 # 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 `app/log/debug.log` output attached.
 
-# Legal Issues
 
+# Legal Issues
 This software is distributed under the [MIT license](https://raw.githubusercontent.com/ingbyr/GUI-YouGet/master/LICENSE.txt).
 In particular, please be aware that
 > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
@@ -35,6 +36,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-# Authors
 
+# Contributors
+Gojko: Hungarian language support
+
+
+# Authors
 Made by [@ingbyr](http://www.ingbyr.com)

RemoteConf.json

@@ -1,5 +1,5 @@
 {
   "youget": "https://raw.githubusercontent.com/soimort/you-get/develop/src/you_get/version.py",
   "youtubedl": "https://raw.githubusercontent.com/rg3/youtube-dl/master/youtube_dl/version.py",
-  "appversion": "0.2.2"
+  "appversion": "0.2.3"
 } 

build.gradle

@@ -1,8 +1,8 @@
 group "com.ingbyr.guiyouget"
-version "0.2.2"
+version "0.2.3"
 
 buildscript {
-    ext.kotlin_version = "1.2.20"
+    ext.kotlin_version = "1.2.21"
 
     repositories {
         mavenCentral()
@@ -25,8 +25,8 @@ repositories {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    compile "no.tornado:tornadofx:1.7.14"
-    compile "com.jfoenix:jfoenix:1.11.1"
+    compile "no.tornado:tornadofx:1.7.15"
+    compile "com.jfoenix:jfoenix:8.0.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"
@@ -49,7 +49,7 @@ jfx {
     additionalAppResources = "src/main/deploy"
     skipMainClassScanning = true
     jvmProperties = ["-Dfile.encoding": "UTF-8"]
-    nativeReleaseVersion = "0.2.2"
+    nativeReleaseVersion = "0.2.3"
     bundler = 'exe'
     needShortcut = true
     bundleArguments = [

src/main/deploy/app.properties

@@ -1,6 +1,6 @@
-version=0.2.2
+version=0.2.3
 you-get-version=0.4.985
-youtube-dl-version=2018.01.18
+youtube-dl-version=2018.02.26
 proxy-port=
 proxy-type=
 proxy-address=

src/main/kotlin/com/ingbyr/guiyouget/Main.kt

@@ -6,16 +6,25 @@ import org.slf4j.LoggerFactory
 import tornadofx.*
 import java.nio.file.Path
 import java.nio.file.Paths
+import java.util.*
 
 class Main : App(MainView::class) {
     private val logger = LoggerFactory.getLogger(Main::class.java)
     override val configBasePath: Path = Paths.get(System.getProperty("user.dir"))
+    private val availableLanguages = listOf("zh", "en", "hu")
 
     init {
+//        todo comment this
+//        Locale.setDefault(Locale("test", "test"))
+        val language = Locale.getDefault().language
+        if (language !in availableLanguages) {
+            Locale.setDefault(Locale("en", "US"))
+        }
+
         val prop = System.getProperties()
         logger.debug("OS: ${prop["os.name"]?.toString()} Arch: ${prop["os.arch"]?.toString()} Version: ${prop["os.version"]?.toString()}")
         logger.debug("JAVA: ${prop["java.version"]?.toString()} Vender: ${prop["java.vendor"]?.toString()}")
-        logger.debug("Default locale: ${FX.locale}")
+        logger.debug("Default Locale: ${FX.locale} Current Locale:${Locale.getDefault().language}_${Locale.getDefault().country}")
     }
 }
 

src/main/kotlin/com/ingbyr/guiyouget/engine/YouGet.kt

@@ -42,7 +42,8 @@ class YouGet(val url: String) : DownloadEngineController() {
                         "${app.config[ContentsUtil.PROXY_ADDRESS]}:${app.config[ContentsUtil.PROXY_PORT]}")
             }
         }
-        engine.add("url", url)
+        engine.add("url", "\"$url\"")
+
         return engine
     }
 
@@ -69,7 +70,7 @@ class YouGet(val url: String) : DownloadEngineController() {
         }
         engine.add("foramtID", "--itag=$formatID")
         engine.add("-o", app.config[ContentsUtil.STORAGE_PATH] as String)
-        engine.add("url", url)
+        engine.add("url", "\"$url\"")
         val builder = ProcessBuilder(engine.build())
         builder.redirectErrorStream(true)
         val p = builder.start()

src/main/kotlin/com/ingbyr/guiyouget/engine/YoutubeDL.kt

@@ -45,7 +45,7 @@ class YoutubeDL(private val url: String) : DownloadEngineController() {
                         "${app.config[ContentsUtil.PROXY_ADDRESS]}:${app.config[ContentsUtil.PROXY_PORT]}")
             }
         }
-        engine.add("url", url)
+        engine.add("url", "\"$url\"")
         return engine
     }
 
@@ -73,7 +73,7 @@ class YoutubeDL(private val url: String) : DownloadEngineController() {
         }
         engine.add("-f", formatID)
         engine.add("-o", Paths.get(app.config[ContentsUtil.STORAGE_PATH] as String, outputTemplate).toString())
-        engine.add("url", url)
+        engine.add("url", "\"$url\"")
         val builder = ProcessBuilder(engine.build())
         builder.redirectErrorStream(true)
         val p = builder.start()

src/main/kotlin/com/ingbyr/guiyouget/views/ImageView.kt

@@ -2,7 +2,7 @@ package com.ingbyr.guiyouget.views
 
 import tornadofx.*
 
-class ImageView : View("捐赠") {
+class ImageView : View() {
     override val root = vbox  {
         imageview("/img/zhifubao_compress.jpg", lazyload = false)
     }

src/main/resources/i18n/MainView.properties

@@ -1,4 +1,4 @@
-label.storagePath= Storage Path
+label.storagePath= Storage Path
 btn.changePath=Change Path
 btn.download=Download
 label.URL=URL
@@ -19,4 +19,4 @@ label.author=Author:
 btn.reportBugs=Report BUG
 btn.donate=Donate
 btn.openPath=Open Directory
-label.appInfo=GUI-YouGet
+label.appInfo=GUI-YouGet

src/main/resources/i18n/MainView_en.properties

@@ -19,4 +19,4 @@ label.author=Author:
 btn.reportBugs=Report BUG
 btn.donate=Donate
 btn.openPath=Open Directory
-label.appInfo=GUI-YouGet
+label.appInfo=GUI-YouGet

src/main/resources/i18n/MainView_hu_HU.properties

@@ -0,0 +1,22 @@
+tab.generalSettings=Általános beállítások
+label.storagePath=Célkönyvtár
+btn.changePath=Útvonal módosítása
+btn.download=Letöltés
+label.URL=URL
+label.downloadingCore=Belsõ programok
+label.version=Verzió:
+btn.checkUpdates=Frissítések ellenõrzése
+label.proxySettings=Proxy beállítások
+cb.socks5Proxy=Socks5 Proxy
+label.address=Address
+label.port=Port
+cb.httpProxy=HTTP Proxy
+tab.about=Névjegy
+label.about=A GUI-YouGet egy grafikus felhasználói alkalmazás a you-get és a youtube-dl számára. Ingyen letölthetõ és használható. 
+label.sourceCode=Forráskód:
+label.license=Engedély:
+label.author=Szerzõ:
+btn.reportBugs=Hibajelentés
+btn.donate=Adomány
+btn.openPath=Könyvtár megnyitása
+label.appInfo=GUI-YouGet

src/main/resources/i18n/MainView_zh.properties

@@ -0,0 +1,22 @@
+label.storagePath=\u5B58\u50A8\u8DEF\u5F84
+btn.changePath=\u66F4\u6539\u76EE\u5F55
+btn.download=\u4E0B\u8F7D
+label.URL=\u7F51\u5740
+label.downloadingCore=\u4E0B\u8F7D\u5F15\u64CE
+label.version=\u7248\u672C\uFF1A
+btn.checkUpdates=\u68C0\u67E5\u66F4\u65B0
+label.proxySettings=\u4EE3\u7406\u8BBE\u7F6E
+cb.socks5Proxy=Socks5\u4EE3\u7406
+label.address=\u5730\u5740
+label.port=\u7AEF\u53E3
+cb.httpProxy=HTTP\u4EE3\u7406
+tab.about=\u5173\u4E8E
+label.about=GUI-YouGet\u662F\u9002\u914D\u4E86you-get\u548Cyoutube-dl\u4E0B\u8F7D\u5F15\u64CE\u7684\u4E00\u6B3EGUI\u5E94\u7528\uFF0C\u4F60\u53EF\u4EE5\u514D\u8D39\u4E0B\u8F7D\u5E76\u4F7F\u7528\u5B83
+label.sourceCode=\u6E90\u4EE3\u7801\uFF1A
+label.license=\u5F00\u6E90\u534F\u8BAE\uFF1A
+label.author=\u5F00\u53D1\u8005\uFF1A
+btn.reportBugs=\u63D0\u4EA4 BUG
+btn.donate=\u6350\u8D60
+btn.openPath=\u6253\u5F00\u76EE\u5F55
+label.appInfo=GUI-YouGet
+tab.generalSettings=\u901A\u7528\u8BBE\u7F6E

src/main/resources/i18n/MediaListView.properties

@@ -1,3 +1,3 @@
-failed=Failed to get media info
+failed=Failed to get media info
 label.loading=Loading...
-label.mediaList=Media List
+label.mediaList=Media List

src/main/resources/i18n/MediaListView_en.properties

@@ -1,3 +1,3 @@
 failed=Failed to get media info
 label.loading=Loading...
-label.mediaList Media List
+label.mediaList Media List

src/main/resources/i18n/MediaListView_hu_HU.properties

@@ -0,0 +1,3 @@
+failed=Nem sikerült a médiainformációk lekérése
+label.loading=Betöltés...
+label.mediaList=Média lista

src/main/resources/i18n/UpdatesView.properties

@@ -1,6 +1,6 @@
-checkForUpdates=Check for updates...
+checkForUpdates=Check for updates...
 compeleted=Update completed
 downloading=downloading...
-failToUpdate=Fail to update
+failToUpdate=Update failed
 newVersionIs=New version is
-noUpdates=No available updates
+noUpdates=No available updates

src/main/resources/i18n/UpdatesView_en.properties

@@ -1,6 +1,6 @@
-checkForUpdates=Check for updates...
+checkForUpdates=Check for updates...
 compeleted=Update completed
 downloading=downloading...
-failToUpdate=Fail to update
+failToUpdate=Update failed
 newVersionIs=New version is
-noUpdates=No available updates
+noUpdates=No available updates

src/main/resources/i18n/UpdatesView_hu_HU.properties

@@ -0,0 +1,6 @@
+checkForUpdates=Frissítések ellenőrzése...
+compeleted=Frissítés befejezve
+downloading=letöltés...
+failToUpdate=Nem sikerült frissíteni
+newVersionIs=Az új verzió: 
+noUpdates=Nincsenek elérhető frissítések

src/main/resources/i18n/engine.properties

@@ -1,6 +1,6 @@
-analyzing=Analyzing...
+analyzing=Analyzing...
 completed=Completed
 downloading=Downloading...
 failed=Failed to download
 pause=Pause downloading
-resume=Resume downloading...
+resume=Resume downloading...

src/main/resources/i18n/engine_en.properties

@@ -1,6 +1,6 @@
-analyzing=Analyzing...
+analyzing=Analyzing...
 completed=Completed
 downloading=Downloading...
 failed=Failed to download
 pause=Pause downloading
-resume=Resume downloading...
+resume=Resume downloading...

src/main/resources/i18n/engine_hu_HU.properties

@@ -0,0 +1,6 @@
+analyzing=Elemzés...
+completed=Letöltés befejezve
+downloading=Letöltés...
+failed=Nem sikerült letölteni
+pause=Letöltés megállítva
+resume=Letöltés folytatása...

translate.sh

@@ -0,0 +1,5 @@
+for file in ./src/main/resources/i18n*.properties
+do
+  echo translating $file ...
+  native2ascii -encoding UTF-8 $file $file
+done