From 4045fadc40fbf39b36f11b2eca1e906d84d0337f Mon Sep 17 00:00:00 2001 From: Amit Nandan P Date: Sat, 9 Jun 2018 17:33:23 -0500 Subject: [PATCH] #1556 Checking for OS before opening the log file --- src/renderer/page/help/view.jsx | 48 +++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/src/renderer/page/help/view.jsx b/src/renderer/page/help/view.jsx index d1260ca64..47f2db2cc 100644 --- a/src/renderer/page/help/view.jsx +++ b/src/renderer/page/help/view.jsx @@ -1,21 +1,36 @@ // @TODO: Customize advice based on OS -import React from 'react'; +// @flow +import * as React from 'react'; import { shell } from 'electron'; import { Lbry } from 'lbry-redux'; -import Native from 'native'; +import * as Native from 'native'; import Button from 'component/button'; import BusyIndicator from 'component/common/busy-indicator'; import Page from 'component/page'; import * as icons from 'constants/icons'; -type Props = { - deamonSettings: { - data_dir: ?string, - }, +type DeamonSettings = { + data_dir: string, }; -class HelpPage extends React.PureComponent { - constructor(props) { +type Props = { + deamonSettings: DeamonSettings, + accessToken: string, + fetchAccessToken: () => void, + doAuth: () => void, + user: any, +}; + +type State = { + versionInfo: any, + lbryId: any, + uiVersion: any, + upgradeAvailable: any, + accessTokenHidden: any, +}; + +class HelpPage extends React.PureComponent { + constructor(props: Props) { super(props); this.state = { @@ -26,11 +41,12 @@ class HelpPage extends React.PureComponent { accessTokenHidden: true, }; - this.showAccessToken = this.showAccessToken.bind(this); + (this: any).showAccessToken = this.showAccessToken.bind(this); + (this: any).openLogFile = this.openLogFile.bind(this); } componentDidMount() { - Native.getAppVersionInfo().then(({ remoteVersion, localVersion, upgradeAvailable }) => { + Native.getAppVersionInfo().then(({ localVersion, upgradeAvailable }) => { this.setState({ uiVersion: localVersion, upgradeAvailable, @@ -56,6 +72,16 @@ class HelpPage extends React.PureComponent { }); } + openLogFile(userHomeDirectory: string) { + const logFileName = 'lbrynet.log'; + const os = this.state.versionInfo.os_system; + if (os === 'Darwin' || os === 'Linux') { + shell.openItem(`${userHomeDirectory}/${logFileName}`); + } else { + shell.openItem(`${userHomeDirectory}\\${logFileName}`); + } + } + render() { let ver; let osName; @@ -127,7 +153,7 @@ class HelpPage extends React.PureComponent { button="primary" label={__('Open Log')} icon={icons.REPORT} - onClick={() => shell.openItem(`${dataDirectory}/lbrynet.log`)} + onClick={() => this.openLogFile(dataDirectory)} />