diff --git a/.bumpversion.cfg b/.bumpversion.cfg index cf597fc15..03dae8d5b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.11.7 +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 d39386c35..79ee6f3ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,22 @@ 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 + * Verified access from two different installation ids + * Version upgrade check on help page + + + ## [0.11.7] - 2017-05-30 ### Changed 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 diff --git a/app/package.json b/app/package.json index e2963c7fc..824cb40a6 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.11.7", + "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/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/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/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/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() { 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 { - + 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..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'; } @@ -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( diff --git a/ui/package.json b/ui/package.json index d9f1e8571..7465c0fcd 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "lbry-web-ui", - "version": "0.11.7", + "version": "0.11.9", "description": "LBRY UI", "scripts": { "test": "echo \"Error: no test specified\" && exit 1",
interface{uiVersion}{this.state.uiVersion}
Platform