diff --git a/.gitignore b/.gitignore index c154b4d..2eb3c2c 100644 --- a/.gitignore +++ b/.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 diff --git a/README.md b/README.md index f48e54d..57b5d81 100644 --- a/README.md +++ b/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) diff --git a/RemoteConf.json b/RemoteConf.json index bfed057..dacd88f 100644 --- a/RemoteConf.json +++ b/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" } \ No newline at end of file diff --git a/build.gradle b/build.gradle index ffa1998..2bcace6 100644 --- a/build.gradle +++ b/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 = [ diff --git a/screenshots/download.png b/screenshots/download.png index 3a8300e..4cb6072 100644 Binary files a/screenshots/download.png and b/screenshots/download.png differ diff --git a/screenshots/main.png b/screenshots/main.png index 9dea31b..ffb737b 100644 Binary files a/screenshots/main.png and b/screenshots/main.png differ diff --git a/screenshots/medias.png b/screenshots/medias.png index 38a6de2..1968c12 100644 Binary files a/screenshots/medias.png and b/screenshots/medias.png differ diff --git a/src/main/deploy/app.properties b/src/main/deploy/app.properties index 7a98cfc..d8e6c5e 100644 --- a/src/main/deploy/app.properties +++ b/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= diff --git a/src/main/deploy/engine/you-get.exe.REMOVED.git-id b/src/main/deploy/engine/you-get.exe.REMOVED.git-id deleted file mode 100644 index e5b28da..0000000 --- a/src/main/deploy/engine/you-get.exe.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -29ec6541f4f140bea844df64d7c5b87a28a66400 \ No newline at end of file diff --git a/src/main/deploy/engine/youtube-dl.exe.REMOVED.git-id b/src/main/deploy/engine/youtube-dl.exe.REMOVED.git-id deleted file mode 100644 index 074d709..0000000 --- a/src/main/deploy/engine/youtube-dl.exe.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -9ae2ad2118e26dd1df2aab680f5ed6b7ebf6c1e7 \ No newline at end of file diff --git a/src/main/kotlin/com/ingbyr/guiyouget/Main.kt b/src/main/kotlin/com/ingbyr/guiyouget/Main.kt index 5ced06e..d8629dd 100644 --- a/src/main/kotlin/com/ingbyr/guiyouget/Main.kt +++ b/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}") } } diff --git a/src/main/kotlin/com/ingbyr/guiyouget/engine/YouGet.kt b/src/main/kotlin/com/ingbyr/guiyouget/engine/YouGet.kt index d52f537..24432a9 100644 --- a/src/main/kotlin/com/ingbyr/guiyouget/engine/YouGet.kt +++ b/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() diff --git a/src/main/kotlin/com/ingbyr/guiyouget/engine/YoutubeDL.kt b/src/main/kotlin/com/ingbyr/guiyouget/engine/YoutubeDL.kt index 9f476fe..67dd26d 100644 --- a/src/main/kotlin/com/ingbyr/guiyouget/engine/YoutubeDL.kt +++ b/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() diff --git a/src/main/kotlin/com/ingbyr/guiyouget/views/ImageView.kt b/src/main/kotlin/com/ingbyr/guiyouget/views/ImageView.kt index 38226b3..0d8cc73 100644 --- a/src/main/kotlin/com/ingbyr/guiyouget/views/ImageView.kt +++ b/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) } diff --git a/src/main/resources/i18n/MainView.properties b/src/main/resources/i18n/MainView.properties index d577c26..c99bcb1 100644 --- a/src/main/resources/i18n/MainView.properties +++ b/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 \ No newline at end of file +label.appInfo=GUI-YouGet diff --git a/src/main/resources/i18n/MainView_en.properties b/src/main/resources/i18n/MainView_en.properties index bc9a13f..6fd06d2 100644 --- a/src/main/resources/i18n/MainView_en.properties +++ b/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 \ No newline at end of file +label.appInfo=GUI-YouGet diff --git a/src/main/resources/i18n/MainView_hu_HU.properties b/src/main/resources/i18n/MainView_hu_HU.properties new file mode 100644 index 0000000..e38575b --- /dev/null +++ b/src/main/resources/i18n/MainView_hu_HU.properties @@ -0,0 +1,22 @@ +tab.generalSettings=ltalnos belltsok +label.storagePath=Clknyvtr +btn.changePath=tvonal mdostsa +btn.download=Letlts +label.URL=URL +label.downloadingCore=Bels programok +label.version=Verzi: +btn.checkUpdates=Frisstsek ellenrzse +label.proxySettings=Proxy belltsok +cb.socks5Proxy=Socks5 Proxy +label.address=Address +label.port=Port +cb.httpProxy=HTTP Proxy +tab.about=Nvjegy +label.about=A GUI-YouGet egy grafikus felhasznli alkalmazs a you-get s a youtube-dl szmra. Ingyen letlthet s hasznlhat. +label.sourceCode=Forrskd: +label.license=Engedly: +label.author=Szerz: +btn.reportBugs=Hibajelents +btn.donate=Adomny +btn.openPath=Knyvtr megnyitsa +label.appInfo=GUI-YouGet \ No newline at end of file diff --git a/src/main/resources/i18n/MainView_zh.properties b/src/main/resources/i18n/MainView_zh.properties new file mode 100644 index 0000000..0a68da7 --- /dev/null +++ b/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 diff --git a/src/main/resources/i18n/MainView_zh_CN.properties b/src/main/resources/i18n/MainView_zh_CN.properties deleted file mode 100644 index 7678350..0000000 --- a/src/main/resources/i18n/MainView_zh_CN.properties +++ /dev/null @@ -1,22 +0,0 @@ -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 diff --git a/src/main/resources/i18n/MediaListView.properties b/src/main/resources/i18n/MediaListView.properties index a5e8403..a52f8d9 100644 --- a/src/main/resources/i18n/MediaListView.properties +++ b/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 \ No newline at end of file +label.mediaList=Media List diff --git a/src/main/resources/i18n/MediaListView_en.properties b/src/main/resources/i18n/MediaListView_en.properties index e09861c..eb23133 100644 --- a/src/main/resources/i18n/MediaListView_en.properties +++ b/src/main/resources/i18n/MediaListView_en.properties @@ -1,3 +1,3 @@ failed=Failed to get media info label.loading=Loading... -label.mediaList Media List \ No newline at end of file +label.mediaList Media List diff --git a/src/main/resources/i18n/MediaListView_hu_HU.properties b/src/main/resources/i18n/MediaListView_hu_HU.properties new file mode 100644 index 0000000..10105fb --- /dev/null +++ b/src/main/resources/i18n/MediaListView_hu_HU.properties @@ -0,0 +1,3 @@ +failed=Nem sikerlt a mdiainformcik lekrse +label.loading=Betlts... +label.mediaList=Mdia lista \ No newline at end of file diff --git a/src/main/resources/i18n/MediaListView_zh_CN.properties b/src/main/resources/i18n/MediaListView_zh.properties similarity index 100% rename from src/main/resources/i18n/MediaListView_zh_CN.properties rename to src/main/resources/i18n/MediaListView_zh.properties diff --git a/src/main/resources/i18n/UpdatesView.properties b/src/main/resources/i18n/UpdatesView.properties index d3c104b..9a50e1b 100644 --- a/src/main/resources/i18n/UpdatesView.properties +++ b/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 \ No newline at end of file +noUpdates=No available updates diff --git a/src/main/resources/i18n/UpdatesView_en.properties b/src/main/resources/i18n/UpdatesView_en.properties index d3c104b..9a50e1b 100644 --- a/src/main/resources/i18n/UpdatesView_en.properties +++ b/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 \ No newline at end of file +noUpdates=No available updates diff --git a/src/main/resources/i18n/UpdatesView_hu_HU.properties b/src/main/resources/i18n/UpdatesView_hu_HU.properties new file mode 100644 index 0000000..6862149 --- /dev/null +++ b/src/main/resources/i18n/UpdatesView_hu_HU.properties @@ -0,0 +1,6 @@ +checkForUpdates=Frisstsek ellenrzse... +compeleted=Frissts befejezve +downloading=letlts... +failToUpdate=Nem sikerlt frissteni +newVersionIs=Az j verzi: +noUpdates=Nincsenek elrhet frisstsek \ No newline at end of file diff --git a/src/main/resources/i18n/UpdatesView_zh_CN.properties b/src/main/resources/i18n/UpdatesView_zh.properties similarity index 100% rename from src/main/resources/i18n/UpdatesView_zh_CN.properties rename to src/main/resources/i18n/UpdatesView_zh.properties diff --git a/src/main/resources/i18n/engine.properties b/src/main/resources/i18n/engine.properties index bfb07f0..2dedfb3 100644 --- a/src/main/resources/i18n/engine.properties +++ b/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... \ No newline at end of file +resume=Resume downloading... diff --git a/src/main/resources/i18n/engine_en.properties b/src/main/resources/i18n/engine_en.properties index bfb07f0..2dedfb3 100644 --- a/src/main/resources/i18n/engine_en.properties +++ b/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... \ No newline at end of file +resume=Resume downloading... diff --git a/src/main/resources/i18n/engine_hu_HU.properties b/src/main/resources/i18n/engine_hu_HU.properties new file mode 100644 index 0000000..4231b59 --- /dev/null +++ b/src/main/resources/i18n/engine_hu_HU.properties @@ -0,0 +1,6 @@ +analyzing=Elemzs... +completed=Letlts befejezve +downloading=Letlts... +failed=Nem sikerlt letlteni +pause=Letlts meglltva +resume=Letlts folytatsa... \ No newline at end of file diff --git a/src/main/resources/i18n/engine_zh_CN.properties b/src/main/resources/i18n/engine_zh.properties similarity index 100% rename from src/main/resources/i18n/engine_zh_CN.properties rename to src/main/resources/i18n/engine_zh.properties diff --git a/translate.sh b/translate.sh new file mode 100644 index 0000000..443935e --- /dev/null +++ b/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 \ No newline at end of file