LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Mayesters 2017-06-19 14:24:27 +02:00
commit e46e1bd5f7
37 changed files with 1389 additions and 906 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.bumpversion.cfg
View file

@ -1,5 +1,5 @@
[bumpversion] [bumpversion]
current_version = 0.12.0 current_version = 0.12.2rc3
commit = True commit = True
tag = True tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<candidate>\d+))? parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<candidate>\d+))?

16
CHANGELOG.md
View file

@ -8,24 +8,24 @@ Web UI version numbers should always match the corresponding version of LBRY App
## [Unreleased] ## [Unreleased]
### Added ### Added
* * State is persisted through app close and re-open, resulting in faster opens
*
### Changed ### Changed
* * Upgraded to lbry daemon 0.13, including updating API signatures
* * Channels resolve much faster
* Resolve is no longer cancelled on navigate
### Fixed ### Fixed
* * Fix help menu force reloading whole app
* * Show page updates correctly when navigating from show page to another show page
### Deprecated ### Deprecated
* *
* *
### Removed ### Removed
* * The author metadata field is no longer shown, in favor of first-class identities
* * Availability is no longer checked before showing Download options, due to unreliability
## [0.12.0] - 2017-06-09 ## [0.12.0] - 2017-06-09

2
app/menu/main-menu.js
View file

@ -36,7 +36,7 @@ const baseTemplate = [
label: 'Help', label: 'Help',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
focusedWindow.loadURL(`file://${__dirname}/../dist/index.html?help`); focusedWindow.webContents.send('open-menu', '/help');
} }
} }
} }

20
app/package-lock.json generated
View file

@ -63,6 +63,11 @@
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.6.0.tgz", "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.6.0.tgz",
"integrity": "sha1-Umao9J3Zib5Pn2gbbyoMVShdDZo=" "integrity": "sha1-Umao9J3Zib5Pn2gbbyoMVShdDZo="
}, },
"modify-filename": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/modify-filename/-/modify-filename-1.1.0.tgz",
"integrity": "sha1-mi3sg4Bvuy2XXyK+7IWcoms5OqE="
},
"npm": { "npm": {
"version": "4.6.1", "version": "4.6.1",
"resolved": "https://registry.npmjs.org/npm/-/npm-4.6.1.tgz", "resolved": "https://registry.npmjs.org/npm/-/npm-4.6.1.tgz",
@ -1451,6 +1456,16 @@
} }
} }
}, },
"path-exists": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
},
"pupa": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/pupa/-/pupa-1.0.0.tgz",
"integrity": "sha1-mpVopa9+ZXuEYqbp1TKHQ1YM7/Y="
},
"semver": { "semver": {
"version": "5.3.0", "version": "5.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
@ -1465,6 +1480,11 @@
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.1.0.tgz", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.1.0.tgz",
"integrity": "sha1-yWPc8DciiS7FnLpWnpQLcZVNFyk=" "integrity": "sha1-yWPc8DciiS7FnLpWnpQLcZVNFyk="
},
"unused-filename": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/unused-filename/-/unused-filename-0.1.0.tgz",
"integrity": "sha1-5fM7yeSmP4f2TTwR0xl53vXS5/s="
} }
} }
} }

2
app/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "LBRY", "name": "LBRY",
"version": "0.12.0", "version": "0.12.2rc3",
"main": "main.js", "main": "main.js",
"description": "LBRY is a fully decentralized, open-source protocol facilitating the discovery, access, and (sometimes) purchase of data.", "description": "LBRY is a fully decentralized, open-source protocol facilitating the discovery, access, and (sometimes) purchase of data.",
"author": { "author": {

2
build/DAEMON_URL
View file

@ -1 +1 @@
https://github.com/lbryio/lbry/releases/download/v0.11.0/lbrynet-daemon-v0.11.0-OSNAME.zip https://github.com/lbryio/lbry/releases/download/v0.13.1rc1/lbrynet-daemon-v0.13.1rc1-OSNAME.zip

36
package-lock.json generated
View file

@ -2,9 +2,9 @@
"lockfileVersion": 1, "lockfileVersion": 1,
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "7.0.29", "version": "7.0.31",
"resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.29.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.31.tgz",
"integrity": "sha512-+8JrLZny/uR+d/jLK9eaV63buRM7X/gNzQk57q76NS4KNKLSKOmxJYFIlwuP2zDvA7wqZj05POPhSd9Z1hYQpQ==", "integrity": "sha512-+KrE1LDddn97ip+gXZAnzNQ0pupKH/6tcKwTpo96BDVNpzmhIKGHug0Wd3H0dN4WEqYB1tXYI5m2mZuIZNI8tg==",
"dev": true "dev": true
}, },
"7zip-bin": { "7zip-bin": {
@ -121,9 +121,9 @@
"dev": true "dev": true
}, },
"balanced-match": { "balanced-match": {
"version": "0.4.2", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
"dev": true "dev": true
}, },
"base64-js": { "base64-js": {
@ -164,9 +164,9 @@
"dev": true "dev": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.7", "version": "1.1.8",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
"integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=", "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
"dev": true "dev": true
}, },
"builtin-modules": { "builtin-modules": {
@ -431,9 +431,9 @@
"optional": true "optional": true
}, },
"electron": { "electron": {
"version": "1.6.10", "version": "1.6.11",
"resolved": "https://registry.npmjs.org/electron/-/electron-1.6.10.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-1.6.11.tgz",
"integrity": "sha1-Twuc1ZbjVwC1cSj5iMwdLOZ+VnE=", "integrity": "sha1-vnnA69zv7bW/KBF0CYAPpTus7/o=",
"dev": true "dev": true
}, },
"electron-builder": { "electron-builder": {
@ -993,12 +993,6 @@
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"dev": true "dev": true
}, },
"lodash": {
"version": "4.12.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz",
"integrity": "sha1-K9bcRqBA9Z5obJcu0h2T3FkFMlg=",
"dev": true
},
"loud-rejection": { "loud-rejection": {
"version": "1.6.0", "version": "1.6.0",
"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
@ -1666,12 +1660,6 @@
"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
"dev": true "dev": true
}, },
"why-did-you-update": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/why-did-you-update/-/why-did-you-update-0.0.8.tgz",
"integrity": "sha1-OJ2X3WwUfh7byfXVRw1E2YXIrjg=",
"dev": true
},
"widest-line": { "widest-line": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz", "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz",

8
ui/js/actions/app.js
View file

@ -243,3 +243,11 @@ export function doRemoveSnackBarSnack() {
type: types.REMOVE_SNACKBAR_SNACK, type: types.REMOVE_SNACKBAR_SNACK,
}; };
} }
export function doClearCache() {
return function(dispatch, getState) {
window.cacheStore.purge();
return Promise.resolve();
};
}

35
ui/js/actions/content.js
View file

@ -11,6 +11,7 @@ import { selectResolvingUris } from "selectors/content";
import { selectCostInfoForUri } from "selectors/cost_info"; import { selectCostInfoForUri } from "selectors/cost_info";
import { doOpenModal } from "actions/app"; import { doOpenModal } from "actions/app";
import { doClaimEligiblePurchaseRewards } from "actions/rewards"; import { doClaimEligiblePurchaseRewards } from "actions/rewards";
import batchActions from "util/batchActions";
export function doResolveUri(uri) { export function doResolveUri(uri) {
return function(dispatch, getState) { return function(dispatch, getState) {
@ -43,16 +44,6 @@ export function doResolveUri(uri) {
}; };
} }
export function doCancelResolveUri(uri) {
return function(dispatch, getState) {
lbry.cancelResolve({ uri });
dispatch({
type: types.RESOLVE_URI_CANCELED,
data: { uri },
});
};
}
export function doFetchFeaturedUris() { export function doFetchFeaturedUris() {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState(); const state = getState();
@ -63,20 +54,29 @@ export function doFetchFeaturedUris() {
const success = ({ Categories, Uris }) => { const success = ({ Categories, Uris }) => {
let featuredUris = {}; let featuredUris = {};
const actions = [];
Categories.forEach(category => { Categories.forEach(category => {
if (Uris[category] && Uris[category].length) { if (Uris[category] && Uris[category].length) {
featuredUris[category] = Uris[category]; const uris = Uris[category];
featuredUris[category] = uris;
uris.forEach(uri => {
actions.push(doResolveUri(uri));
});
} }
}); });
dispatch({ actions.push({
type: types.FETCH_FEATURED_CONTENT_COMPLETED, type: types.FETCH_FEATURED_CONTENT_COMPLETED,
data: { data: {
categories: Categories, categories: Categories,
uris: featuredUris, uris: featuredUris,
success: true,
}, },
}); });
dispatch(batchActions(...actions));
}; };
const failure = () => { const failure = () => {
@ -246,23 +246,22 @@ export function doPurchaseUri(uri, purchaseModalName) {
}; };
} }
export function doFetchClaimsByChannel(uri) { export function doFetchClaimsByChannel(uri, page = 1) {
return function(dispatch, getState) { return function(dispatch, getState) {
dispatch({ dispatch({
type: types.FETCH_CHANNEL_CLAIMS_STARTED, type: types.FETCH_CHANNEL_CLAIMS_STARTED,
data: { uri }, data: { uri },
}); });
lbry.resolve({ uri }).then(resolutionInfo => { lbry.claim_list_by_channel({ uri, page }).then(result => {
const { claims_in_channel } = resolutionInfo const claimResult = result[uri],
? resolutionInfo claims = claimResult ? claimResult.claims_in_channel : [];
: { claims_in_channel: [] };
dispatch({ dispatch({
type: types.FETCH_CHANNEL_CLAIMS_COMPLETED, type: types.FETCH_CHANNEL_CLAIMS_COMPLETED,
data: { data: {
uri, uri,
claims: claims_in_channel, claims: claims,
}, },
}); });
}); });

11
ui/js/actions/file_info.js
View file

@ -89,7 +89,7 @@ export function doDeleteFile(outpoint, deleteFromComputer) {
lbry.file_delete({ lbry.file_delete({
outpoint: outpoint, outpoint: outpoint,
delete_target_file: deleteFromComputer, delete_from_download_dir: deleteFromComputer,
}); });
dispatch(doCloseModal()); dispatch(doCloseModal());
@ -102,12 +102,7 @@ export function doFetchFileInfosAndPublishedClaims() {
isClaimListMinePending = selectClaimListMineIsPending(state), isClaimListMinePending = selectClaimListMineIsPending(state),
isFileInfoListPending = selectFileListIsPending(state); isFileInfoListPending = selectFileListIsPending(state);
if (isClaimListMinePending === undefined) { dispatch(doFetchClaimListMine());
dispatch(doFetchClaimListMine()); dispatch(doFileList());
}
if (isFileInfoListPending === undefined) {
dispatch(doFileList());
}
}; };
} }

9
ui/js/actions/search.js
View file

@ -4,6 +4,7 @@ import lighthouse from "lighthouse";
import { doResolveUri } from "actions/content"; import { doResolveUri } from "actions/content";
import { doNavigate, doHistoryPush } from "actions/app"; import { doNavigate, doHistoryPush } from "actions/app";
import { selectCurrentPage } from "selectors/app"; import { selectCurrentPage } from "selectors/app";
import batchActions from "util/batchActions";
export function doSearch(query) { export function doSearch(query) {
return function(dispatch, getState) { return function(dispatch, getState) {
@ -25,22 +26,26 @@ export function doSearch(query) {
dispatch(doNavigate("search", { query: query })); dispatch(doNavigate("search", { query: query }));
} else { } else {
lighthouse.search(query).then(results => { lighthouse.search(query).then(results => {
const actions = [];
results.forEach(result => { results.forEach(result => {
const uri = lbryuri.build({ const uri = lbryuri.build({
channelName: result.channel_name, channelName: result.channel_name,
contentName: result.name, contentName: result.name,
claimId: result.channel_id || result.claim_id, claimId: result.channel_id || result.claim_id,
}); });
dispatch(doResolveUri(uri)); actions.push(doResolveUri(uri));
}); });
dispatch({ actions.push({
type: types.SEARCH_COMPLETED, type: types.SEARCH_COMPLETED,
data: { data: {
query, query,
results, results,
}, },
}); });
dispatch(batchActions(...actions));
}); });
} }
}; };

16
ui/js/actions/wallet.js
View file

@ -22,7 +22,7 @@ export function doFetchTransactions() {
type: types.FETCH_TRANSACTIONS_STARTED, type: types.FETCH_TRANSACTIONS_STARTED,
}); });
lbry.call("transaction_list", {}, results => { lbry.transaction_list().then(results => {
dispatch({ dispatch({
type: types.FETCH_TRANSACTIONS_COMPLETED, type: types.FETCH_TRANSACTIONS_COMPLETED,
data: { data: {
@ -55,7 +55,7 @@ export function doCheckAddressIsMine(address) {
type: types.CHECK_ADDRESS_IS_MINE_STARTED, type: types.CHECK_ADDRESS_IS_MINE_STARTED,
}); });
lbry.checkAddressIsMine(address, isMine => { lbry.wallet_is_address_mine({ address }).then(isMine => {
if (!isMine) dispatch(doGetNewAddress()); if (!isMine) dispatch(doGetNewAddress());
dispatch({ dispatch({
@ -103,12 +103,12 @@ export function doSendDraftTransaction() {
dispatch(doOpenModal("transactionFailed")); dispatch(doOpenModal("transactionFailed"));
}; };
lbry.sendToAddress( lbry
draftTx.amount, .send_amount_to_address({
draftTx.address, amount: draftTx.amount,
successCallback, address: draftTx.address,
errorCallback })
); .then(successCallback, errorCallback);
}; };
} }

4
ui/js/component/file-selector.js
View file

@ -21,7 +21,9 @@ class FileSelector extends React.PureComponent {
handleButtonClick() { handleButtonClick() {
remote.dialog.showOpenDialog( remote.dialog.showOpenDialog(
{ {
properties: [this.props.type == "file" ? "openFile" : "openDirectory"], properties: this.props.type == "file"
? ["openFile"]
: ["openDirectory", "createDirectory"],
}, },
paths => { paths => {
if (!paths) { if (!paths) {

3
ui/js/component/fileActions/index.js
View file

@ -28,7 +28,8 @@ const makeSelect = () => {
const select = (state, props) => ({ const select = (state, props) => ({
fileInfo: selectFileInfoForUri(state, props), fileInfo: selectFileInfoForUri(state, props),
isAvailable: selectIsAvailableForUri(state, props), /*availability check is disabled due to poor performance, TBD if it dies forever or requires daemon fix*/
isAvailable: true, //selectIsAvailableForUri(state, props),
platform: selectPlatform(state), platform: selectPlatform(state),
modal: selectCurrentModal(state), modal: selectCurrentModal(state),
downloading: selectDownloadingForUri(state, props), downloading: selectDownloadingForUri(state, props),

3
ui/js/component/fileCard/index.js
View file

@ -1,7 +1,7 @@
import React from "react"; import React from "react";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { doNavigate } from "actions/app"; import { doNavigate } from "actions/app";
import { doResolveUri, doCancelResolveUri } from "actions/content"; import { doResolveUri } from "actions/content";
import { selectObscureNsfw } from "selectors/app"; import { selectObscureNsfw } from "selectors/app";
import { import {
makeSelectClaimForUri, makeSelectClaimForUri,
@ -31,7 +31,6 @@ const makeSelect = () => {
const perform = dispatch => ({ const perform = dispatch => ({
navigate: (path, params) => dispatch(doNavigate(path, params)), navigate: (path, params) => dispatch(doNavigate(path, params)),
resolveUri: uri => dispatch(doResolveUri(uri)), resolveUri: uri => dispatch(doResolveUri(uri)),
cancelResolveUri: uri => dispatch(doCancelResolveUri(uri)),
}); });
export default connect(makeSelect, perform)(FileCard); export default connect(makeSelect, perform)(FileCard);

14
ui/js/component/fileCard/view.jsx
View file

@ -23,14 +23,6 @@ class FileCard extends React.PureComponent {
} }
} }
componentWillUnmount() {
const { isResolvingUri, cancelResolveUri, uri } = this.props;
if (isResolvingUri) {
cancelResolveUri(uri);
}
}
handleMouseOver() { handleMouseOver() {
this.setState({ this.setState({
hovered: true, hovered: true,
@ -47,13 +39,11 @@ class FileCard extends React.PureComponent {
const { claim, fileInfo, metadata, isResolvingUri, navigate } = this.props; const { claim, fileInfo, metadata, isResolvingUri, navigate } = this.props;
const uri = lbryuri.normalize(this.props.uri); const uri = lbryuri.normalize(this.props.uri);
const title = !isResolvingUri && metadata && metadata.title const title = metadata && metadata.title ? metadata.title : uri;
? metadata.title
: uri;
const obscureNsfw = this.props.obscureNsfw && metadata && metadata.nsfw; const obscureNsfw = this.props.obscureNsfw && metadata && metadata.nsfw;
let description = ""; let description = "";
if (isResolvingUri) { if (isResolvingUri && !claim) {
description = __("Loading..."); description = __("Loading...");
} else if (metadata && metadata.description) { } else if (metadata && metadata.description) {
description = metadata.description; description = metadata.description;

2
ui/js/component/fileList/view.jsx
View file

@ -82,7 +82,7 @@ class FileList extends React.PureComponent {
}); });
return ( return (
<section className="file-list__header"> <section className="file-list__header">
{fetching && <span className="busy-indicator" />} {fetching && <BusyMessage />}
<span className="sort-section"> <span className="sort-section">
{__("Sort by")} {" "} {__("Sort by")} {" "}
<FormField type="select" onChange={this.handleSortChanged.bind(this)}> <FormField type="select" onChange={this.handleSortChanged.bind(this)}>

8
ui/js/component/fileTile/view.jsx
View file

@ -19,14 +19,14 @@ class FileTile extends React.PureComponent {
} }
componentDidMount() { componentDidMount() {
this.resolve(this.props); const { isResolvingUri, claim, uri, resolveUri } = this.props;
if (!isResolvingUri && !claim && uri) resolveUri(uri);
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
this.resolve(nextProps); const { isResolvingUri, claim, uri, resolveUri } = this.props;
}
resolve({ isResolvingUri, claim, uri, resolveUri }) {
if (!isResolvingUri && claim === undefined && uri) resolveUri(uri); if (!isResolvingUri && claim === undefined && uri) resolveUri(uri);
} }

2
ui/js/component/uriIndicator/view.jsx
View file

@ -21,7 +21,7 @@ class UriIndicator extends React.PureComponent {
render() { render() {
const { claim, uri, isResolvingUri } = this.props; const { claim, uri, isResolvingUri } = this.props;
if (isResolvingUri) { if (isResolvingUri && !claim) {
return <span className="empty">Validating...</span>; return <span className="empty">Validating...</span>;
} }

1
ui/js/constants/action_types.js
View file

@ -39,7 +39,6 @@ export const FETCH_FEATURED_CONTENT_COMPLETED =
"FETCH_FEATURED_CONTENT_COMPLETED"; "FETCH_FEATURED_CONTENT_COMPLETED";
export const RESOLVE_URI_STARTED = "RESOLVE_URI_STARTED"; export const RESOLVE_URI_STARTED = "RESOLVE_URI_STARTED";
export const RESOLVE_URI_COMPLETED = "RESOLVE_URI_COMPLETED"; export const RESOLVE_URI_COMPLETED = "RESOLVE_URI_COMPLETED";
export const RESOLVE_URI_CANCELED = "RESOLVE_URI_CANCELED";
export const FETCH_CHANNEL_CLAIMS_STARTED = "FETCH_CHANNEL_CLAIMS_STARTED"; export const FETCH_CHANNEL_CLAIMS_STARTED = "FETCH_CHANNEL_CLAIMS_STARTED";
export const FETCH_CHANNEL_CLAIMS_COMPLETED = "FETCH_CHANNEL_CLAIMS_COMPLETED"; export const FETCH_CHANNEL_CLAIMS_COMPLETED = "FETCH_CHANNEL_CLAIMS_COMPLETED";
export const FETCH_CLAIM_LIST_MINE_STARTED = "FETCH_CLAIM_LIST_MINE_STARTED"; export const FETCH_CLAIM_LIST_MINE_STARTED = "FETCH_CLAIM_LIST_MINE_STARTED";

731
ui/js/lbry.js
View file

@ -1,50 +1,61 @@
import lbryio from './lbryio.js'; import lbryio from "./lbryio.js";
import lighthouse from './lighthouse.js'; import lighthouse from "./lighthouse.js";
import jsonrpc from './jsonrpc.js'; import jsonrpc from "./jsonrpc.js";
import lbryuri from './lbryuri.js'; import lbryuri from "./lbryuri.js";
import { getLocal, getSession, setSession, setLocal } from './utils.js'; import { getLocal, getSession, setSession, setLocal } from "./utils.js";
const { remote, ipcRenderer } = require('electron'); const { remote, ipcRenderer } = require("electron");
const menu = remote.require('./menu/main-menu'); const menu = remote.require("./menu/main-menu");
let lbry = { let lbry = {
isConnected: false, isConnected: false,
daemonConnectionString: 'http://localhost:5279/lbryapi', daemonConnectionString: "http://localhost:5279/lbryapi",
pendingPublishTimeout: 20 * 60 * 1000, pendingPublishTimeout: 20 * 60 * 1000,
defaultClientSettings: { defaultClientSettings: {
showNsfw: false, showNsfw: false,
showUnavailable: true, showUnavailable: true,
debug: false, debug: false,
useCustomLighthouseServers: false, useCustomLighthouseServers: false,
customLighthouseServers: [], customLighthouseServers: [],
showDeveloperMenu: false, showDeveloperMenu: false,
language: 'en' language: "en",
} },
}; };
function apiCall(method, params, resolve, reject) {
return jsonrpc.call(
lbry.daemonConnectionString,
method,
params,
resolve,
reject,
reject
);
}
/** /**
* Records a publish attempt in local storage. Returns a dictionary with all the data needed to * Records a publish attempt in local storage. Returns a dictionary with all the data needed to
* needed to make a dummy claim or file info object. * needed to make a dummy claim or file info object.
*/ */
function savePendingPublish({ name, channel_name }) { function savePendingPublish({ name, channel_name }) {
let uri; let uri;
if (channel_name) { if (channel_name) {
uri = lbryuri.build({ name: channel_name, path: name }, false); uri = lbryuri.build({ name: channel_name, path: name }, false);
} else { } else {
uri = lbryuri.build({ name: name }, false); uri = lbryuri.build({ name: name }, false);
} }
const pendingPublishes = getLocal('pendingPublishes') || []; const pendingPublishes = getLocal("pendingPublishes") || [];
const newPendingPublish = { const newPendingPublish = {
name, name,
channel_name, channel_name,
claim_id: 'pending_claim_' + uri, claim_id: "pending_claim_" + uri,
txid: 'pending_' + uri, txid: "pending_" + uri,
nout: 0, nout: 0,
outpoint: 'pending_' + uri + ':0', outpoint: "pending_" + uri + ":0",
time: Date.now() time: Date.now(),
}; };
setLocal('pendingPublishes', [...pendingPublishes, newPendingPublish]); setLocal("pendingPublishes", [...pendingPublishes, newPendingPublish]);
return newPendingPublish; return newPendingPublish;
} }
/** /**
@ -52,18 +63,18 @@ function savePendingPublish({ name, channel_name }) {
* A channel name may also be provided along with name. * A channel name may also be provided along with name.
*/ */
function removePendingPublishIfNeeded({ name, channel_name, outpoint }) { function removePendingPublishIfNeeded({ name, channel_name, outpoint }) {
function pubMatches(pub) { function pubMatches(pub) {
return ( return (
pub.outpoint === outpoint || pub.outpoint === outpoint ||
(pub.name === name && (pub.name === name &&
(!channel_name || pub.channel_name === channel_name)) (!channel_name || pub.channel_name === channel_name))
); );
} }
setLocal( setLocal(
'pendingPublishes', "pendingPublishes",
lbry.getPendingPublishes().filter(pub => !pubMatches(pub)) lbry.getPendingPublishes().filter(pub => !pubMatches(pub))
); );
} }
/** /**
@ -71,12 +82,12 @@ function removePendingPublishIfNeeded({ name, channel_name, outpoint }) {
* removes them from the list. * removes them from the list.
*/ */
lbry.getPendingPublishes = function() { lbry.getPendingPublishes = function() {
const pendingPublishes = getLocal('pendingPublishes') || []; const pendingPublishes = getLocal("pendingPublishes") || [];
const newPendingPublishes = pendingPublishes.filter( const newPendingPublishes = pendingPublishes.filter(
pub => Date.now() - pub.time <= lbry.pendingPublishTimeout pub => Date.now() - pub.time <= lbry.pendingPublishTimeout
); );
setLocal('pendingPublishes', newPendingPublishes); setLocal("pendingPublishes", newPendingPublishes);
return newPendingPublishes; return newPendingPublishes;
}; };
/** /**
@ -84,97 +95,61 @@ lbry.getPendingPublishes = function() {
* provided along withe the name. If no pending publish is found, returns null. * provided along withe the name. If no pending publish is found, returns null.
*/ */
function getPendingPublish({ name, channel_name, outpoint }) { function getPendingPublish({ name, channel_name, outpoint }) {
const pendingPublishes = lbry.getPendingPublishes(); const pendingPublishes = lbry.getPendingPublishes();
return ( return (
pendingPublishes.find( pendingPublishes.find(
pub => pub =>
pub.outpoint === outpoint || pub.outpoint === outpoint ||
(pub.name === name && (pub.name === name &&
(!channel_name || pub.channel_name === channel_name)) (!channel_name || pub.channel_name === channel_name))
) || null ) || null
); );
} }
function pendingPublishToDummyClaim({ function pendingPublishToDummyClaim({
channel_name, channel_name,
name, name,
outpoint, outpoint,
claim_id, claim_id,
txid, txid,
nout nout,
}) { }) {
return { name, outpoint, claim_id, txid, nout, channel_name }; return { name, outpoint, claim_id, txid, nout, channel_name };
} }
function pendingPublishToDummyFileInfo({ name, outpoint, claim_id }) { function pendingPublishToDummyFileInfo({ name, outpoint, claim_id }) {
return { name, outpoint, claim_id, metadata: null }; return { name, outpoint, claim_id, metadata: null };
} }
lbry.call = function(
method,
params,
callback,
errorCallback,
connectFailedCallback
) {
return jsonrpc.call(
lbry.daemonConnectionString,
method,
params,
callback,
errorCallback,
connectFailedCallback
);
};
//core //core
lbry._connectPromise = null; lbry._connectPromise = null;
lbry.connect = function() { lbry.connect = function() {
if (lbry._connectPromise === null) { if (lbry._connectPromise === null) {
lbry._connectPromise = new Promise((resolve, reject) => { lbry._connectPromise = new Promise((resolve, reject) => {
let tryNum = 0; let tryNum = 0;
function checkDaemonStartedFailed() { function checkDaemonStartedFailed() {
if (tryNum <= 100) { if (tryNum <= 200) {
// Move # of tries into constant or config option // Move # of tries into constant or config option
setTimeout(() => { setTimeout(() => {
tryNum++; tryNum++;
checkDaemonStarted(); checkDaemonStarted();
}, tryNum < 50 ? 400 : 1000); }, tryNum < 50 ? 400 : 1000);
} else { } else {
reject(new Error('Unable to connect to LBRY')); reject(new Error("Unable to connect to LBRY"));
} }
} }
// Check every half second to see if the daemon is accepting connections // Check every half second to see if the daemon is accepting connections
function checkDaemonStarted() { function checkDaemonStarted() {
lbry.call( lbry.status().then(resolve).catch(checkDaemonStartedFailed);
'status', }
{},
resolve,
checkDaemonStartedFailed,
checkDaemonStartedFailed
);
}
checkDaemonStarted(); checkDaemonStarted();
}); });
} }
return lbry._connectPromise; return lbry._connectPromise;
};
lbry.checkAddressIsMine = function(address, callback) {
lbry.call('wallet_is_address_mine', { address: address }, callback);
};
lbry.sendToAddress = function(amount, address, callback, errorCallback) {
lbry.call(
'send_amount_to_address',
{ amount: amount, address: address },
callback,
errorCallback
);
}; };
/** /**
@ -189,46 +164,46 @@ lbry.sendToAddress = function(amount, address, callback, errorCallback) {
*/ */
lbry.costPromiseCache = {}; lbry.costPromiseCache = {};
lbry.getCostInfo = function(uri) { lbry.getCostInfo = function(uri) {
if (lbry.costPromiseCache[uri] === undefined) { if (lbry.costPromiseCache[uri] === undefined) {
lbry.costPromiseCache[uri] = new Promise((resolve, reject) => { lbry.costPromiseCache[uri] = new Promise((resolve, reject) => {
const COST_INFO_CACHE_KEY = 'cost_info_cache'; const COST_INFO_CACHE_KEY = "cost_info_cache";
let costInfoCache = getSession(COST_INFO_CACHE_KEY, {}); let costInfoCache = getSession(COST_INFO_CACHE_KEY, {});
function cacheAndResolve(cost, includesData) { function cacheAndResolve(cost, includesData) {
costInfoCache[uri] = { cost, includesData }; costInfoCache[uri] = { cost, includesData };
setSession(COST_INFO_CACHE_KEY, costInfoCache); setSession(COST_INFO_CACHE_KEY, costInfoCache);
resolve({ cost, includesData }); resolve({ cost, includesData });
} }
if (!uri) { if (!uri) {
return reject(new Error(`URI required.`)); return reject(new Error(`URI required.`));
} }
if (costInfoCache[uri] && costInfoCache[uri].cost) { if (costInfoCache[uri] && costInfoCache[uri].cost) {
return resolve(costInfoCache[uri]); return resolve(costInfoCache[uri]);
} }
function getCost(uri, size) { function getCost(uri, size) {
lbry lbry
.stream_cost_estimate({ uri, ...(size !== null ? { size } : {}) }) .stream_cost_estimate({ uri, ...(size !== null ? { size } : {}) })
.then(cost => { .then(cost => {
cacheAndResolve(cost, size !== null); cacheAndResolve(cost, size !== null);
}, reject); }, reject);
} }
const uriObj = lbryuri.parse(uri); const uriObj = lbryuri.parse(uri);
const name = uriObj.path || uriObj.name; const name = uriObj.path || uriObj.name;
lighthouse.get_size_for_name(name).then(size => { lighthouse.get_size_for_name(name).then(size => {
if (size) { if (size) {
getCost(name, size); getCost(name, size);
} else { } else {
getCost(name, null); getCost(name, null);
} }
}); });
}); });
} }
return lbry.costPromiseCache[uri]; return lbry.costPromiseCache[uri];
}; };
/** /**
@ -238,144 +213,124 @@ lbry.getCostInfo = function(uri) {
* This currently includes a work-around to cache the file in local storage so that the pending * This currently includes a work-around to cache the file in local storage so that the pending
* publish can appear in the UI immediately. * publish can appear in the UI immediately.
*/ */
lbry.publish = function( lbry.publishDeprecated = function(
params, params,
fileListedCallback, fileListedCallback,
publishedCallback, publishedCallback,
errorCallback errorCallback
) { ) {
lbry.call( lbry.publish(params).then(
'publish', result => {
params, if (returnedPending) {
result => { return;
if (returnedPending) { }
return;
}
clearTimeout(returnPendingTimeout); clearTimeout(returnPendingTimeout);
publishedCallback(result); publishedCallback(result);
}, },
err => { err => {
if (returnedPending) { if (returnedPending) {
return; return;
} }
clearTimeout(returnPendingTimeout); clearTimeout(returnPendingTimeout);
errorCallback(err); errorCallback(err);
} }
); );
let returnedPending = false; let returnedPending = false;
// Give a short grace period in case publish() returns right away or (more likely) gives an error // Give a short grace period in case publish() returns right away or (more likely) gives an error
const returnPendingTimeout = setTimeout(() => { const returnPendingTimeout = setTimeout(() => {
returnedPending = true; returnedPending = true;
if (publishedCallback) { if (publishedCallback) {
savePendingPublish({ savePendingPublish({
name: params.name, name: params.name,
channel_name: params.channel_name channel_name: params.channel_name,
}); });
publishedCallback(true); publishedCallback(true);
} }
if (fileListedCallback) { if (fileListedCallback) {
const { name, channel_name } = params; const { name, channel_name } = params;
savePendingPublish({ savePendingPublish({
name: params.name, name: params.name,
channel_name: params.channel_name channel_name: params.channel_name,
}); });
fileListedCallback(true); fileListedCallback(true);
} }
}, 2000); }, 2000);
}; };
lbry.getClientSettings = function() { lbry.getClientSettings = function() {
var outSettings = {}; var outSettings = {};
for (let setting of Object.keys(lbry.defaultClientSettings)) { for (let setting of Object.keys(lbry.defaultClientSettings)) {
var localStorageVal = localStorage.getItem('setting_' + setting); var localStorageVal = localStorage.getItem("setting_" + setting);
outSettings[setting] = localStorageVal === null outSettings[setting] = localStorageVal === null
? lbry.defaultClientSettings[setting] ? lbry.defaultClientSettings[setting]
: JSON.parse(localStorageVal); : JSON.parse(localStorageVal);
} }
return outSettings; return outSettings;
}; };
lbry.getClientSetting = function(setting) { lbry.getClientSetting = function(setting) {
var localStorageVal = localStorage.getItem('setting_' + setting); var localStorageVal = localStorage.getItem("setting_" + setting);
if (setting == 'showDeveloperMenu') { if (setting == "showDeveloperMenu") {
return true; return true;
} }
return localStorageVal === null return localStorageVal === null
? lbry.defaultClientSettings[setting] ? lbry.defaultClientSettings[setting]
: JSON.parse(localStorageVal); : JSON.parse(localStorageVal);
}; };
lbry.setClientSettings = function(settings) { lbry.setClientSettings = function(settings) {
for (let setting of Object.keys(settings)) { for (let setting of Object.keys(settings)) {
lbry.setClientSetting(setting, settings[setting]); lbry.setClientSetting(setting, settings[setting]);
} }
}; };
lbry.setClientSetting = function(setting, value) { lbry.setClientSetting = function(setting, value) {
return localStorage.setItem('setting_' + setting, JSON.stringify(value)); return localStorage.setItem("setting_" + setting, JSON.stringify(value));
};
lbry.getSessionInfo = function(callback) {
lbry.call('status', { session_status: true }, callback);
};
lbry.reportBug = function(message, callback) {
lbry.call(
'report_bug',
{
message: message
},
callback
);
}; };
//utilities //utilities
lbry.formatCredits = function(amount, precision) { lbry.formatCredits = function(amount, precision) {
return amount.toFixed(precision || 1).replace(/\.?0+$/, ''); return amount.toFixed(precision || 1).replace(/\.?0+$/, "");
}; };
lbry.formatName = function(name) { lbry.formatName = function(name) {
// Converts LBRY name to standard format (all lower case, no special characters, spaces replaced by dashes) // Converts LBRY name to standard format (all lower case, no special characters, spaces replaced by dashes)
name = name.replace('/s+/g', '-'); name = name.replace("/s+/g", "-");
name = name.toLowerCase().replace(/[^a-z0-9\-]/g, ''); name = name.toLowerCase().replace(/[^a-z0-9\-]/g, "");
return name; return name;
}; };
lbry.imagePath = function(file) { lbry.imagePath = function(file) {
return 'img/' + file; return "img/" + file;
}; };
lbry.getMediaType = function(contentType, fileName) { lbry.getMediaType = function(contentType, fileName) {
if (contentType) { if (contentType) {
return /^[^/]+/.exec(contentType)[0]; return /^[^/]+/.exec(contentType)[0];
} else if (fileName) { } else if (fileName) {
var dotIndex = fileName.lastIndexOf('.'); var dotIndex = fileName.lastIndexOf(".");
if (dotIndex == -1) { if (dotIndex == -1) {
return 'unknown'; return "unknown";
} }
var ext = fileName.substr(dotIndex + 1); var ext = fileName.substr(dotIndex + 1);
if (/^mp4|mov|m4v|flv|f4v$/i.test(ext)) { if (/^mp4|mov|m4v|flv|f4v$/i.test(ext)) {
return 'video'; return "video";
} else if (/^mp3|m4a|aac|wav|flac|ogg$/i.test(ext)) { } else if (/^mp3|m4a|aac|wav|flac|ogg$/i.test(ext)) {
return 'audio'; return "audio";
} else if (/^html|htm|pdf|odf|doc|docx|md|markdown|txt$/i.test(ext)) { } else if (/^html|htm|pdf|odf|doc|docx|md|markdown|txt$/i.test(ext)) {
return 'document'; return "document";
} else { } else {
return 'unknown'; return "unknown";
} }
} else { } else {
return 'unknown'; return "unknown";
} }
};
lbry.stop = function(callback) {
lbry.call('stop', {}, callback);
}; };
lbry._subscribeIdCount = 0; lbry._subscribeIdCount = 0;
@ -384,57 +339,57 @@ lbry._balanceSubscribeInterval = 5000;
lbry._balanceUpdateInterval = null; lbry._balanceUpdateInterval = null;
lbry._updateBalanceSubscribers = function() { lbry._updateBalanceSubscribers = function() {
lbry.wallet_balance().then(function(balance) { lbry.wallet_balance().then(function(balance) {
for (let callback of Object.values(lbry._balanceSubscribeCallbacks)) { for (let callback of Object.values(lbry._balanceSubscribeCallbacks)) {
callback(balance); callback(balance);
} }
}); });
if ( if (
!lbry._balanceUpdateInterval && !lbry._balanceUpdateInterval &&
Object.keys(lbry._balanceSubscribeCallbacks).length Object.keys(lbry._balanceSubscribeCallbacks).length
) { ) {
lbry._balanceUpdateInterval = setInterval(() => { lbry._balanceUpdateInterval = setInterval(() => {
lbry._updateBalanceSubscribers(); lbry._updateBalanceSubscribers();
}, lbry._balanceSubscribeInterval); }, lbry._balanceSubscribeInterval);
} }
}; };
lbry.balanceSubscribe = function(callback) { lbry.balanceSubscribe = function(callback) {
const subscribeId = ++lbry._subscribeIdCount; const subscribeId = ++lbry._subscribeIdCount;
lbry._balanceSubscribeCallbacks[subscribeId] = callback; lbry._balanceSubscribeCallbacks[subscribeId] = callback;
lbry._updateBalanceSubscribers(); lbry._updateBalanceSubscribers();
return subscribeId; return subscribeId;
}; };
lbry.balanceUnsubscribe = function(subscribeId) { lbry.balanceUnsubscribe = function(subscribeId) {
delete lbry._balanceSubscribeCallbacks[subscribeId]; delete lbry._balanceSubscribeCallbacks[subscribeId];
if ( if (
lbry._balanceUpdateInterval && lbry._balanceUpdateInterval &&
!Object.keys(lbry._balanceSubscribeCallbacks).length !Object.keys(lbry._balanceSubscribeCallbacks).length
) { ) {
clearInterval(lbry._balanceUpdateInterval); clearInterval(lbry._balanceUpdateInterval);
} }
}; };
lbry.showMenuIfNeeded = function() { lbry.showMenuIfNeeded = function() {
const showingMenu = sessionStorage.getItem('menuShown') || null; const showingMenu = sessionStorage.getItem("menuShown") || null;
const chosenMenu = lbry.getClientSetting('showDeveloperMenu') const chosenMenu = lbry.getClientSetting("showDeveloperMenu")
? 'developer' ? "developer"
: 'normal'; : "normal";
if (chosenMenu != showingMenu) { if (chosenMenu != showingMenu) {
menu.showMenubar(chosenMenu == 'developer'); menu.showMenubar(chosenMenu == "developer");
} }
sessionStorage.setItem('menuShown', chosenMenu); sessionStorage.setItem("menuShown", chosenMenu);
}; };
lbry.getAppVersionInfo = function() { lbry.getAppVersionInfo = function() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
ipcRenderer.once('version-info-received', (event, versionInfo) => { ipcRenderer.once("version-info-received", (event, versionInfo) => {
resolve(versionInfo); resolve(versionInfo);
}); });
ipcRenderer.send('version-info-requested'); ipcRenderer.send("version-info-requested");
}); });
}; };
/** /**
@ -447,117 +402,99 @@ lbry.getAppVersionInfo = function() {
* (If a real publish with the same name is found, the pending publish will be ignored and removed.) * (If a real publish with the same name is found, the pending publish will be ignored and removed.)
*/ */
lbry.file_list = function(params = {}) { lbry.file_list = function(params = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const { name, channel_name, outpoint } = params; const { name, channel_name, outpoint } = params;
/** /**
* If we're searching by outpoint, check first to see if there's a matching pending publish. * If we're searching by outpoint, check first to see if there's a matching pending publish.
* Pending publishes use their own faux outpoints that are always unique, so we don't need * Pending publishes use their own faux outpoints that are always unique, so we don't need
* to check if there's a real file. * to check if there's a real file.
*/ */
if (outpoint) { if (outpoint) {
const pendingPublish = getPendingPublish({ outpoint }); const pendingPublish = getPendingPublish({ outpoint });
if (pendingPublish) { if (pendingPublish) {
resolve([pendingPublishToDummyFileInfo(pendingPublish)]); resolve([pendingPublishToDummyFileInfo(pendingPublish)]);
return; return;
} }
} }
apiCall(
"file_list",
params,
fileInfos => {
removePendingPublishIfNeeded({ name, channel_name, outpoint });
lbry.call( const dummyFileInfos = lbry
'file_list', .getPendingPublishes()
params, .map(pendingPublishToDummyFileInfo);
fileInfos => { resolve([...fileInfos, ...dummyFileInfos]);
removePendingPublishIfNeeded({ name, channel_name, outpoint }); },
reject
const dummyFileInfos = lbry );
.getPendingPublishes() });
.map(pendingPublishToDummyFileInfo);
resolve([...fileInfos, ...dummyFileInfos]);
},
reject,
reject
);
});
}; };
lbry.claim_list_mine = function(params = {}) { lbry.claim_list_mine = function(params = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
lbry.call( apiCall(
'claim_list_mine', "claim_list_mine",
params, params,
claims => { claims => {
for (let { name, channel_name, txid, nout } of claims) { for (let { name, channel_name, txid, nout } of claims) {
removePendingPublishIfNeeded({ removePendingPublishIfNeeded({
name, name,
channel_name, channel_name,
outpoint: txid + ':' + nout outpoint: txid + ":" + nout,
}); });
} }
const dummyClaims = lbry const dummyClaims = lbry
.getPendingPublishes() .getPendingPublishes()
.map(pendingPublishToDummyClaim); .map(pendingPublishToDummyClaim);
resolve([...claims, ...dummyClaims]); resolve([...claims, ...dummyClaims]);
}, },
reject, reject
reject );
); });
});
}; };
const claimCacheKey = 'resolve_claim_cache';
lbry._claimCache = getSession(claimCacheKey, {});
lbry._resolveXhrs = {}; lbry._resolveXhrs = {};
lbry.resolve = function(params = {}) { lbry.resolve = function(params = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!params.uri) { if (!params.uri) {
throw __('Resolve has hacked cache on top of it that requires a URI'); throw __("Resolve has hacked cache on top of it that requires a URI");
} }
if (params.uri && lbry._claimCache[params.uri] !== undefined) { lbry._resolveXhrs[params.uri] = apiCall(
resolve(lbry._claimCache[params.uri]); "resolve",
} else { params,
lbry._resolveXhrs[params.uri] = lbry.call( function(data) {
'resolve', resolve(data && data[params.uri] ? data[params.uri] : {});
params, },
function(data) { reject
if (data !== undefined) { );
lbry._claimCache[params.uri] = data; });
}
setSession(claimCacheKey, lbry._claimCache);
resolve(data);
},
reject
);
}
});
}; };
lbry.cancelResolve = function(params = {}) { lbry.cancelResolve = function(params = {}) {
const xhr = lbry._resolveXhrs[params.uri]; const xhr = lbry._resolveXhrs[params.uri];
if (xhr && xhr.readyState > 0 && xhr.readyState < 4) { if (xhr && xhr.readyState > 0 && xhr.readyState < 4) {
xhr.abort(); xhr.abort();
} }
}; };
lbry = new Proxy(lbry, { lbry = new Proxy(lbry, {
get: function(target, name) { get: function(target, name) {
if (name in target) { if (name in target) {
return target[name]; return target[name];
} }
return function(params = {}) { return function(params = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
jsonrpc.call( apiCall(name, params, resolve, reject);
lbry.daemonConnectionString, });
name, };
params, },
resolve,
reject,
reject
);
});
};
}
}); });
export default lbry; export default lbry;

6
ui/js/main.js
View file

@ -49,6 +49,12 @@ ipcRenderer.on("open-uri-requested", (event, uri) => {
} }
}); });
ipcRenderer.on("open-menu", (event, uri) => {
if (uri && uri.startsWith("/help")) {
app.store.dispatch(doNavigate("/help"));
}
});
document.addEventListener("click", event => { document.addEventListener("click", event => {
var target = event.target; var target = event.target;
while (target && target !== document) { while (target && target !== document) {

2
ui/js/page/fileListDownloaded/view.jsx
View file

@ -12,7 +12,7 @@ import SubHeader from "component/subHeader";
class FileListDownloaded extends React.PureComponent { class FileListDownloaded extends React.PureComponent {
componentWillMount() { componentWillMount() {
this.props.fetchFileInfosDownloaded(); if (!this.props.isPending) this.props.fetchFileInfosDownloaded();
} }
render() { render() {

2
ui/js/page/fileListPublished/view.jsx
View file

@ -12,7 +12,7 @@ import SubHeader from "component/subHeader";
class FileListPublished extends React.PureComponent { class FileListPublished extends React.PureComponent {
componentWillMount() { componentWillMount() {
this.props.fetchFileListPublished(); if (!this.props.isPending) this.props.fetchFileListPublished();
} }
componentDidUpdate() { componentDidUpdate() {

5
ui/js/page/filePage/view.jsx
View file

@ -9,7 +9,7 @@ import Link from "component/link";
import UriIndicator from "component/uriIndicator"; import UriIndicator from "component/uriIndicator";
const FormatItem = props => { const FormatItem = props => {
const { contentType, metadata: { author, language, license } } = props; const { contentType, metadata: { language, license } } = props;
const mediaType = lbry.getMediaType(contentType); const mediaType = lbry.getMediaType(contentType);
@ -19,9 +19,6 @@ const FormatItem = props => {
<tr> <tr>
<td>{__("Content-Type")}</td><td>{mediaType}</td> <td>{__("Content-Type")}</td><td>{mediaType}</td>
</tr> </tr>
<tr>
<td>{__("Author")}</td><td>{author}</td>
</tr>
<tr> <tr>
<td>{__("Language")}</td><td>{language}</td> <td>{__("Language")}</td><td>{language}</td>
</tr> </tr>

4
ui/js/page/help/view.jsx
View file

@ -26,12 +26,12 @@ class HelpPage extends React.PureComponent {
upgradeAvailable: upgradeAvailable, upgradeAvailable: upgradeAvailable,
}); });
}); });
lbry.call("version", {}, info => { lbry.version().then(info => {
this.setState({ this.setState({
versionInfo: info, versionInfo: info,
}); });
}); });
lbry.getSessionInfo(info => { lbry.status({ session_status: true }).then(info => {
this.setState({ this.setState({
lbryId: info.lbry_id, lbryId: info.lbry_id,
}); });

2
ui/js/page/publish/view.jsx
View file

@ -134,7 +134,7 @@ class PublishPage extends React.PureComponent {
publishArgs.file_path = this.refs.file.getValue(); publishArgs.file_path = this.refs.file.getValue();
} }
lbry.publish( lbry.publishDeprecated(
publishArgs, publishArgs,
message => { message => {
this.handlePublishStarted(); this.handlePublishStarted();

42
ui/js/page/report.js
View file

@ -1,37 +1,45 @@
import React from "react"; import React from "react";
import Link from "component/link"; import Link from "component/link";
import { FormRow } from "component/form"; import { FormRow } from "component/form";
import Modal from "../component/modal.js"; import { doShowSnackBar } from "actions/app";
import lbry from "../lbry.js"; import lbry from "../lbry.js";
class ReportPage extends React.PureComponent { class ReportPage extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
submitting: false, submitting: false,
modal: null, message: "",
}; };
} }
submitMessage() { submitMessage() {
if (this._messageArea.value) { const message = this.state.message;
if (message) {
this.setState({ this.setState({
submitting: true, submitting: true,
}); });
lbry.reportBug(this._messageArea.value, () => { lbry.report_bug({ message }).then(() => {
this.setState({ this.setState({
submitting: false, submitting: false,
modal: "submitted",
}); });
// Display global notice
const action = doShowSnackBar({
message: __("Message received! Thanks for helping."),
isError: false,
});
window.app.store.dispatch(action);
}); });
this._messageArea.value = "";
this.setState({ message: "" });
} }
} }
closeModal() { onMessageChange(event) {
this.setState({ this.setState({
modal: null, message: event.target.value,
}); });
} }
@ -49,9 +57,12 @@ class ReportPage extends React.PureComponent {
<div className="form-row"> <div className="form-row">
<FormRow <FormRow
type="textarea" type="textarea"
ref={t => (this._messageArea = t)}
rows="10" rows="10"
name="message" name="message"
value={this.state.message}
onChange={event => {
this.onMessageChange(event);
}}
placeholder={__("Description of your issue")} placeholder={__("Description of your issue")}
/> />
</div> </div>
@ -83,17 +94,6 @@ class ReportPage extends React.PureComponent {
/>. />.
</div> </div>
</section> </section>
<Modal
isOpen={this.state.modal == "submitted"}
contentLabel={__("Bug report submitted")}
onConfirmed={event => {
this.closeModal(event);
}}
>
{__(
"Your bug report has been submitted! Thank you for your feedback."
)}
</Modal>
</main> </main>
); );
} }

2
ui/js/page/settings/index.js
View file

@ -1,5 +1,6 @@
import React from "react"; import React from "react";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { doClearCache } from "actions/app";
import { doSetDaemonSetting } from "actions/settings"; import { doSetDaemonSetting } from "actions/settings";
import { selectDaemonSettings } from "selectors/settings"; import { selectDaemonSettings } from "selectors/settings";
import SettingsPage from "./view"; import SettingsPage from "./view";
@ -10,6 +11,7 @@ const select = state => ({
const perform = dispatch => ({ const perform = dispatch => ({
setDaemonSetting: (key, value) => dispatch(doSetDaemonSetting(key, value)), setDaemonSetting: (key, value) => dispatch(doSetDaemonSetting(key, value)),
clearCache: () => dispatch(doClearCache()),
}); });
export default connect(select, perform)(SettingsPage); export default connect(select, perform)(SettingsPage);

38
ui/js/page/settings/view.jsx
View file

@ -2,6 +2,9 @@ import React from "react";
import { FormField, FormRow } from "component/form.js"; import { FormField, FormRow } from "component/form.js";
import SubHeader from "component/subHeader"; import SubHeader from "component/subHeader";
import lbry from "lbry.js"; import lbry from "lbry.js";
import Link from "component/link";
const { remote } = require("electron");
class SettingsPage extends React.PureComponent { class SettingsPage extends React.PureComponent {
constructor(props) { constructor(props) {
@ -15,9 +18,23 @@ class SettingsPage extends React.PureComponent {
showNsfw: lbry.getClientSetting("showNsfw"), showNsfw: lbry.getClientSetting("showNsfw"),
showUnavailable: lbry.getClientSetting("showUnavailable"), showUnavailable: lbry.getClientSetting("showUnavailable"),
language: lbry.getClientSetting("language"), language: lbry.getClientSetting("language"),
clearingCache: false,
}; };
} }
clearCache() {
this.setState({
clearingCache: true,
});
const success = () => {
this.setState({ clearingCache: false });
window.location.href = `${remote.app.getAppPath()}/dist/index.html`;
};
const clear = () => this.props.clearCache().then(success.bind(this));
setTimeout(clear, 1000, { once: true });
}
setDaemonSetting(name, value) { setDaemonSetting(name, value) {
this.props.setDaemonSetting(name, value); this.props.setDaemonSetting(name, value);
} }
@ -274,6 +291,27 @@ class SettingsPage extends React.PureComponent {
/> />
</div> </div>
</section> </section>
<section className="card">
<div className="card__content">
<h3>{__("Application Cache")}</h3>
</div>
<div className="card__content">
<p>
<Link
label={
this.state.clearingCache
? __("Clearing")
: __("Clear the cache")
}
icon="icon-trash"
button="alt"
onClick={this.clearCache.bind(this)}
disabled={this.state.clearingCache}
/>
</p>
</div>
</section>
</main> </main>
); );
} }

14
ui/js/page/showPage/view.jsx
View file

@ -6,15 +6,13 @@ import FilePage from "page/filePage";
class ShowPage extends React.PureComponent { class ShowPage extends React.PureComponent {
componentWillMount() { componentWillMount() {
this.resolve(this.props); const { isResolvingUri, resolveUri, uri } = this.props;
if (!isResolvingUri) resolveUri(uri);
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
this.resolve(nextProps); const { isResolvingUri, resolveUri, claim, uri } = this.props;
}
resolve(props) {
const { isResolvingUri, resolveUri, claim, uri } = props;
if (!isResolvingUri && claim === undefined && uri) { if (!isResolvingUri && claim === undefined && uri) {
resolveUri(uri); resolveUri(uri);
@ -26,7 +24,7 @@ class ShowPage extends React.PureComponent {
let innerContent = ""; let innerContent = "";
if (isResolvingUri || !claim) { if (isResolvingUri && !claim) {
innerContent = ( innerContent = (
<section className="card"> <section className="card">
<div className="card__inner"> <div className="card__inner">
@ -44,7 +42,7 @@ class ShowPage extends React.PureComponent {
</div> </div>
</section> </section>
); );
} else if (claim.name.length && claim.name[0] === "@") { } else if (claim && claim.name.length && claim.name[0] === "@") {
innerContent = <ChannelPage uri={uri} />; innerContent = <ChannelPage uri={uri} />;
} else if (claim) { } else if (claim) {
innerContent = <FilePage uri={uri} />; innerContent = <FilePage uri={uri} />;

9
ui/js/reducers/claims.js
View file

@ -26,15 +26,6 @@ reducers[types.RESOLVE_URI_COMPLETED] = function(state, action) {
}); });
}; };
reducers[types.RESOLVE_URI_CANCELED] = function(state, action) {
const uri = action.data.uri;
const newClaims = Object.assign({}, state.claimsByUri);
delete newClaims[uri];
return Object.assign({}, state, {
claimsByUri: newClaims,
});
};
reducers[types.FETCH_CLAIM_LIST_MINE_STARTED] = function(state, action) { reducers[types.FETCH_CLAIM_LIST_MINE_STARTED] = function(state, action) {
return Object.assign({}, state, { return Object.assign({}, state, {
isClaimListMinePending: true, isClaimListMinePending: true,

107
ui/js/store.js
View file

@ -1,50 +1,56 @@
const redux = require('redux'); import { createLogger } from "redux-logger";
const thunk = require('redux-thunk').default; import appReducer from "reducers/app";
import availabilityReducer from "reducers/availability";
import claimsReducer from "reducers/claims";
import contentReducer from "reducers/content";
import costInfoReducer from "reducers/cost_info";
import fileInfoReducer from "reducers/file_info";
import rewardsReducer from "reducers/rewards";
import searchReducer from "reducers/search";
import settingsReducer from "reducers/settings";
import userReducer from "reducers/user";
import walletReducer from "reducers/wallet";
import { persistStore, autoRehydrate } from "redux-persist";
import createCompressor from "redux-persist-transform-compress";
import createFilter from "redux-persist-transform-filter";
import { REHYDRATE } from "redux-persist/constants";
import createActionBuffer from "redux-action-buffer";
const localForage = require("localforage");
const redux = require("redux");
const thunk = require("redux-thunk").default;
const env = ENV; const env = ENV;
import { createLogger } from 'redux-logger';
import appReducer from 'reducers/app';
import availabilityReducer from 'reducers/availability';
import claimsReducer from 'reducers/claims';
import contentReducer from 'reducers/content';
import costInfoReducer from 'reducers/cost_info';
import fileInfoReducer from 'reducers/file_info';
import rewardsReducer from 'reducers/rewards';
import searchReducer from 'reducers/search';
import settingsReducer from 'reducers/settings';
import walletReducer from 'reducers/wallet';
import userReducer from 'reducers/user';
function isFunction(object) { function isFunction(object) {
return typeof object === 'function'; return typeof object === "function";
} }
function isNotFunction(object) { function isNotFunction(object) {
return !isFunction(object); return !isFunction(object);
} }
function createBulkThunkMiddleware() { function createBulkThunkMiddleware() {
return ({ dispatch, getState }) => next => action => { return ({ dispatch, getState }) => next => action => {
if (action.type === 'BATCH_ACTIONS') { if (action.type === "BATCH_ACTIONS") {
action.actions action.actions
.filter(isFunction) .filter(isFunction)
.map(actionFn => actionFn(dispatch, getState)); .map(actionFn => actionFn(dispatch, getState));
} }
return next(action); return next(action);
}; };
} }
function enableBatching(reducer) { function enableBatching(reducer) {
return function batchingReducer(state, action) { return function batchingReducer(state, action) {
switch (action.type) { switch (action.type) {
case 'BATCH_ACTIONS': case "BATCH_ACTIONS":
return action.actions return action.actions
.filter(isNotFunction) .filter(isNotFunction)
.reduce(batchingReducer, state); .reduce(batchingReducer, state);
default: default:
return reducer(state, action); return reducer(state, action);
} }
}; };
} }
const reducers = redux.combineReducers({ const reducers = redux.combineReducers({
@ -64,17 +70,36 @@ const reducers = redux.combineReducers({
const bulkThunk = createBulkThunkMiddleware(); const bulkThunk = createBulkThunkMiddleware();
const middleware = [thunk, bulkThunk]; const middleware = [thunk, bulkThunk];
if (env === 'development') { if (env === "development") {
const logger = createLogger({ const logger = createLogger({
collapsed: true collapsed: true,
}); });
middleware.push(logger); middleware.push(logger);
} }
middleware.push(createActionBuffer(REHYDRATE));
const createStoreWithMiddleware = redux.compose( const createStoreWithMiddleware = redux.compose(
redux.applyMiddleware(...middleware) autoRehydrate(),
redux.applyMiddleware(...middleware)
)(redux.createStore); )(redux.createStore);
const reduxStore = createStoreWithMiddleware(enableBatching(reducers)); const reduxStore = createStoreWithMiddleware(enableBatching(reducers));
const compressor = createCompressor();
const saveClaimsFilter = createFilter("claims", [
"byId",
"claimsByUri",
"myClaims",
]);
const persistOptions = {
whitelist: ["claims"],
// Order is important. Needs to be compressed last or other transforms can't
// read the data
transforms: [saveClaimsFilter, compressor],
debounce: 1000,
storage: localForage,
};
window.cacheStore = persistStore(reduxStore, persistOptions);
export default reduxStore; export default reduxStore;

1004
ui/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

11
ui/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "lbry-web-ui", "name": "lbry-web-ui",
"version": "0.12.0", "version": "0.12.2rc3",
"description": "LBRY UI", "description": "LBRY UI",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1", "test": "echo \"Error: no test specified\" && exit 1",
@ -26,6 +26,7 @@
"babel-preset-react": "^6.11.1", "babel-preset-react": "^6.11.1",
"from2": "^2.3.0", "from2": "^2.3.0",
"jshashes": "^1.0.6", "jshashes": "^1.0.6",
"localforage": "^1.5.0",
"node-sass": "^3.8.0", "node-sass": "^3.8.0",
"rc-progress": "^2.0.6", "rc-progress": "^2.0.6",
"react": "^15.4.0", "react": "^15.4.0",
@ -33,7 +34,11 @@
"react-modal": "^1.5.2", "react-modal": "^1.5.2",
"react-redux": "^5.0.3", "react-redux": "^5.0.3",
"redux": "^3.6.0", "redux": "^3.6.0",
"redux-action-buffer": "^1.1.0",
"redux-logger": "^3.0.1", "redux-logger": "^3.0.1",
"redux-persist": "^4.8.0",
"redux-persist-transform-compress": "^4.2.0",
"redux-persist-transform-filter": "0.0.10",
"redux-thunk": "^2.2.0", "redux-thunk": "^2.2.0",
"render-media": "^2.10.0", "render-media": "^2.10.0",
"reselect": "^3.0.0", "reselect": "^3.0.0",
@ -42,7 +47,7 @@
"devDependencies": { "devDependencies": {
"babel": "^6.5.2", "babel": "^6.5.2",
"babel-core": "^6.18.2", "babel-core": "^6.18.2",
"babel-loader": "^6.2.8", "babel-loader": "^6.4.1",
"babel-plugin-react-require": "^3.0.0", "babel-plugin-react-require": "^3.0.0",
"babel-polyfill": "^6.20.0", "babel-polyfill": "^6.20.0",
"babel-preset-es2015": "^6.18.0", "babel-preset-es2015": "^6.18.0",
@ -59,7 +64,7 @@
"lint-staged": "^3.6.0", "lint-staged": "^3.6.0",
"node-sass": "^3.13.0", "node-sass": "^3.13.0",
"prettier": "^1.4.2", "prettier": "^1.4.2",
"webpack": "^1.13.3", "webpack": "^2.6.1",
"webpack-dev-server": "^2.4.4", "webpack-dev-server": "^2.4.4",
"webpack-notifier": "^1.5.0", "webpack-notifier": "^1.5.0",
"webpack-target-electron-renderer": "^0.4.0", "webpack-target-electron-renderer": "^0.4.0",

57
ui/webpack.config.js
View file

@ -1,23 +1,23 @@
const path = require('path'); const path = require("path");
const webpack = require('webpack') const webpack = require("webpack")
const appPath = path.resolve(__dirname, 'js'); const appPath = path.resolve(__dirname, "js");
const PATHS = { const PATHS = {
app: path.join(__dirname, 'app'), app: path.join(__dirname, "app"),
dist: path.join(__dirname, 'dist') dist: path.join(__dirname, "dist")
}; };
module.exports = { module.exports = {
entry: ['babel-polyfill', './js/main.js'], entry: ["babel-polyfill", "./js/main.js"],
output: { output: {
path: path.join(PATHS.dist, 'js'), path: path.join(PATHS.dist, "js"),
publicPath: '/js/', publicPath: "/js/",
filename: "bundle.js" filename: "bundle.js"
}, },
devtool: 'source-map', devtool: "source-map",
resolve: { resolve: {
root: appPath, modules: [appPath, "node_modules"],
extensions: ['', '.js', '.jsx', '.css'], extensions: [".js", ".jsx", ".css"]
}, },
plugins: [ plugins: [
new webpack.DefinePlugin({ new webpack.DefinePlugin({
@ -25,29 +25,30 @@ module.exports = {
}), }),
], ],
module: { module: {
preLoaders: [ rules: [
{ {
test: /\.jsx?$/, test: /\.jsx?$/,
loaders: ['eslint'], enforce: "pre",
loaders: ["eslint"],
// define an include so we check just the files we need // define an include so we check just the files we need
include: PATHS.app include: PATHS.app
} },
], {
loaders: [ test: /\.css$/,
{ test: /\.css$/, loader: "style!css" }, use: ["style-loader", "css-loader"]
},
{ {
test: /\.jsx?$/, test: /\.jsx?$/,
loader: 'babel', exclude: /node_modules/,
query: { use: {
cacheDirectory: true, loader: "babel-loader",
presets:[ 'es2015', 'react', 'stage-2' ] options: {
cacheDirectory: true,
presets: [ "es2015", "react", "stage-2" ]
}
} }
}, }
{
test: /mime\.json$/,
loader: 'json',
},
] ]
}, },
target: 'electron-main', target: "electron-main",
}; };

63
ui/webpack.dev.config.js
View file

@ -1,59 +1,62 @@
const path = require('path'); const path = require("path");
const webpack = require('webpack') const webpack = require("webpack")
const WebpackNotifierPlugin = require('webpack-notifier') const WebpackNotifierPlugin = require("webpack-notifier")
const appPath = path.resolve(__dirname, 'js'); const appPath = path.resolve(__dirname, "js");
const PATHS = { const PATHS = {
app: path.join(__dirname, 'app'), app: path.join(__dirname, "app"),
dist: path.join(__dirname, '..', 'app', 'dist') dist: path.join(__dirname, "..", "app", "dist")
}; };
module.exports = { module.exports = {
entry: ['babel-polyfill', './js/main.js'], entry: ["babel-polyfill", "./js/main.js"],
output: { output: {
path: path.join(PATHS.dist, 'js'), path: path.join(PATHS.dist, "js"),
publicPath: '/js/', publicPath: "/js/",
filename: "bundle.js", filename: "bundle.js",
pathinfo: true pathinfo: true
}, },
debug: true,
cache: true, cache: true,
devtool: 'eval', devtool: "eval",
resolve: { resolve: {
root: appPath, modules: [appPath, "node_modules"],
extensions: ['', '.js', '.jsx', '.css'], extensions: [".js", ".jsx", ".css"]
}, },
plugins: [ plugins: [
new WebpackNotifierPlugin(), new WebpackNotifierPlugin(),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
ENV: JSON.stringify("development"), ENV: JSON.stringify("development"),
}), }),
new webpack.LoaderOptionsPlugin({
debug: true
})
], ],
module: { module: {
preLoaders: [ rules: [
{ {
test: /\.jsx?$/, test: /\.jsx?$/,
loaders: ['eslint'], enforce: "pre",
loaders: ["eslint"],
// define an include so we check just the files we need // define an include so we check just the files we need
include: PATHS.app include: PATHS.app
} },
], {
loaders: [ test: /\.css$/,
{ test: /\.css$/, loader: "style!css" }, use: ["style-loader", "css-loader"]
},
{ {
test: /\.jsx?$/, test: /\.jsx?$/,
loader: 'babel', exclude: /node_modules/,
query: { use: {
cacheDirectory: true, loader: "babel-loader",
presets:[ 'es2015', 'react', 'stage-2' ] options: {
cacheDirectory: true,
presets: [ "es2015", "react", "stage-2" ]
}
} }
}, }
{
test: /mime\.json$/,
loader: 'json',
},
] ]
}, },
target: 'electron-main', target: "electron-main",
}; };