Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
205adceb18 |
No files matched your search
File renamed without changes.
@@ -34,6 +34,7 @@ try {
|
||||
upgradeDisabled = false;
|
||||
}
|
||||
autoUpdater.autoDownload = !upgradeDisabled;
|
||||
autoUpdater.allowPrerelease = false;
|
||||
|
||||
// This is set to true if an auto update has been downloaded through the Electron
|
||||
// auto-update system and is ready to install. If the user declined an update earlier,
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "lbry",
|
||||
"version": "0.53.5-alpha.test7495b",
|
||||
"version": "0.53.5-alpha.test7495a2",
|
||||
"description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
|
||||
"keywords": [
|
||||
"lbry"
|
||||
|
||||
@@ -7,6 +7,7 @@ import { selectUnclaimedRewards } from 'redux/selectors/rewards';
|
||||
import { doFetchChannelListMine, doFetchCollectionListMine, doResolveUris } from 'redux/actions/claims';
|
||||
import { selectMyChannelUrls, selectMyChannelClaimIds } from 'redux/selectors/claims';
|
||||
import * as SETTINGS from 'constants/settings';
|
||||
import * as MODALS from 'constants/modal_types';
|
||||
import { selectSubscriptions } from 'redux/selectors/subscriptions';
|
||||
import {
|
||||
makeSelectClientSetting,
|
||||
@@ -24,7 +25,7 @@ import {
|
||||
import { doGetWalletSyncPreference, doSetLanguage } from 'redux/actions/settings';
|
||||
import { doSyncLoop } from 'redux/actions/sync';
|
||||
import {
|
||||
doDownloadUpgradeRequested,
|
||||
doOpenModal,
|
||||
doSignIn,
|
||||
doGetAndPopulatePreferences,
|
||||
doSetActiveChannel,
|
||||
@@ -60,7 +61,7 @@ const perform = (dispatch) => ({
|
||||
fetchCollectionListMine: () => dispatch(doFetchCollectionListMine()),
|
||||
setLanguage: (language) => dispatch(doSetLanguage(language)),
|
||||
signIn: () => dispatch(doSignIn()),
|
||||
requestDownloadUpgrade: () => dispatch(doDownloadUpgradeRequested()),
|
||||
requestDownloadUpgrade: () => dispatch(doOpenModal(MODALS.UPGRADE)),
|
||||
updatePreferences: () => dispatch(doGetAndPopulatePreferences()),
|
||||
getWalletSyncPref: () => dispatch(doGetWalletSyncPreference()),
|
||||
syncLoop: (noInterval) => dispatch(doSyncLoop(noInterval)),
|
||||
|
||||
@@ -1,3 +1,11 @@
|
||||
import { connect } from 'react-redux';
|
||||
import { selectRemoteVersion } from 'redux/selectors/app';
|
||||
import LastReleaseChanges from './view';
|
||||
|
||||
export default LastReleaseChanges;
|
||||
const select = (state) => ({
|
||||
releaseVersion: selectRemoteVersion(state),
|
||||
});
|
||||
|
||||
const perform = {};
|
||||
|
||||
export default connect(select, perform)(LastReleaseChanges);
|
||||
@@ -5,11 +5,12 @@ import Button from 'component/button';
|
||||
import I18nMessage from 'component/i18nMessage';
|
||||
|
||||
type Props = {
|
||||
releaseVersion: string,
|
||||
hideReleaseVersion?: boolean,
|
||||
};
|
||||
|
||||
const LastReleaseChanges = (props: Props) => {
|
||||
const { hideReleaseVersion } = props;
|
||||
const { hideReleaseVersion, releaseVersion } = props;
|
||||
const [releaseTag, setReleaseTag] = useState('');
|
||||
const [releaseChanges, setReleaseChanges] = useState('');
|
||||
const [fetchingReleaseChanges, setFetchingReleaseChanges] = useState(false);
|
||||
@@ -35,7 +36,7 @@ const LastReleaseChanges = (props: Props) => {
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
const lastReleaseUrl = 'https://api.github.com/repos/lbryio/lbry-desktop/releases/latest';
|
||||
const lastReleaseUrl = `https://api.github.com/repos/lbryio/lbry-desktop/releases/tags/${releaseVersion}`;
|
||||
const options = {
|
||||
method: 'GET',
|
||||
headers: { Accept: 'application/vnd.github.v3+json' },
|
||||
@@ -54,7 +55,7 @@ const LastReleaseChanges = (props: Props) => {
|
||||
setFetchingReleaseChanges(false);
|
||||
setFetchReleaseFailed(true);
|
||||
});
|
||||
}, []);
|
||||
}, [releaseVersion, setFetchingReleaseChanges, setReleaseTag, setReleaseChanges, setFetchReleaseFailed]);
|
||||
|
||||
if (fetchingReleaseChanges) {
|
||||
return <p>{__('Loading...')}</p>;
|
||||
|
||||
@@ -213,6 +213,8 @@ function AppWrapper() {
|
||||
const enabled = makeSelectClientSetting(SETTINGS.ENABLE_PRERELEASE_UPDATES)(state);
|
||||
if (enabled) {
|
||||
autoUpdater.allowPrerelease = true;
|
||||
} else {
|
||||
autoUpdater.allowPrerelease = false;
|
||||
}
|
||||
}
|
||||
}, [persistDone]);
|
||||
|
||||
@@ -6,12 +6,20 @@ export const selectState = (state) => state.app || {};
|
||||
|
||||
export const selectPlatform = createSelector(selectState, (state) => state.platform);
|
||||
|
||||
export const selectUpdateUrl = createSelector(selectPlatform, (platform) => {
|
||||
export const selectRemoteVersion = createSelector(selectState, (state) => state.remoteVersion);
|
||||
|
||||
export const selectUpdateUrl = createSelector(selectPlatform, selectRemoteVersion, (platform, releaseVersion) => {
|
||||
switch (platform) {
|
||||
case 'darwin':
|
||||
return 'https://lbry.com/get/lbry.dmg';
|
||||
case 'linux':
|
||||
return 'https://lbry.com/get/lbry.deb';
|
||||
// releaseVersion can be used as the tag name
|
||||
// Example: v0.53.5-alpha.test7495b
|
||||
// When downloading, we need to remove the initial
|
||||
// v, ending up with a file name like
|
||||
// LBRY_0.53.5-alpha.test7495b.deb
|
||||
const fileName = 'LBRY_' + (releaseVersion || '').replace('v', '') + '.deb';
|
||||
return `https://github.com/lbryio/lbry-desktop/releases/download/${releaseVersion}/${fileName}`;
|
||||
case 'win32':
|
||||
return 'https://lbry.com/get/lbry.exe';
|
||||
default:
|
||||
@@ -21,8 +29,6 @@ export const selectUpdateUrl = createSelector(selectPlatform, (platform) => {
|
||||
|
||||
export const selectHasClickedComment = createSelector(selectState, (state) => state.hasClickedComment);
|
||||
|
||||
export const selectRemoteVersion = createSelector(selectState, (state) => state.remoteVersion);
|
||||
|
||||
export const selectIsUpgradeAvailable = createSelector(selectState, (state) => state.isUpgradeAvailable);
|
||||
|
||||
export const selectUpgradeInitialized = createSelector(selectState, (state) => state.upgradeInitialized);
|
||||
|
||||
Reference in new issue
Block a user