.eslintrc

@@ -8,9 +8,6 @@
     "node": true,
     "es6": true
   },
-  "ecmaFeatures": {
-    "jsx": true
-  },
   globals: {
     "WIN_BUILD": false,
     "WYBM_VERSION": false
@@ -22,7 +19,6 @@
     "no-array-constructor": 2,
     "no-caller": 2,
     "no-catch-shadow": 2,
-    "no-empty-label": 2,
     "no-eval": 2,
     "no-extend-native": 2,
     "no-extra-bind": 2,
@@ -50,28 +46,28 @@
     "no-spaced-func": 2,
     "no-trailing-spaces": 2,
     "no-undef-init": 2,
-    "no-underscore-dangle": 2,
+    //"no-underscore-dangle": 2,
     "no-unused-expressions": 2,
     "no-use-before-define": 2,
     "no-with": 2,
-    "camelcase": 2,
+    //"camelcase": 2,
     "comma-spacing": 2,
-    "consistent-return": 2,
-    "curly": [2, "all"],
+    //"consistent-return": 2,
+    //"curly": [2, "all"],
     "dot-notation": [2, { "allowKeywords": true }],
     "eol-last": 2,
     "no-extra-parens": [2, "functions"],
-    "eqeqeq": 2,
+    //"eqeqeq": 2,
     "key-spacing": [2, { "beforeColon": false, "afterColon": true }],
     "new-cap": 2,
     "new-parens": 2,
     "quotes": [2, "double"],
     "semi": 2,
     "semi-spacing": [2, {"before": false, "after": true}],
     "space-infix-ops": 2,
-    "space-return-throw-case": 2,
+    //"keyword-spacing": 2,
     "space-unary-ops": [2, { "words": true, "nonwords": false }],
-    "strict": [2, "function"],
+    //"strict": [2, "function"],
     "yoda": [2, "never"],
 
     // Code style.
@@ -84,6 +80,7 @@
     "eqeqeq": [2, "allow-null"],
     "no-underscore-dangle": 0,
     "consistent-return": 0,
+    "keyword-spacing": [2, {"overrides": {"catch": {"after": false}}}],
 
     // React.
     "jsx-quotes": 2,

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://www.blockchain.com/btc/payment_request?address=3LKKbbi34MHYRQSLV3ZiDGoKgUmCjhTumT&message=Kagami+open+source+projects+support

Makefile

@@ -4,19 +4,19 @@ ZIP_OPTS = -tzip -mx=9
 7Z_OPTS = -t7z -m0=lzma2 -mx=9
 DIST_DIR = dist
 APP = package.nw
-WIN32_NW_DIR = bin/nwjs-v0.18.3-win-ia32
+WIN32_NW_DIR = bin/nwjs-v0.38.1-win-ia32
 WIN32_RELEASE = $(NAME)-v$(VERSION)-win-x86
 WIN32_RELEASE_DIR = $(DIST_DIR)/$(WIN32_RELEASE)
 WIN32_7Z = $(WIN32_RELEASE).7z
-LIN64_NW_DIR = bin/nwjs-v0.18.3-linux-x64
-LIN64_RELEASE = $(NAME)-v$(VERSION)-linux-x64
-LIN64_RELEASE_DIR = $(DIST_DIR)/$(LIN64_RELEASE)
-LIN64_7Z = $(LIN64_RELEASE).7z
-MAC64_NW_DIR = bin/nwjs-v0.18.3-osx-x64
+MAC64_NW_DIR = bin/nwjs-v0.38.1-osx-x64
 MAC64_RELEASE = $(NAME)-v$(VERSION)-osx-x64
 MAC64_RELEASE_DIR = $(DIST_DIR)/$(MAC64_RELEASE)
 MAC64_RESOURCES_DIR = $(MAC64_RELEASE_DIR)/nwjs.app/Contents/Resources
 MAC64_7Z = $(MAC64_RELEASE).7z
+LIN64_NW_DIR = bin/nwjs-v0.38.1-linux-x64
+LIN64_RELEASE = $(NAME)-v$(VERSION)-linux-x64
+LIN64_RELEASE_DIR = $(DIST_DIR)/$(LIN64_RELEASE)
+LIN64_7Z = $(LIN64_RELEASE).7z
 
 all:
 
@@ -30,6 +30,15 @@ win32:
 	cp -a legal "$(WIN32_RELEASE_DIR)"
 	cd "$(DIST_DIR)" && 7z a $(7Z_OPTS) "$(WIN32_7Z)" "$(WIN32_RELEASE)"
 
+mac64:
+	cd "$(DIST_DIR)" && rm -rf "$(APP)" "$(MAC64_RELEASE)" "$(MAC64_7Z)"
+	cd "$(DIST_DIR)/app" && 7z a $(ZIP_OPTS) "../$(APP)" *
+	mkdir -p "$(MAC64_RELEASE_DIR)"
+	cp -a "$(MAC64_NW_DIR)"/* "$(MAC64_RELEASE_DIR)"
+	cp -a "$(DIST_DIR)/$(APP)" "$(MAC64_RESOURCES_DIR)"
+	cp -a legal "$(MAC64_RELEASE_DIR)"
+	cd "$(DIST_DIR)" && 7z a $(7Z_OPTS) "$(MAC64_7Z)" "$(MAC64_RELEASE)"
+
 lin64:
 	cd "$(DIST_DIR)" && rm -rf "$(APP)" "$(LIN64_RELEASE)" "$(LIN64_7Z)"
 	cd "$(DIST_DIR)/app" && 7z a $(ZIP_OPTS) "../$(APP)" *
@@ -40,12 +49,3 @@ lin64:
 	chmod +x "$(LIN64_RELEASE_DIR)/$(NAME)"
 	cp -a legal "$(LIN64_RELEASE_DIR)"
 	cd "$(DIST_DIR)" && 7z a $(7Z_OPTS) "$(LIN64_7Z)" "$(LIN64_RELEASE)"
-
-mac64:
-	cd "$(DIST_DIR)" && rm -rf "$(APP)" "$(MAC64_RELEASE)" "$(MAC64_7Z)"
-	cd "$(DIST_DIR)/app" && 7z a $(ZIP_OPTS) "../$(APP)" *
-	mkdir -p "$(MAC64_RELEASE_DIR)"
-	cp -a "$(MAC64_NW_DIR)"/* "$(MAC64_RELEASE_DIR)"
-	cp -a "$(DIST_DIR)/$(APP)" "$(MAC64_RESOURCES_DIR)"
-	cp -a legal "$(MAC64_RELEASE_DIR)"
-	cd "$(DIST_DIR)" && 7z a $(7Z_OPTS) "$(MAC64_7Z)" "$(MAC64_RELEASE)"

README.md

@@ -8,15 +8,15 @@ wybm is a GUI application which can download videos from YouTube in WebM format
 
 ### Windows
 
-Download [latest release](https://github.com/Kagami/wybm/releases), unpack and run `wybm.exe`. **NOTE:** download appropriate `wybm-vX.Y.Z-win-x86.7z` build, not the source code!
+Download [latest release](https://github.com/Kagami/wybm/releases), unpack and run `wybm.exe`.
 
-### Linux
+### macOS
 
-You need FFmpeg and MKVToolNix installed. Download [latest release](https://github.com/Kagami/wybm/releases), unpack and run `./wybm`.
+You need to have ffmpeg and mkvtoolnix installed (use [Homebrew](https://brew.sh)). Download [latest release](https://github.com/Kagami/wybm/releases), unpack, righ-click `wybm` app in Finder, select Open and Open.
 
-### Mac OS X (experimental, need feedback)
+### Linux
 
-You need FFmpeg and MKVToolNix installed (use HomeBrew). Download [latest release](https://github.com/Kagami/wybm/releases), unpack and launch `nwjs.app`. **NOTE:** Gatekeeper should be turned off.
+You need to have ffmpeg and mkvtoolnix installed. Download [latest release](https://github.com/Kagami/wybm/releases), unpack and run `./wybm`.
 
 ## Troubleshooting
 
@@ -34,7 +34,7 @@ It takes a while before YouTube generates VP9 formats for a new video. Some old
 
 ## License
 
-wybm own code, documentation and icon licensed under CC0, but the resulting build also includes the following libraries and assets:
+wybm own code, documentation and icon is licensed under CC0, but the resulting build also includes the following libraries and assets:
 
 * Libraries in `dependencies` section of [package.json](package.json) (BSD-like)
 * [NW.js binaries](https://github.com/nwjs/nw.js), see also `credits.html` in release archives
@@ -48,7 +48,7 @@ wybm own code, documentation and icon licensed under CC0, but the resulting buil
 
 wybm - Extract and cut youtube webms
 
-Written in 2016 by Kagami Hiiragi <kagami@genshiken.org>
+Written in 2016-2019 by Kagami Hiiragi <kagami@genshiken.org>
 
 To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.
 

bin/README.md

@@ -5,15 +5,15 @@ You need several binaries in order to build wybm. Run:
 ```bash
 wget https://yt-dl.org/latest/youtube-dl -O youtube-dl.zip
 wget https://yt-dl.org/latest/youtube-dl.exe
-wget http://dl.nwjs.io/v0.18.3/nwjs-v0.18.3-linux-x64.tar.gz
-tar xvf nwjs-v0.18.3-linux-x64.tar.gz
-wget http://dl.nwjs.io/v0.18.3/nwjs-v0.18.3-win-ia32.zip
-unzip nwjs-v0.18.3-win-ia32.zip
-wget https://dl.nwjs.io/v0.18.3/nwjs-v0.18.3-osx-x64.zip
-unzip nwjs-v0.18.3-osx-x64.zip
+wget https://dl.nwjs.io/v0.38.1/nwjs-v0.38.1-win-ia32.zip
+unzip nwjs-v0.38.1-win-ia32.zip
+wget https://dl.nwjs.io/v0.38.1/nwjs-v0.38.1-osx-x64.zip
+unzip nwjs-v0.38.1-osx-x64.zip
+wget https://dl.nwjs.io/v0.38.1/nwjs-v0.38.1-linux-x64.tar.gz
+tar xvf nwjs-v0.38.1-linux-x64.tar.gz
 ```
 
 And also download manually (not automated yet):
 
-* `ffmpeg.exe` from static Win32 [Zeranoe FFmpeg build](http://ffmpeg.zeranoe.com/builds/)
+* `ffmpeg.exe` from static Win32 [Zeranoe FFmpeg build](https://ffmpeg.zeranoe.com/builds/)
 * `mkvinfo.exe` from portable Win32 [MKVToolNix build](https://mkvtoolnix.download/downloads.html#windows)