From 149d1ef61f4be83bb31b07ed1adf99512b966ff0 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Wed, 31 May 2017 12:22:50 -0400 Subject: [PATCH 01/11] fix version check on help --- CHANGELOG.md | 2 +- ui/js/lbry.js | 2 -- ui/js/page/help/view.jsx | 21 +++++++++++---------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d39386c35..4ae782121 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ Web UI version numbers should always match the corresponding version of LBRY App * ### Fixed - * + * Version upgrade check on help page * ### Deprecated diff --git a/ui/js/lbry.js b/ui/js/lbry.js index db9a1ae2a..b9e70d359 100644 --- a/ui/js/lbry.js +++ b/ui/js/lbry.js @@ -100,7 +100,6 @@ lbry.connect = function() { let tryNum = 0 function checkDaemonStartedFailed() { - console.log('status error try num ' + tryNum) if (tryNum <= 100) { // Move # of tries into constant or config option setTimeout(() => { tryNum++ @@ -114,7 +113,6 @@ lbry.connect = function() { // Check every half second to see if the daemon is accepting connections function checkDaemonStarted() { - console.log('check daemon started try ' + tryNum) lbry.call('status', {}, resolve, checkDaemonStartedFailed, checkDaemonStartedFailed) } diff --git a/ui/js/page/help/view.jsx b/ui/js/page/help/view.jsx index 3f67c2d70..2303446d3 100644 --- a/ui/js/page/help/view.jsx +++ b/ui/js/page/help/view.jsx @@ -4,7 +4,6 @@ import lbry from 'lbry.js'; import Link from 'component/link'; import SubHeader from 'component/subHeader' import {BusyMessage} from 'component/common' -import {version as uiVersion} from 'json!../../../package.json'; class HelpPage extends React.Component { constructor(props) { @@ -13,13 +12,16 @@ class HelpPage extends React.Component { this.state = { versionInfo: null, lbryId: null, + uiVersion: null, + upgradeAvailable: null }; } componentWillMount() { - lbry.getAppVersionInfo().then((info) => { + lbry.getAppVersionInfo().then(({remoteVersion, upgradeAvailable}) => { this.setState({ - appVersionInfo: info, + uiVersion: remoteVersion, + upgradeAvailable: upgradeAvailable }); }); lbry.call('version', {}, (info) => { @@ -43,7 +45,6 @@ class HelpPage extends React.Component { if (this.state.versionInfo) { ver = this.state.versionInfo; - console.log(ver) if (ver.os_system == 'Darwin') { osName = (parseInt(ver.os_release.match(/^\d+/)) < 16 ? 'Mac OS X' : 'Mac OS'); @@ -96,11 +97,11 @@ class HelpPage extends React.Component {

About

- {this.state.appVersionInfo ? - (ver.lbrynet_update_available || ver.lbryum_update_available ? -

A newer version of LBRY is available.

- :

Your copy of LBRY is up to date.

) : null} - { ver ? + { this.state.upgradeAvailable === null ? '' : + ( this.state.upgradeAvailable ? +

A newer version of LBRY is available.

+ :

Your copy of LBRY is up to date.

)} + { this.state.uiVersion && ver ? @@ -113,7 +114,7 @@ class HelpPage extends React.Component { - + From 9f1e5489a1468f0c7561114e3287eae2ed28bbac Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Wed, 31 May 2017 18:19:48 -0400 Subject: [PATCH 02/11] fix multiple install ids --- ui/js/component/auth.js | 2 +- ui/js/lbryio.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/js/component/auth.js b/ui/js/component/auth.js index df9262672..b36ff1902 100644 --- a/ui/js/component/auth.js +++ b/ui/js/component/auth.js @@ -41,7 +41,7 @@ class SubmitEmailStage extends React.Component { lbryio.call('user_email', 'new', {email: this.state.email}, 'post').then(() => { this.onEmailSaved(this.state.email); }, (error) => { - if (error.xhr && error.xhr.status == 409) { + if (error.xhr && (error.xhr.status == 409 || error.message == "This email is already in use")) { this.onEmailSaved(this.state.email); return; } else if (this._emailRow) { diff --git a/ui/js/lbryio.js b/ui/js/lbryio.js index 9d78cfb82..0c08dbf1e 100644 --- a/ui/js/lbryio.js +++ b/ui/js/lbryio.js @@ -1,10 +1,10 @@ -import {getLocal, getSession, setSession, setLocal} from './utils.js'; +import {getSession, setSession} from './utils.js'; import lbry from './lbry.js'; const querystring = require('querystring'); const lbryio = { - _accessToken: getLocal('accessToken'), + _accessToken: getSession('accessToken'), _authenticationPromise: null, _user : null, enabled: true @@ -95,11 +95,11 @@ lbryio.call = function(resource, action, params={}, method='get', evenIfDisabled }; lbryio.getAccessToken = () => { - return getLocal('accessToken'); + return getSession('accessToken'); } lbryio.setAccessToken = (token) => { - setLocal('accessToken', token) + setSession('accessToken', token) } lbryio.authenticate = function() { From 0a188e61dbb14e02aeeda5bf8a38d829a1bcdfab Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Wed, 31 May 2017 18:20:34 -0400 Subject: [PATCH 03/11] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ae782121..b2fc171ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,8 @@ Web UI version numbers should always match the corresponding version of LBRY App * ### Fixed + * Verified access from two different installation ids * Version upgrade check on help page - * ### Deprecated * From 60d50fc63bacce8224b4bc6bb7b5e062f774b4bd Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Wed, 31 May 2017 18:20:54 -0400 Subject: [PATCH 04/11] =?UTF-8?q?Bump=20version:=200.11.7=20=E2=86=92=200.?= =?UTF-8?q?11.8rc1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- app/package.json | 2 +- ui/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index cf597fc15..7722ba620 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.11.7 +current_version = 0.11.8rc1 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P[a-z]+)(?P\d+))? diff --git a/app/package.json b/app/package.json index e2963c7fc..060f36eda 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.11.7", + "version": "0.11.8rc1", "main": "main.js", "description": "LBRY is a fully decentralized, open-source protocol facilitating the discovery, access, and (sometimes) purchase of data.", "author": { diff --git a/ui/package.json b/ui/package.json index d9f1e8571..d7b537632 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "lbry-web-ui", - "version": "0.11.7", + "version": "0.11.8rc1", "description": "LBRY UI", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", From fcfce1bf64ae6503e65688ac4536043a7adf9174 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Wed, 31 May 2017 18:21:09 -0400 Subject: [PATCH 05/11] =?UTF-8?q?Bump=20version:=200.11.8rc1=20=E2=86=92?= =?UTF-8?q?=200.11.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- CHANGELOG.md | 12 ++++++++++-- app/package.json | 2 +- ui/package.json | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 7722ba620..006ca4518 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.11.8rc1 +current_version = 0.11.8 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P[a-z]+)(?P\d+))? diff --git a/CHANGELOG.md b/CHANGELOG.md index b2fc171ba..10ee86334 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,8 @@ Web UI version numbers should always match the corresponding version of LBRY App * ### Fixed - * Verified access from two different installation ids - * Version upgrade check on help page + * + * ### Deprecated * @@ -27,6 +27,14 @@ Web UI version numbers should always match the corresponding version of LBRY App * * +## [0.11.8] - 2017-05-31 + +### Fixed + * Verified access from two different installation ids + * Version upgrade check on help page + + + ## [0.11.7] - 2017-05-30 ### Changed diff --git a/app/package.json b/app/package.json index 060f36eda..abc2452e4 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.11.8rc1", + "version": "0.11.8", "main": "main.js", "description": "LBRY is a fully decentralized, open-source protocol facilitating the discovery, access, and (sometimes) purchase of data.", "author": { diff --git a/ui/package.json b/ui/package.json index d7b537632..414dcb8de 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "lbry-web-ui", - "version": "0.11.8rc1", + "version": "0.11.8", "description": "LBRY UI", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", From c7bab43b7baa87315f0e320f5f634d1f74e9a462 Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Thu, 1 Jun 2017 02:51:16 -0400 Subject: [PATCH 06/11] Open full path instead of directory during upgrade This was how it was before the Redux refactor --- ui/js/actions/app.js | 11 ++++------- ui/js/reducers/app.js | 2 +- ui/js/selectors/app.js | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ui/js/actions/app.js b/ui/js/actions/app.js index 9b928c512..a513b820c 100644 --- a/ui/js/actions/app.js +++ b/ui/js/actions/app.js @@ -2,7 +2,7 @@ import * as types from 'constants/action_types' import lbry from 'lbry' import { selectUpdateUrl, - selectUpgradeDownloadDir, + selectUpgradeDownloadPath, selectUpgradeDownloadItem, selectUpgradeFilename, selectPageTitle, @@ -110,7 +110,7 @@ export function doSkipUpgrade() { export function doStartUpgrade() { return function(dispatch, getState) { const state = getState() - const upgradeDownloadPath = selectUpgradeDownloadDir(state) + const upgradeDownloadPath = selectUpgradeDownloadPath(state) ipcRenderer.send('upgrade', upgradeDownloadPath) } @@ -135,14 +135,11 @@ export function doDownloadUpgrade() { * too soon. */ - const _upgradeDownloadItem = downloadItem; - const _upgradeDownloadPath = path.join(dir, upgradeFilename); - dispatch({ type: types.UPGRADE_DOWNLOAD_COMPLETED, data: { - dir, - downloadItem + downloadItem, + path: path.join(dir, upgradeFilename) } }) }); diff --git a/ui/js/reducers/app.js b/ui/js/reducers/app.js index af99b8a88..162a81fba 100644 --- a/ui/js/reducers/app.js +++ b/ui/js/reducers/app.js @@ -34,7 +34,7 @@ reducers[types.UPGRADE_CANCELLED] = function(state, action) { reducers[types.UPGRADE_DOWNLOAD_COMPLETED] = function(state, action) { return Object.assign({}, state, { - downloadDir: action.data.dir, + downloadPath: action.data.path, upgradeDownloading: false, upgradeDownloadCompleted: true }) diff --git a/ui/js/selectors/app.js b/ui/js/selectors/app.js index ebf2a1398..262d704ae 100644 --- a/ui/js/selectors/app.js +++ b/ui/js/selectors/app.js @@ -170,9 +170,9 @@ export const selectUpgradeSkipped = createSelector( (state) => state.upgradeSkipped ) -export const selectUpgradeDownloadDir = createSelector( +export const selectUpgradeDownloadPath = createSelector( _selectState, - (state) => state.downloadDir + (state) => state.downloadPath ) export const selectUpgradeDownloadItem = createSelector( From e9dc3324cb197975ae78faba921d255ab1996a68 Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Thu, 1 Jun 2017 02:52:17 -0400 Subject: [PATCH 07/11] Fix upgrade filenames on Mac and Windows --- ui/js/selectors/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/js/selectors/app.js b/ui/js/selectors/app.js index 262d704ae..778ac8a87 100644 --- a/ui/js/selectors/app.js +++ b/ui/js/selectors/app.js @@ -107,11 +107,11 @@ export const selectUpgradeFilename = createSelector( (platform, version) => { switch (platform) { case 'darwin': - return `LBRY-${version}.dmg`; + return `LBRY_${version}.dmg`; case 'linux': return `LBRY_${version}_amd64.deb`; case 'win32': - return `LBRY.Setup.${version}.exe`; + return `LBRY_${version}.exe`; default: throw 'Unknown platform'; } From df9391da76335a5b4987ffcdd8e95f9f94b33d3f Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Thu, 1 Jun 2017 04:21:25 -0400 Subject: [PATCH 08/11] On Windows, open installer using shell (allows elevation) When you're just running a bare process, Windows can't show the "this app wants elevated permissions" box and child_process.spawn throws an error. --- app/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main.js b/app/main.js index 85ee04ca0..889fa0402 100644 --- a/app/main.js +++ b/app/main.js @@ -116,7 +116,7 @@ function openItem(fullPath) { } else if (process.platform == 'linux') { child = child_process.spawn('xdg-open', [fullPath], subprocOptions); } else if (process.platform == 'win32') { - child = child_process.spawn(fullPath, [], subprocOptions); + child = child_process.spawn(fullPath, Object.assign({}, subprocOptions, {shell: true})); } // Causes child process reference to be garbage collected, allowing main process to exit From cba11210c463d820964d54fa058c428c0db136c3 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Thu, 1 Jun 2017 10:24:29 -0400 Subject: [PATCH 09/11] update changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10ee86334..14983adab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,8 @@ Web UI version numbers should always match the corresponding version of LBRY App * ### Fixed - * - * + * Windows upgrade process fixed + * Upgrade process on Mac and Linux will open the file rather than the folder ### Deprecated * From b0c87e064aedc196a42f49476834a5d4e1355d49 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Thu, 1 Jun 2017 10:24:44 -0400 Subject: [PATCH 10/11] =?UTF-8?q?Bump=20version:=200.11.8=20=E2=86=92=200.?= =?UTF-8?q?11.9rc1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- app/package.json | 2 +- ui/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 006ca4518..6b2ff8444 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.11.8 +current_version = 0.11.9rc1 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P[a-z]+)(?P\d+))? diff --git a/app/package.json b/app/package.json index abc2452e4..b7c3debd9 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.11.8", + "version": "0.11.9rc1", "main": "main.js", "description": "LBRY is a fully decentralized, open-source protocol facilitating the discovery, access, and (sometimes) purchase of data.", "author": { diff --git a/ui/package.json b/ui/package.json index 414dcb8de..d7f930420 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "lbry-web-ui", - "version": "0.11.8", + "version": "0.11.9rc1", "description": "LBRY UI", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", From 29585008759ae9813b52339c01dc49a88c80c717 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Thu, 1 Jun 2017 11:03:39 -0400 Subject: [PATCH 11/11] =?UTF-8?q?Bump=20version:=200.11.9rc1=20=E2=86=92?= =?UTF-8?q?=200.11.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- CHANGELOG.md | 12 ++++++++++-- app/package.json | 2 +- ui/package.json | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 6b2ff8444..03dae8d5b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.11.9rc1 +current_version = 0.11.9 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P[a-z]+)(?P\d+))? diff --git a/CHANGELOG.md b/CHANGELOG.md index 14983adab..79ee6f3ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,8 @@ Web UI version numbers should always match the corresponding version of LBRY App * ### Fixed - * Windows upgrade process fixed - * Upgrade process on Mac and Linux will open the file rather than the folder + * + * ### Deprecated * @@ -27,6 +27,14 @@ Web UI version numbers should always match the corresponding version of LBRY App * * +## [0.11.9] - 2017-06-01 + +### Fixed + * Windows upgrade process fixed + * Upgrade process on Mac and Linux will open the file rather than the folder + + + ## [0.11.8] - 2017-05-31 ### Fixed diff --git a/app/package.json b/app/package.json index b7c3debd9..824cb40a6 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.11.9rc1", + "version": "0.11.9", "main": "main.js", "description": "LBRY is a fully decentralized, open-source protocol facilitating the discovery, access, and (sometimes) purchase of data.", "author": { diff --git a/ui/package.json b/ui/package.json index d7f930420..7465c0fcd 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "lbry-web-ui", - "version": "0.11.9rc1", + "version": "0.11.9", "description": "LBRY UI", "scripts": { "test": "echo \"Error: no test specified\" && exit 1",
interface{uiVersion}{this.state.uiVersion}
Platform