Bump version to 1.1.2

Display error/retry in case of failure
Add build badges to readme
2026-01-13 19:31:46 +00:00 · 2019-05-01 19:31:47 +02:00 · 2019-05-01 19:31:35 +02:00 · 2019-04-28 17:19:15 +02:00 · 2019-04-28 17:03:36 +02:00 · 2019-04-28 16:36:56 +02:00
8 changed files with 737 additions and 76 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,43 @@
 matrix:
  include:
    - os: osx
      osx_image: xcode9.4
      language: node_js
      node_js: "10"
      env:
        - ELECTRON_CACHE=$HOME/.cache/electron
        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
    - os: linux
      services: docker
      language: generic
 cache:
  directories:
    - node_modules
    - $HOME/.cache/electron
    - $HOME/.cache/electron-builder
 script:
  - |
    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
      docker run --rm \
        $(env | \
          grep -Eo '^[^\s=]*(DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_)[^\s=]*' | \
          sed '/^$/d;s/^/-e /' | \
          paste -sd ' ' \
        ) \
        -v ${PWD}:/project \
        -v ~/.cache/electron:/root/.cache/electron \
        -v ~/.cache/electron-builder:/root/.cache/electron-builder \
        electronuserland/builder \
        /bin/bash -c "npm install && npm run release:linux"
    else
      npm run release:mac
    fi
 before_cache:
  - rm -rf $HOME/.cache/electron-builder
 branches:
  except:
    - "/^v\\d+\\.\\d+\\.\\d+$/"
--- a/appveyor.yml
+++ b/appveyor.yml
@ -0,0 +1,20 @@
 image: Visual Studio 2017
 platform:
  - x64
 cache:
  - node_modules
  - '%USERPROFILE%\.electron'
 init:
  - git config --global core.autocrlf input
 install:
  - ps: Install-Product node 8 x64
  - npm install
 build_script:
  - npm run release:win
 test: off
--- a/error.html
+++ b/error.html
@ -0,0 +1,50 @@
 <!DOCTYPE html>
 <html>
 	<head>
 		<meta charset="utf-8" />
 		<title>Cannot load YouTube Music</title>
 		<style>
 			body {
 				background: #000;
 			}
 			.container {
 				margin: 0;
 				font-family: Roboto, Arial, sans-serif;
 				font-size: 20px;
 				font-weight: 500;
 				color: rgba(255, 255, 255, 0.5);
 				position: absolute;
 				top: 50%;
 				left: 50%;
 				margin-right: -50%;
 				transform: translate(-50%, -50%);
 				text-align: center;
 			}
 			.button {
 				background: #065fd4;
 				overflow: hidden;
 				text-overflow: ellipsis;
 				white-space: nowrap;
 				color: white;
 				font: inherit;
 				text-transform: uppercase;
 				text-decoration: none;
 				border-radius: 2px;
 				font-size: 16px;
 				font-weight: normal;
 				text-align: center;
 				padding: 8px 22px;
 				display: inline-block;
 			}
 		</style>
 	</head>
 	<body>
 		<div class="container">
 			<p>Cannot load YouTube Music… Internet disconnected?</p>
 			<a href="#" class="button" onclick="reload()">Retry</a>
 		</div>
 	</body>
 </html>
--- a/index.js
+++ b/index.js
@ -72,6 +72,13 @@ function createMainWindow() {
 		});
 	});
 	win.webContents.on("did-fail-load", () => {
 		if (isDev) {
 			console.log("did fail load");
 		}
 		win.webContents.loadFile(path.join(__dirname, "error.html"));
 	});
 	win.webContents.on("did-navigate-in-page", () => {
 		const url = win.webContents.getURL();
 		if (url.startsWith("https://music.youtube.com")) {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
 	"name"       : "youtube-music",
 	"productName": "YouTube Music",
-	"version"    : "1.1.0",
+	"version"    : "1.1.2",
 	"description": "YouTube Music Desktop App - including custom plugins",
 	"license"    : "MIT",
 	"repository" : "th-ch/youtube-music",
@ -22,18 +22,21 @@
 		},
 		"linux": {
 			"icon"    : "assets/generated/icons/png",
-			"category": "Audio"
+			"category": "AudioVideo"
 		}
 	},
 	"scripts": {
-		"test"       : "xo",
+		"test"         : "xo",
-		"start"      : "electron .",
+		"start"        : "electron .",
-		"icon"       : "rimraf assets/generated && electron-icon-maker --input=assets/youtube-music.png --output=assets/generated",
+		"icon"         : "rimraf assets/generated && electron-icon-maker --input=assets/youtube-music.png --output=assets/generated",
-		"postinstall": "npm run icon && npm rebuild && node plugins/adblocker/generator.js && electron-rebuild",
+		"postinstall"  : "npm run icon && npm rebuild && node plugins/adblocker/generator.js && electron-rebuild",
-		"clean"      : "rimraf dist",
+		"clean"        : "rimraf dist",
-		"build"      : "npm run clean && build --win --mac --linux",
+		"build"        : "npm run clean && build --win --mac --linux",
-		"build:mac"  : "npm run clean && build --mac",
+		"build:mac"    : "npm run clean && build --mac",
-		"release"    : "npm run clean && build --win --mac --linux -p always"
+		"build:win"    : "npm run clean && build --win",
 		"release:linux": "npm run clean && build --linux -p always",
 		"release:mac"  : "npm run clean && build --mac -p always",
 		"release:win"  : "npm run clean && build --win -p always"
 	},
 	"dependencies": {
 		"ad-block"              : "^4.1.3",
--- a/preload.js
+++ b/preload.js
@ -1,7 +1,9 @@
 const path = require("path");
-const { getEnabledPlugins } = require("./store");
+const { getCurrentWindow } = require("electron").remote;
-const { fileExists }        = require("./plugins/utils");
+
 const { getEnabledPlugins, store } = require("./store");
 const { fileExists }               = require("./plugins/utils");
 const plugins = getEnabledPlugins();
@ -23,4 +25,8 @@ document.addEventListener("DOMContentLoaded", () => {
 			run();
 		});
 	});
 	// Add action for reloading
 	global.reload = () =>
 		getCurrentWindow().webContents.loadURL(store.get("url"));
 });
--- a/readme.md
+++ b/readme.md
@ -2,6 +2,8 @@
 [![GitHub release](https://img.shields.io/github/release/th-ch/youtube-music.svg)](https://GitHub.com/th-ch/youtube-music/releases/)
 [![GitHub license](https://img.shields.io/github/license/th-ch/youtube-music.svg)](https://github.com/th-ch/youtube-music/blob/master/LICENSE)
 [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo)
 [![Build status](https://ci.appveyor.com/api/projects/status/tgre12r150ynvwl2?svg=true)](https://ci.appveyor.com/project/th-ch/youtube-music)
 [![Build Status](https://travis-ci.org/th-ch/youtube-music.svg?branch=master)](https://travis-ci.org/th-ch/youtube-music)
 ![Screenshot](screenshot.jpg "Screenshot")
@ -28,7 +30,7 @@ Here are the links to the current version:
 ## Dev
-```
+```sh
 git clone https://github.com/th-ch/youtube-music
 cd youtube-music
 npm install
@ -48,7 +50,7 @@ Create a folder in `plugins/YOUR-PLUGIN-NAME`:
 - if you need to manipulate the BrowserWindow, create a file `back.js` with the following template:
-```
+```node
 module.exports = win => {
 	// win is the BrowserWindow object
 };
@ -56,7 +58,7 @@ module.exports = win => {
 - if you need to change the front, create a file `front.js` with the following template:
-```
+```node
 module.exports = () => {
 	// This function will be called as a preload script
 	// So you can use front features like `document.querySelector`
@ -67,7 +69,10 @@ module.exports = () => {
 - injecting custom CSS: create a `style.css` file in the same folder then:
-```
+```node
 const path = require("path");
 const { injectCSS } = require("../utils");
 // back.js
 module.exports = win => {
 	injectCSS(win.webContents, path.join(__dirname, "style.css"));
@ -76,7 +81,7 @@ module.exports = win => {
 - changing the HTML:
-```
+```node
 // front.js
 module.exports = () => {
 	// Remove the login button
@ -88,7 +93,7 @@ module.exports = () => {
 ## Build
-```
+```sh
 npm run build
 ```
Author	SHA1	Message	Date
TC	eac2c5cf14	Bump version to 1.1.2	2019-05-01 19:31:47 +02:00
TC	5a1d7fbf23	Display error/retry in case of failure	2019-05-01 19:31:35 +02:00
th-ch	15275236b0	Add build badges to readme	2019-04-28 17:19:15 +02:00
TC	639ae28122	Update linux category	2019-04-28 17:03:36 +02:00
TC	d3453a600b	Install deps in docker	2019-04-28 16:36:56 +02:00
TC	caf76e7588	Fix env in travis config	2019-04-28 16:28:02 +02:00
TC	2d3f77d962	Update package lock	2019-04-28 16:27:42 +02:00
TC	5279a45f35	Add travis config	2019-04-28 16:18:40 +02:00
TC	e52e522d22	Release on appveyor	2019-04-28 16:02:46 +02:00
TC	aa3e4b32eb	Bump version	2019-04-28 15:55:58 +02:00
TC	eb63917b5d	Revert "publish=never for win build" This reverts commit `6e037483c7`.	2019-04-28 15:47:31 +02:00
TC	6e037483c7	publish=never for win build	2019-04-28 13:09:20 +02:00
TC	941477bb0c	Build only for Windows on Appveyor	2019-04-28 12:37:44 +02:00
TC	abc2bb8a4f	Add Appveyor config	2019-04-28 12:31:55 +02:00
th-ch	253e82a2d7	Improve readme snippets	2019-04-26 15:23:54 +02:00