diff --git a/ui/js/actions/app.js b/ui/js/actions/app.js index c35042a90..8ede77fee 100644 --- a/ui/js/actions/app.js +++ b/ui/js/actions/app.js @@ -43,7 +43,6 @@ export function doChangePath(path) { path, } }) - } } @@ -58,6 +57,7 @@ export function doHistoryPush(params, title, relativeUrl) { let pathParts = window.location.pathname.split('/') pathParts[pathParts.length - 1] = relativeUrl.replace(/^\//, '') const url = pathParts.join('/') + title += " - LBRY" history.pushState(params, title, url) window.document.title = title } diff --git a/ui/js/actions/content.js b/ui/js/actions/content.js index 9b98483b9..a3436fbbb 100644 --- a/ui/js/actions/content.js +++ b/ui/js/actions/content.js @@ -8,7 +8,7 @@ import { } from 'selectors/wallet' import { selectFileInfoForUri, - selectDownloadingByUri, + selectUrisDownloading, } from 'selectors/file_info' import { selectResolvingUris @@ -66,6 +66,7 @@ export function doCancelResolveUri(uri) { export function doFetchFeaturedUris() { return function(dispatch, getState) { + return const state = getState() dispatch({ @@ -81,22 +82,22 @@ export function doFetchFeaturedUris() { featuredUris[category] = Uris[category] } }) + // + // dispatch({ + // type: types.FETCH_FEATURED_CONTENT_COMPLETED, + // data: { + // categories: ["FOO"], + // uris: { FOO: ["lbry://gtasoc"]}, + // } + // }) dispatch({ type: types.FETCH_FEATURED_CONTENT_COMPLETED, data: { - categories: ["FOO"], - uris: { FOO: ["lbry://gtasoc"]}, + categories: Categories, + uris: featuredUris, } }) - - // dispatch({ - // type: types.FETCH_FEATURED_CONTENT_COMPLETED, - // data: { - // categories: Categories, - // uris: featuredUris, - // } - // }) } const failure = () => { @@ -219,7 +220,7 @@ export function doPurchaseUri(uri) { const balance = selectBalance(state) const fileInfo = selectFileInfoForUri(state, { uri }) const costInfo = selectCostInfoForUri(state, { uri }) - const downloadingByUri = selectDownloadingByUri(state) + const downloadingByUri = selectUrisDownloading(state) const alreadyDownloading = !!downloadingByUri[uri] const { cost } = costInfo @@ -268,18 +269,28 @@ export function doFetchClaimsByChannel(uri) { } = resolutionInfo ? resolutionInfo : { claims_in_channel: [] } dispatch({ - type: types.FETCH_CHANNEL_CLAIMS_STARTED, + type: types.FETCH_CHANNEL_CLAIMS_COMPLETED, data: { uri, claims: claims_in_channel } }) - }).catch(() => { + }) + } +} + +export function doClaimListMine() { + return function(dispatch, getState) { + dispatch({ + type: types.CLAIM_LIST_MINE_STARTED + }) + + + lbry.claim_list_mine().then((claims) => { dispatch({ - type: types.FETC, + type: types.CLAIM_LIST_MINE_COMPLETED, data: { - uri, - claims: [] + claims } }) }) diff --git a/ui/js/actions/file_info.js b/ui/js/actions/file_info.js index 8a187c2a4..23ba50e71 100644 --- a/ui/js/actions/file_info.js +++ b/ui/js/actions/file_info.js @@ -1,12 +1,16 @@ import * as types from 'constants/action_types' import lbry from 'lbry' +import { + doClaimListMine +} from 'actions/content' import { selectClaimsByUri, + selectClaimListMineIsPending, } from 'selectors/claims' import { - selectIsFileListPending, + selectFileListIsPending, selectAllFileInfos, - selectLoadingByUri, + selectUrisLoading, } from 'selectors/file_info' import { doCloseModal, @@ -21,7 +25,7 @@ export function doFetchFileInfo(uri) { const state = getState() const claim = selectClaimsByUri(state)[uri] const outpoint = claim ? `${claim.txid}:${claim.nout}` : null - const alreadyFetching = !!selectLoadingByUri(state)[uri] + const alreadyFetching = !!selectUrisLoading(state)[uri] if (!alreadyFetching) { dispatch({ @@ -31,12 +35,13 @@ export function doFetchFileInfo(uri) { } }) - lbry.file_list({outpoint: outpoint, full_status: true}).then(([fileInfo]) => { + lbry.file_list({outpoint: outpoint, full_status: true}).then(fileInfos => { + dispatch({ type: types.FETCH_FILE_INFO_COMPLETED, data: { outpoint, - fileInfo, + fileInfo: fileInfos && fileInfos.length ? fileInfos[0] : null, } }) }) @@ -44,10 +49,10 @@ export function doFetchFileInfo(uri) { } } -export function doFileList(uri) { +export function doFileList() { return function(dispatch, getState) { const state = getState() - const isPending = selectIsFileListPending(state) + const isPending = selectFileListIsPending(state) if (!isPending) { dispatch({ @@ -78,81 +83,39 @@ export function doOpenFileInFolder(fileInfo) { } } -export function doDeleteFile(uri, fileInfo, deleteFromComputer) { +export function doDeleteFile(outpoint, deleteFromComputer) { return function(dispatch, getState) { + dispatch({ - type: types.DELETE_FILE_STARTED, + type: types.FILE_DELETE, data: { - uri, - fileInfo, - deleteFromComputer, + outpoint } }) - const successCallback = () => { - dispatch({ - type: types.DELETE_FILE_COMPLETED, - data: { - uri, - } - }) - dispatch(doCloseModal()) + lbry.file_delete({ + outpoint: outpoint, + delete_target_file: deleteFromComputer, + }) + + dispatch(doCloseModal()) + } +} + + +export function doFetchFileInfosAndPublishedClaims() { + return function(dispatch, getState) { + const state = getState(), + isClaimListMinePending = selectClaimListMineIsPending(state), + isFileInfoListPending = selectFileListIsPending(state) + + if (isClaimListMinePending === undefined) { + dispatch(doClaimListMine()) } - lbry.removeFile(fileInfo.outpoint, deleteFromComputer, successCallback) - } -} - - -export function doFetchDownloadedContent() { - return function(dispatch, getState) { - const state = getState(), - fileInfos = selectAllFileInfos(state) - - dispatch({ - type: types.FETCH_DOWNLOADED_CONTENT_STARTED, - }) - - lbry.claim_list_mine().then((myClaimInfos) => { - - const myClaimOutpoints = myClaimInfos.map(({txid, nout}) => txid + ':' + nout); - - dispatch({ - type: types.FETCH_DOWNLOADED_CONTENT_COMPLETED, - data: { - fileInfos: fileInfos.filter(({outpoint}) => !myClaimOutpoints.includes(outpoint)), - } - }) - }); - } -} - -export function doFetchPublishedContent() { - return function(dispatch, getState) { - const state = getState(), - fileInfos = selectAllFileInfos(state) - - dispatch({ - type: types.FETCH_PUBLISHED_CONTENT_STARTED, - }) - - lbry.claim_list_mine().then((claimInfos) => { - dispatch({ - type: types.FETCH_MY_CLAIMS_COMPLETED, - data: { - claims: claimInfos, - } - }) - - const myClaimOutpoints = claimInfos.map(({txid, nout}) => txid + ':' + nout) - - dispatch({ - type: types.FETCH_PUBLISHED_CONTENT_COMPLETED, - data: { - fileInfos: fileInfos.filter(({outpoint}) => myClaimOutpoints.includes(outpoint)), - } - }) - }) + if (isFileInfoListPending === undefined) { + dispatch(doFileList()) + } } } diff --git a/ui/js/component/fileActions/index.js b/ui/js/component/fileActions/index.js index c3628821d..a570cd413 100644 --- a/ui/js/component/fileActions/index.js +++ b/ui/js/component/fileActions/index.js @@ -19,6 +19,7 @@ import { import { doCloseModal, doOpenModal, + doHistoryBack, } from 'actions/app' import { doFetchAvailability @@ -55,7 +56,10 @@ const perform = (dispatch) => ({ closeModal: () => dispatch(doCloseModal()), openInFolder: (fileInfo) => dispatch(doOpenFileInFolder(fileInfo)), openInShell: (fileInfo) => dispatch(doOpenFileInShell(fileInfo)), - deleteFile: (fileInfo, deleteFromComputer) => dispatch(doDeleteFile(fileInfo, deleteFromComputer)), + deleteFile: (fileInfo, deleteFromComputer) => { + dispatch(doHistoryBack()) + dispatch(doDeleteFile(fileInfo, deleteFromComputer)) + }, openModal: (modal) => dispatch(doOpenModal(modal)), startDownload: (uri) => dispatch(doPurchaseUri(uri)), loadVideo: (uri) => dispatch(doLoadVideo(uri)) diff --git a/ui/js/component/fileActions/view.jsx b/ui/js/component/fileActions/view.jsx index 3f7c7561a..c1e9d6e3c 100644 --- a/ui/js/component/fileActions/view.jsx +++ b/ui/js/component/fileActions/view.jsx @@ -72,7 +72,19 @@ class FileActions extends React.Component { let content - if (!fileInfo && isAvailable === undefined) { + if (downloading) { + + const + progress = (fileInfo && fileInfo.written_bytes) ? fileInfo.written_bytes / fileInfo.total_bytes * 100 : 0, + label = fileInfo ? progress.toFixed(0) + '% complete' : 'Connecting...', + labelWithIcon = {label}; + + content =
+
{labelWithIcon}
+ {labelWithIcon} +
+ + } else if (!fileInfo && isAvailable === undefined) { content = @@ -90,18 +102,6 @@ class FileActions extends React.Component { content = { startDownload(uri) } } />; - } else if (downloading) { - - const - progress = (fileInfo && fileInfo.written_bytes) ? fileInfo.written_bytes / fileInfo.total_bytes * 100 : 0, - label = fileInfo ? progress.toFixed(0) + '% complete' : 'Connecting...', - labelWithIcon = {label}; - - content =
-
{labelWithIcon}
- {labelWithIcon} -
- } else if (fileInfo && fileInfo.download_path) { content = openInShell(fileInfo)} />; } else { @@ -133,7 +133,7 @@ class FileActions extends React.Component { contentLabel="Not enough credits" type="confirm" confirmButtonLabel="Remove" - onConfirmed={() => deleteFile(uri, fileInfo, deleteChecked)} + onConfirmed={() => deleteFile(fileInfo.outpoint, deleteChecked)} onAborted={closeModal}>

Are you sure you'd like to remove {title} from LBRY?

diff --git a/ui/js/component/fileList/view.jsx b/ui/js/component/fileList/view.jsx index 6130a5ffb..eb3b620b8 100644 --- a/ui/js/component/fileList/view.jsx +++ b/ui/js/component/fileList/view.jsx @@ -60,7 +60,6 @@ class FileList extends React.Component { handleSortChanged, fetching, fileInfos, - hidePrices, } = this.props const { sortBy, @@ -72,7 +71,7 @@ class FileList extends React.Component { contentName: fileInfo.name, channelName: fileInfo.channel_name, }) - content.push() + content.push() }) return (
diff --git a/ui/js/component/video/view.jsx b/ui/js/component/video/view.jsx index 3559a728e..3d364bcc9 100644 --- a/ui/js/component/video/view.jsx +++ b/ui/js/component/video/view.jsx @@ -4,14 +4,13 @@ import Link from 'component/link'; import Modal from 'component/modal'; class VideoPlayButton extends React.Component { - confirmPurchaseClick() { + onPurchaseConfirmed() { this.props.closeModal() this.props.startPlaying() this.props.loadVideo(this.props.uri) } onWatchClick() { - console.log(this) this.props.purchaseUri(this.props.uri).then(() => { if (!this.props.modal) { this.props.startPlaying() @@ -59,7 +58,7 @@ class VideoPlayButton extends React.Component { type="confirm" isOpen={modal == 'affirmPurchase'} contentLabel="Confirm Purchase" - onConfirmed={this.confirmPurchaseClick.bind(this)} + onConfirmed={this.onPurchaseConfirmed.bind(this)} onAborted={closeModal}> This will purchase {title} for credits. @@ -107,8 +106,8 @@ class Video extends React.Component { } return ( -
{ - isPlaying || isReadyToPlay ? +
{ + isPlaying || isLoading ? (!isReadyToPlay ? this is the world's worst loading screen and we shipped our software with it anyway...

{loadStatusMessage} : ) : diff --git a/ui/js/constants/action_types.js b/ui/js/constants/action_types.js index 2d548bc48..3607583e3 100644 --- a/ui/js/constants/action_types.js +++ b/ui/js/constants/action_types.js @@ -38,12 +38,10 @@ 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_COMPLETED = 'FETCH_CHANNEL_CLAIMS_COMPLETED' +export const CLAIM_LIST_MINE_STARTED = 'CLAIM_LIST_MINE_STARTED' +export const CLAIM_LIST_MINE_COMPLETED = 'CLAIM_LIST_MINE_COMPLETED' export const FILE_LIST_STARTED = 'FILE_LIST_STARTED' export const FILE_LIST_COMPLETED = 'FILE_LIST_COMPLETED' -export const FETCH_DOWNLOADED_CONTENT_STARTED = 'FETCH_DOWNLOADED_CONTENT_STARTED' -export const FETCH_DOWNLOADED_CONTENT_COMPLETED = 'FETCH_DOWNLOADED_CONTENT_COMPLETED' -export const FETCH_PUBLISHED_CONTENT_STARTED = 'FETCH_PUBLISHED_CONTENT_STARTED' -export const FETCH_PUBLISHED_CONTENT_COMPLETED = 'FETCH_PUBLISHED_CONTENT_COMPLETED' export const FETCH_FILE_INFO_STARTED = 'FETCH_FILE_INFO_STARTED' export const FETCH_FILE_INFO_COMPLETED = 'FETCH_FILE_INFO_COMPLETED' export const FETCH_COST_INFO_STARTED = 'FETCH_COST_INFO_STARTED' @@ -57,9 +55,7 @@ export const DOWNLOADING_COMPLETED = 'DOWNLOADING_COMPLETED' export const PLAY_VIDEO_STARTED = 'PLAY_VIDEO_STARTED' export const FETCH_AVAILABILITY_STARTED = 'FETCH_AVAILABILITY_STARTED' export const FETCH_AVAILABILITY_COMPLETED = 'FETCH_AVAILABILITY_COMPLETED' -export const DELETE_FILE_STARTED = 'DELETE_FILE_STARTED' -export const DELETE_FILE_COMPLETED = 'DELETE_FILE_COMPLETED' -export const FETCH_MY_CLAIMS_COMPLETED = 'FETCH_MY_CLAIMS_COMPLETED' +export const FILE_DELETE = 'FILE_DELETE' // Search export const SEARCH_STARTED = 'SEARCH_STARTED' diff --git a/ui/js/lbry.js b/ui/js/lbry.js index ad7e7b6bd..6e9f8e691 100644 --- a/ui/js/lbry.js +++ b/ui/js/lbry.js @@ -7,6 +7,25 @@ import {getLocal, getSession, setSession, setLocal} from './utils.js'; const {remote, ipcRenderer} = require('electron'); const menu = remote.require('./menu/main-menu'); +let lbry = { + isConnected: false, + daemonConnectionString: 'http://localhost:5279/lbryapi', + webUiUri: 'http://localhost:5279', + peerListTimeout: 6000, + pendingPublishTimeout: 20 * 60 * 1000, + colors: { + primary: '#155B4A' + }, + defaultClientSettings: { + showNsfw: false, + showUnavailable: true, + debug: false, + useCustomLighthouseServers: false, + customLighthouseServers: [], + showDeveloperMenu: false, + } +}; + /** * 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. @@ -40,14 +59,14 @@ function removePendingPublishIfNeeded({name, channel_name, outpoint}) { return pub.outpoint === outpoint || (pub.name === name && (!channel_name || pub.channel_name === channel_name)); } - setLocal('pendingPublishes', getPendingPublishes().filter(pub => !pubMatches(pub))); + setLocal('pendingPublishes', lbry.getPendingPublishes().filter(pub => !pubMatches(pub))); } /** * Gets the current list of pending publish attempts. Filters out any that have timed out and * removes them from the list. */ -function getPendingPublishes() { +lbry.getPendingPublishes = function() { const pendingPublishes = getLocal('pendingPublishes') || []; const newPendingPublishes = pendingPublishes.filter(pub => Date.now() - pub.time <= lbry.pendingPublishTimeout); setLocal('pendingPublishes', newPendingPublishes); @@ -59,7 +78,7 @@ function getPendingPublishes() { * provided along withe the name. If no pending publish is found, returns null. */ function getPendingPublish({name, channel_name, outpoint}) { - const pendingPublishes = getPendingPublishes(); + const pendingPublishes = lbry.getPendingPublishes(); return pendingPublishes.find( pub => pub.outpoint === outpoint || (pub.name === name && (!channel_name || pub.channel_name === channel_name)) ) || null; @@ -74,26 +93,6 @@ function pendingPublishToDummyFileInfo({name, outpoint, claim_id}) { } window.pptdfi = pendingPublishToDummyFileInfo; -let lbry = { - isConnected: false, - rootPath: '.', - daemonConnectionString: 'http://localhost:5279/lbryapi', - webUiUri: 'http://localhost:5279', - peerListTimeout: 6000, - pendingPublishTimeout: 20 * 60 * 1000, - colors: { - primary: '#155B4A' - }, - defaultClientSettings: { - showNsfw: false, - showUnavailable: true, - debug: false, - useCustomLighthouseServers: false, - customLighthouseServers: [], - showDeveloperMenu: false, - } -}; - lbry.call = function (method, params, callback, errorCallback, connectFailedCallback) { return jsonrpc.call(lbry.daemonConnectionString, method, params, callback, errorCallback, connectFailedCallback); } @@ -159,12 +158,6 @@ lbry.sendToAddress = function(amount, address, callback, errorCallback) { lbry.call("send_amount_to_address", { "amount" : amount, "address": address }, callback, errorCallback); } -lbry.getMyClaim = function(name, callback) { - lbry.call('claim_list_mine', {}, (claims) => { - callback(claims.find((claim) => claim.name == name) || null); - }); -} - /** * Takes a LBRY URI; will first try and calculate a total cost using * Lighthouse. If Lighthouse can't be reached, it just retrives the @@ -218,40 +211,6 @@ lbry.getCostInfo = function(uri) { return lbry.costPromiseCache[uri]; } -lbry.getMyClaims = function(callback) { - lbry.call('get_name_claims', {}, callback); -} - -lbry.removeFile = function(outpoint, deleteTargetFile=true, callback) { - this._removedFiles.push(outpoint); - // this._updateFileInfoSubscribers(outpoint); - - lbry.file_delete({ - outpoint: outpoint, - delete_target_file: deleteTargetFile, - }).then(callback); -} - -lbry.getFileInfoWhenListed = function(name, callback, timeoutCallback, tryNum=0) { - function scheduleNextCheckOrTimeout() { - if (timeoutCallback && tryNum > 200) { - timeoutCallback(); - } else { - setTimeout(() => lbry.getFileInfoWhenListed(name, callback, timeoutCallback, tryNum + 1), 250); - } - } - - // Calls callback with file info when it appears in the lbrynet file manager. - // If timeoutCallback is provided, it will be called if the file fails to appear. - lbry.file_list({name: name}).then(([fileInfo]) => { - if (fileInfo) { - callback(fileInfo); - } else { - scheduleNextCheckOrTimeout(); - } - }, () => scheduleNextCheckOrTimeout()); -} - /** * Publishes a file. The optional fileListedCallback is called when the file becomes available in * lbry.file_list() during the publish process. @@ -292,10 +251,6 @@ lbry.publish = function(params, fileListedCallback, publishedCallback, errorCall fileListedCallback(true); } }, 2000); - - //lbry.getFileInfoWhenListed(params.name, function(fileInfo) { - // fileListedCallback(fileInfo); - //}); } @@ -350,29 +305,10 @@ lbry.formatName = function(name) { return name; } -lbry.nameIsValid = function(name, checkCase=true) { - const regexp = new RegExp('^[a-z0-9-]+$', checkCase ? '' : 'i'); - return regexp.test(name); -} - -lbry.loadJs = function(src, type, onload) -{ - var lbryScriptTag = document.getElementById('lbry'), - newScriptTag = document.createElement('script'), - type = type || 'text/javascript'; - - newScriptTag.src = src; - newScriptTag.type = type; - if (onload) - { - newScriptTag.onload = onload; - } - lbryScriptTag.parentNode.insertBefore(newScriptTag, lbryScriptTag); -} lbry.imagePath = function(file) { - return lbry.rootPath + '/img/' + file; + return 'img/' + file; } lbry.getMediaType = function(contentType, fileName) { @@ -406,17 +342,6 @@ lbry.stop = function(callback) { lbry._subscribeIdCount = 0; lbry._balanceSubscribeCallbacks = {}; lbry._balanceSubscribeInterval = 5000; -lbry._removedFiles = []; -lbry._claimIdOwnershipCache = {}; - -lbry._updateClaimOwnershipCache = function(claimId) { - lbry.getMyClaims((claimInfos) => { - lbry._claimIdOwnershipCache[claimId] = !!claimInfos.reduce(function(match, claimInfo) { - return match || claimInfo.claim_id == claimId; - }, false); - }); - -}; lbry._balanceUpdateInterval = null; lbry._updateBalanceSubscribers = function() { @@ -493,7 +418,7 @@ lbry.file_list = function(params={}) { lbry.call('file_list', params, (fileInfos) => { removePendingPublishIfNeeded({name, channel_name, outpoint}); - const dummyFileInfos = getPendingPublishes().map(pendingPublishToDummyFileInfo); + const dummyFileInfos = lbry.getPendingPublishes().map(pendingPublishToDummyFileInfo); resolve([...fileInfos, ...dummyFileInfos]); }, reject, reject); }); @@ -506,7 +431,7 @@ lbry.claim_list_mine = function(params={}) { removePendingPublishIfNeeded({name, channel_name, outpoint: txid + ':' + nout}); } - const dummyClaims = getPendingPublishes().map(pendingPublishToDummyClaim); + const dummyClaims = lbry.getPendingPublishes().map(pendingPublishToDummyClaim); resolve([...claims, ...dummyClaims]); }, reject, reject) }); diff --git a/ui/js/lbryuri.js b/ui/js/lbryuri.js index 637a2fd67..680c42d65 100644 --- a/ui/js/lbryuri.js +++ b/ui/js/lbryuri.js @@ -175,6 +175,11 @@ lbryuri.isValid = function(uri) { return parts && parts.name; } +lbryuri.isValidName = function(name, checkCase=true) { + const regexp = new RegExp('^[a-z0-9-]+$', checkCase ? '' : 'i'); + return regexp.test(name); +} + lbryuri.isClaimable = function(uri) { let parts try { diff --git a/ui/js/main.js b/ui/js/main.js index a52e4b943..f9579804b 100644 --- a/ui/js/main.js +++ b/ui/js/main.js @@ -34,13 +34,15 @@ window.addEventListener('contextmenu', (event) => { event.preventDefault(); }); -window.addEventListener('popstate', (event) => { +window.addEventListener('popstate', (event, param) => { const queryString = document.location.search const pathParts = document.location.pathname.split('/') const route = '/' + pathParts[pathParts.length - 1] if (route.match(/html$/)) return + console.log('title should be set here, but it is not in popstate? TODO') + app.store.dispatch(doChangePath(`${route}${queryString}`)) }) diff --git a/ui/js/page/channel/index.js b/ui/js/page/channel/index.js index 3091761df..4ff8d8206 100644 --- a/ui/js/page/channel/index.js +++ b/ui/js/page/channel/index.js @@ -6,18 +6,28 @@ import { doFetchClaimsByChannel } from 'actions/content' import { - makeSelectClaimsForChannel + makeSelectClaimForUri, + makeSelectClaimsInChannelForUri } from 'selectors/claims' import ChannelPage from './view' -// -// const select = (state) => ({ -// uri: selectCurrentUri(state), -// claim: selectCurrentUriClaim(state), -// claims: selectCurrentUriClaims(state) -// }) + +import FilePage from './view' + +const makeSelect = () => { + const selectClaim = makeSelectClaimForUri(), + selectClaimsInChannel = makeSelectClaimsInChannelForUri() + + const select = (state, props) => ({ + claim: selectClaim(state, props), + claimsInChannel: selectClaimsInChannel(state, props) + }) + + return select +} const perform = (dispatch) => ({ + // fetchClaims: () => { console.log('fetch claims') } fetchClaims: (uri) => dispatch(doFetchClaimsByChannel(uri)) }) -export default connect(null, perform)(ChannelPage) +export default connect(makeSelect, perform)(ChannelPage) diff --git a/ui/js/page/channel/view.jsx b/ui/js/page/channel/view.jsx index 1542f14af..3caa59594 100644 --- a/ui/js/page/channel/view.jsx +++ b/ui/js/page/channel/view.jsx @@ -1,4 +1,5 @@ import React from 'react'; +import lbryuri from 'lbryuri' class ChannelPage extends React.Component{ componentDidMount() { @@ -10,19 +11,19 @@ class ChannelPage extends React.Component{ } fetchClaims(props) { - if (props.claims === undefined) { + if (props.claimsInChannel === undefined) { props.fetchClaims(props.uri) } } render() { const { - claims, + claimsInChannel, claim, uri } = this.props - console.log(claims); + console.log(claimsInChannel); return
@@ -36,7 +37,9 @@ class ChannelPage extends React.Component{
- {claims} + {claimsInChannel ? + claimsInChannel.map((claim) => ) + : ''}
diff --git a/ui/js/page/fileListDownloaded/index.js b/ui/js/page/fileListDownloaded/index.js index 7122ff5fd..101933bd1 100644 --- a/ui/js/page/fileListDownloaded/index.js +++ b/ui/js/page/fileListDownloaded/index.js @@ -3,11 +3,11 @@ import { connect } from 'react-redux' import { - doFetchDownloadedContent, + doFetchFileInfosAndPublishedClaims, } from 'actions/file_info' import { - selectDownloadedFileInfo, - selectFetchingDownloadedContent, + selectFileInfosDownloaded, + selectFileListDownloadedOrPublishedIsPending, } from 'selectors/file_info' import { doNavigate, @@ -15,13 +15,13 @@ import { import FileListDownloaded from './view' const select = (state) => ({ - downloadedContent: selectDownloadedFileInfo(state), - fetching: selectFetchingDownloadedContent(state), + fileInfos: selectFileInfosDownloaded(state), + isPending: selectFileListDownloadedOrPublishedIsPending(state), }) const perform = (dispatch) => ({ navigate: (path) => dispatch(doNavigate(path)), - fetchFileListDownloaded: () => dispatch(doFetchDownloadedContent()), + fetchFileInfosDownloaded: () => dispatch(doFetchFileInfosAndPublishedClaims()), }) export default connect(select, perform)(FileListDownloaded) diff --git a/ui/js/page/fileListDownloaded/view.jsx b/ui/js/page/fileListDownloaded/view.jsx index 2c041a267..670b27191 100644 --- a/ui/js/page/fileListDownloaded/view.jsx +++ b/ui/js/page/fileListDownloaded/view.jsx @@ -12,21 +12,21 @@ import SubHeader from 'component/subHeader' class FileListDownloaded extends React.Component { componentWillMount() { - this.props.fetchFileListDownloaded() + this.props.fetchFileInfosDownloaded() } render() { const { - downloadedContent, - fetching, + fileInfos, + isPending, navigate, } = this.props let content - if (downloadedContent && downloadedContent.length > 0) { - content = + if (fileInfos && fileInfos.length > 0) { + content = } else { - if (fetching) { + if (isPending) { content = } else { content = You haven't downloaded anything from LBRY yet. Go navigate('/discover')} label="search for your first download" />! diff --git a/ui/js/page/fileListPublished/index.js b/ui/js/page/fileListPublished/index.js index 22f2b8736..fbf0bcb71 100644 --- a/ui/js/page/fileListPublished/index.js +++ b/ui/js/page/fileListPublished/index.js @@ -3,13 +3,11 @@ import { connect } from 'react-redux' import { - doFetchPublishedContent, -} from 'actions/content' + doFetchFileInfosAndPublishedClaims, +} from 'actions/file_info' import { - selectFetchingPublishedContent, -} from 'selectors/content' -import { - selectPublishedFileInfo, + selectFileInfosPublished, + selectFileListDownloadedOrPublishedIsPending } from 'selectors/file_info' import { doNavigate, @@ -17,13 +15,13 @@ import { import FileListPublished from './view' const select = (state) => ({ - publishedContent: selectPublishedFileInfo(state), - fetching: selectFetchingPublishedContent(state), + fileInfos: selectFileInfosPublished(state), + isPending: selectFileListDownloadedOrPublishedIsPending(state), }) const perform = (dispatch) => ({ navigate: (path) => dispatch(doNavigate(path)), - fetchFileListPublished: () => dispatch(doFetchPublishedContent()), + fetchFileListPublished: () => dispatch(doFetchFileInfosAndPublishedClaims()), }) export default connect(select, perform)(FileListPublished) diff --git a/ui/js/page/fileListPublished/view.jsx b/ui/js/page/fileListPublished/view.jsx index 365aa061c..488a45086 100644 --- a/ui/js/page/fileListPublished/view.jsx +++ b/ui/js/page/fileListPublished/view.jsx @@ -3,7 +3,7 @@ import lbry from 'lbry.js'; import lbryuri from 'lbryuri.js'; import Link from 'component/link'; import {FormField} from 'component/form.js'; -import {FileTile} from 'component/fileTile'; +import FileTile from 'component/fileTile'; import rewards from 'rewards.js'; import lbryio from 'lbryio.js'; import {BusyMessage, Thumbnail} from 'component/common.js'; @@ -16,7 +16,7 @@ class FileListPublished extends React.Component { } componentDidUpdate() { - if(this.props.publishedContent.length > 0) this._requestPublishReward() + if(this.props.fileInfos.length > 0) this._requestPublishReward() } _requestPublishReward() { @@ -38,17 +38,17 @@ class FileListPublished extends React.Component { render() { const { - publishedContent, - fetching, + fileInfos, + isPending, navigate, } = this.props let content - if (publishedContent && publishedContent.length > 0) { - content = + if (fileInfos && fileInfos.length > 0) { + content = } else { - if (fetching) { + if (isPending) { content = } else { content = You haven't downloaded anything from LBRY yet. Go navigate('/discover')} label="search for your first download" />! diff --git a/ui/js/page/filePage/view.jsx b/ui/js/page/filePage/view.jsx index 20b87a83f..72d95a276 100644 --- a/ui/js/page/filePage/view.jsx +++ b/ui/js/page/filePage/view.jsx @@ -61,10 +61,10 @@ class FilePage extends React.Component{ render() { const { claim, + fileInfo, metadata, contentType, uri, - fileInfo, } = this.props if (!claim || !metadata) { diff --git a/ui/js/page/help/view.jsx b/ui/js/page/help/view.jsx index c57c4d1f0..2d4f516a6 100644 --- a/ui/js/page/help/view.jsx +++ b/ui/js/page/help/view.jsx @@ -24,9 +24,6 @@ var HelpPage = React.createClass({ }); }); }, - componentDidMount: function() { - document.title = "Help"; - }, render: function() { let ver, osName, platform, newVerLink; if (this.state.versionInfo) { diff --git a/ui/js/page/publish/index.js b/ui/js/page/publish/index.js index 29347b6ed..d083fd118 100644 --- a/ui/js/page/publish/index.js +++ b/ui/js/page/publish/index.js @@ -5,9 +5,13 @@ import { import { doNavigate, } from 'actions/app' +import { + selectMyClaims +} from 'selectors/claims' import PublishPage from './view' const select = (state) => ({ + myClaims: selectMyClaims(state) }) const perform = (dispatch) => ({ diff --git a/ui/js/page/publish/view.jsx b/ui/js/page/publish/view.jsx index cb0b152b6..73c0df9e6 100644 --- a/ui/js/page/publish/view.jsx +++ b/ui/js/page/publish/view.jsx @@ -1,5 +1,6 @@ import React from 'react'; import lbry from 'lbry'; +import lbryuri from 'lbryuri' import {FormField, FormRow} from 'component/form.js'; import Link from 'component/link'; import rewards from 'rewards'; @@ -169,7 +170,7 @@ var PublishPage = React.createClass({ return; } - if (!lbry.nameIsValid(rawName, false)) { + if (!lbryuri.isValidName(rawName, false)) { this.refs.name.showError('LBRY names must contain only letters, numbers and dashes.'); return; } @@ -182,50 +183,45 @@ var PublishPage = React.createClass({ myClaimExists: null, }); - lbry.getMyClaim(name, (myClaimInfo) => { + const myClaimInfo = Object.values(this.props.myClaims).find(claim => claim.name === name) + + this.setState({ + myClaimExists: !!myClaimInfo, + }); + lbry.resolve({uri: name}).then((claimInfo) => { if (name != this.state.name) { - // A new name has been typed already, so bail return; } - this.setState({ - myClaimExists: !!myClaimInfo, - }); - lbry.resolve({uri: name}).then((claimInfo) => { - if (name != this.state.name) { - return; - } - - if (!claimInfo) { - this.setState({ - nameResolved: false, - }); - } else { - const topClaimIsMine = (myClaimInfo && myClaimInfo.claim.amount >= claimInfo.claim.amount); - const newState = { - nameResolved: true, - topClaimValue: parseFloat(claimInfo.claim.amount), - myClaimExists: !!myClaimInfo, - myClaimValue: myClaimInfo ? parseFloat(myClaimInfo.claim.amount) : null, - myClaimMetadata: myClaimInfo ? myClaimInfo.value : null, - topClaimIsMine: topClaimIsMine, - }; - - if (topClaimIsMine) { - newState.bid = myClaimInfo.claim.amount; - } else if (this.state.myClaimMetadata) { - // Just changed away from a name we have a claim on, so clear pre-fill - newState.bid = ''; - } - - this.setState(newState); - } - }, () => { // Assume an error means the name is available + if (!claimInfo) { this.setState({ - name: name, nameResolved: false, - myClaimExists: false, }); + } else { + const topClaimIsMine = (myClaimInfo && myClaimInfo.claim.amount >= claimInfo.claim.amount); + const newState = { + nameResolved: true, + topClaimValue: parseFloat(claimInfo.claim.amount), + myClaimExists: !!myClaimInfo, + myClaimValue: myClaimInfo ? parseFloat(myClaimInfo.claim.amount) : null, + myClaimMetadata: myClaimInfo ? myClaimInfo.value : null, + topClaimIsMine: topClaimIsMine, + }; + + if (topClaimIsMine) { + newState.bid = myClaimInfo.claim.amount; + } else if (this.state.myClaimMetadata) { + // Just changed away from a name we have a claim on, so clear pre-fill + newState.bid = ''; + } + + this.setState(newState); + } + }, () => { // Assume an error means the name is available + this.setState({ + name: name, + nameResolved: false, + myClaimExists: false, }); }); }, @@ -287,7 +283,7 @@ var PublishPage = React.createClass({ handleNewChannelNameChange: function (event) { const newChannelName = (event.target.value.startsWith('@') ? event.target.value : '@' + event.target.value); - if (newChannelName.length > 1 && !lbry.nameIsValid(newChannelName.substr(1), false)) { + if (newChannelName.length > 1 && !lbryuri.isValidName(newChannelName.substr(1), false)) { this.refs.newChannelName.showError('LBRY channel names must contain only letters, numbers and dashes.'); return; } else { diff --git a/ui/js/page/showPage/view.jsx b/ui/js/page/showPage/view.jsx index 0d0b0da5e..96983139c 100644 --- a/ui/js/page/showPage/view.jsx +++ b/ui/js/page/showPage/view.jsx @@ -1,7 +1,9 @@ import React from 'react'; +import lbryuri from 'lbryuri' import { BusyMessage, } from 'component/common'; +import ChannelPage from 'page/channel' import FilePage from 'page/filePage' class ShowPage extends React.Component{ @@ -21,8 +23,6 @@ class ShowPage extends React.Component{ uri, } = props - console.log('show page resolve ' + uri) - console.log('isResolving: ' + isResolvingUri) if(!isResolvingUri && claim === undefined && uri) { resolveUri(uri) } @@ -49,8 +49,7 @@ class ShowPage extends React.Component{
} else if (claim.name.length && claim.name[0] === '@') { - innerContent = "channel" - // innerContent = + innerContent = } else if (claim) { innerContent = diff --git a/ui/js/reducers/claims.js b/ui/js/reducers/claims.js index b8885d98a..6acf0f111 100644 --- a/ui/js/reducers/claims.js +++ b/ui/js/reducers/claims.js @@ -39,6 +39,24 @@ reducers[types.RESOLVE_URI_CANCELED] = function(state, action) { }) } + +reducers[types.CLAIM_LIST_MINE_STARTED] = function(state, action) { + return Object.assign({}, state, { + isClaimListMinePending: true + }) +} + +reducers[types.CLAIM_LIST_MINE_COMPLETED] = function(state, action) { + const myClaims = Object.assign({}, state.myClaims) + action.data.claims.forEach((claim) => { + myClaims[claim.claim_id] = claim + }) + return Object.assign({}, state, { + isClaimListMinePending: false, + myClaims: myClaims + }) +} + reducers[types.FETCH_CHANNEL_CLAIMS_COMPLETED] = function(state, action) { const { uri, @@ -56,23 +74,6 @@ reducers[types.FETCH_CHANNEL_CLAIMS_COMPLETED] = function(state, action) { }) } -reducers[types.FETCH_MY_CLAIMS_COMPLETED] = function(state, action) { - const { - claims, - } = action.data - const newMine = Object.assign({}, state.mine) - const newById = Object.assign({}, newMine.byId) - - claims.forEach(claim => { - newById[claim.claim_id] = claim - }) - newMine.byId = newById - - return Object.assign({}, state, { - mine: newMine, - }) -} - export default function reducer(state = defaultState, action) { const handler = reducers[action.type]; if (handler) return handler(state, action); diff --git a/ui/js/reducers/file_info.js b/ui/js/reducers/file_info.js index affd4103d..811c829ef 100644 --- a/ui/js/reducers/file_info.js +++ b/ui/js/reducers/file_info.js @@ -64,22 +64,19 @@ reducers[types.DOWNLOADING_STARTED] = function(state, action) { outpoint, fileInfo, } = action.data - const newFileInfos = Object.assign({}, state.fileInfos) - const newDownloading = Object.assign({}, state.downloading) - const newDownloadingByUri = Object.assign({}, newDownloading.byUri) - const newLoading = Object.assign({}, state.loading) - const newLoadingByUri = Object.assign({}, newLoading) - newDownloadingByUri[uri] = true - newDownloading.byUri = newDownloadingByUri + const newFileInfos = Object.assign({}, state.fileInfos) + const newDownloading = Object.assign({}, state.urisDownloading) + const newLoading = Object.assign({}, state.urisLoading) + + newDownloading[uri] = true newFileInfos[outpoint] = fileInfo - delete newLoadingByUri[uri] - newLoading.byUri = newLoadingByUri + delete newLoading[uri] return Object.assign({}, state, { - downloading: newDownloading, + urisDownloading: newDownloading, + urisLoading: newLoading, fileInfos: newFileInfos, - loading: newLoading, }) } @@ -89,15 +86,16 @@ reducers[types.DOWNLOADING_PROGRESSED] = function(state, action) { outpoint, fileInfo, } = action.data + const newFileInfos = Object.assign({}, state.fileInfos) - const newDownloading = Object.assign({}, state.downloading) + const newDownloading = Object.assign({}, state.urisDownloading) newFileInfos[outpoint] = fileInfo newDownloading[uri] = true return Object.assign({}, state, { - fileInfos: newByUri, - downloading: newDownloading + fileInfos: newFileInfos, + urisDownloading: newDownloading }) } @@ -107,49 +105,29 @@ reducers[types.DOWNLOADING_COMPLETED] = function(state, action) { outpoint, fileInfo, } = action.data + const newFileInfos = Object.assign({}, state.fileInfos) - const newDownloading = Object.assign({}, state.downloading) - const newDownloadingByUri = Object.assign({}, newDownloading.byUri) + const newDownloading = Object.assign({}, state.urisDownloading) newFileInfos[outpoint] = fileInfo - delete newDownloadingByUri[uri] - newDownloading.byUri = newDownloadingByUri + delete newDownloading[uri] return Object.assign({}, state, { fileInfos: newFileInfos, - downloading: newDownloading, + urisDownloading: newDownloading, }) } -reducers[types.DELETE_FILE_STARTED] = function(state, action) { +reducers[types.FILE_DELETE] = function(state, action) { const { - outpoint + outpoint, } = action.data - const newDeleting = Object.assign({}, state.deleting) - const newByUri = Object.assign({}, newDeleting.byUri) - newFileInfos[outpoint] = true - newDeleting.byUri = newFileInfos - - return Object.assign({}, state, { - deleting: newDeleting, - }) -} - -reducers[types.DELETE_FILE_COMPLETED] = function(state, action) { - const { - uri, - } = action.data - const newDeleting = Object.assign({}, state.deleting) - const newDeletingByUri = Object.assign({}, newDeleting.byUri) const newFileInfos = Object.assign({}, state.fileInfos) - delete newDeletingByUri[uri] - newDeleting.byUri = newDeletingByUri delete newFileInfos[outpoint] return Object.assign({}, state, { - deleting: newDeleting, fileInfos: newFileInfos, }) } @@ -158,14 +136,13 @@ reducers[types.LOADING_VIDEO_STARTED] = function(state, action) { const { uri, } = action.data - const newLoading = Object.assign({}, state.loading) - const newFileInfos = Object.assign({}, newLoading.byUri) - newFileInfos[outpoint] = true - newLoading.byUri = newFileInfos + const newLoading = Object.assign({}, state.urisLoading) + + newLoading[uri] = true return Object.assign({}, state, { - loading: newLoading, + urisLoading: newLoading, }) } @@ -173,59 +150,16 @@ reducers[types.LOADING_VIDEO_FAILED] = function(state, action) { const { uri, } = action.data - const newLoading = Object.assign({}, state.loading) - const newFileInfos = Object.assign({}, newLoading.byUri) - delete newFileInfos[outpoint] - newLoading.byUri = newFileInfos + const newLoading = Object.assign({}, state.urisLoading) + + delete newLoading[uri] return Object.assign({}, state, { - loading: newLoading, + urisLoading: newLoading, }) } -reducers[types.FETCH_DOWNLOADED_CONTENT_STARTED] = function(state, action) { - return Object.assign({}, state, { - fetchingDownloadedContent: true, - }) -} - -reducers[types.FETCH_DOWNLOADED_CONTENT_COMPLETED] = function(state, action) { - const newFileInfos = Object.assign({}, state.fileInfos) - - action.data.fileInfos.forEach(fileInfo => { - newFileInfos[fileInfo.outpoint] = fileInfo - }) - - return Object.assign({}, state, { - fileInfos: newFileInfos, - fetchingDownloadedContent: false - }) -} - -reducers[types.FETCH_PUBLISHED_CONTENT_STARTED] = function(state, action) { - return Object.assign({}, state, { - fetchingPublishedContent: true, - }) -} - -reducers[types.FETCH_PUBLISHED_CONTENT_COMPLETED] = function(state, action) { - const { - fileInfos - } = action.data - const newFileInfos = Object.assign({}, state.fileInfos) - - fileInfos.forEach(fileInfo => { - newFileInfos[fileInfo.outpoint] = fileInfo - }) - - return Object.assign({}, state, { - fileInfos: newFileInfos, - fetchingPublishedContent: false - }) -} - - export default function reducer(state = defaultState, action) { const handler = reducers[action.type]; diff --git a/ui/js/selectors/claims.js b/ui/js/selectors/claims.js index 9b7612859..9a76b872e 100644 --- a/ui/js/selectors/claims.js +++ b/ui/js/selectors/claims.js @@ -15,17 +15,6 @@ export const selectAllClaimsByChannel = createSelector( (state) => state.claimsByChannel || {} ) -export const selectClaimsForChannel = (state, props) => { - return selectAllClaimsByChannel(state)[props.uri] -} - -export const makeSelectClaimsForChannel = () => { - return createSelector( - selectClaimsForChannel, - (claim) => claim - ) -} - const selectClaimForUri = (state, props) => { const uri = lbryuri.normalize(props.uri) return selectClaimsByUri(state)[uri] @@ -38,6 +27,17 @@ export const makeSelectClaimForUri = () => { ) } +export const selectClaimsInChannelForUri = (state, props) => { + return selectAllClaimsByChannel(state)[props.uri] +} + +export const makeSelectClaimsInChannelForUri = () => { + return createSelector( + selectClaimsInChannelForUri, + (claims) => claims + ) +} + const selectMetadataForUri = (state, props) => { const claim = selectClaimForUri(state, props) const metadata = claim && claim.value && claim.value.stream && claim.value.stream.metadata @@ -73,26 +73,25 @@ export const makeSelectContentTypeForUri = () => { ) } -export const selectMyClaims = createSelector( +export const selectClaimListMineIsPending = createSelector( _selectState, - (state) => state.mine || {} + (state) => state.isClaimListMinePending ) -export const selectMyClaimsById = createSelector( - selectMyClaims, - (mine) => mine.byId || {} +export const selectMyClaims = createSelector( + _selectState, + (state) => state.myClaims || {} ) export const selectMyClaimsOutpoints = createSelector( - selectMyClaimsById, - (byId) => { - const outpoints = [] - Object.keys(byId).forEach(key => { - const claim = byId[key] - const outpoint = `${claim.txid}:${claim.nout}` - outpoints.push(outpoint) - }) + selectMyClaims, + (claims) => { + if (!claims) { + return [] + } - return outpoints + return Object.values(claims).map((claim) => { + return `${claim.txid}:${claim.nout}` + }) } ) diff --git a/ui/js/selectors/file_info.js b/ui/js/selectors/file_info.js index c9104bbc2..cf7895d56 100644 --- a/ui/js/selectors/file_info.js +++ b/ui/js/selectors/file_info.js @@ -1,69 +1,38 @@ +import lbry from 'lbry' import { createSelector, } from 'reselect' import { selectClaimsByUri, + selectClaimListMineIsPending, selectMyClaimsOutpoints, } from 'selectors/claims' export const _selectState = state => state.fileInfo || {} -export const selectIsFileListPending = createSelector( - _selectState, - (state) => state.isFileListPending -) - export const selectAllFileInfos = createSelector( _selectState, (state) => state.fileInfos || {} ) -export const selectDownloading = createSelector( +export const selectFileListIsPending = createSelector( _selectState, - (state) => state.downloading || {} + (state) => state.isFileListPending ) -export const selectDownloadingByUri = createSelector( - selectDownloading, - (downloading) => downloading.byUri || {} -) - -export const selectFetchingDownloadedContent = createSelector( - _selectState, - (state) => !!state.fetchingDownloadedContent -) - -export const selectDownloadedContent = createSelector( - _selectState, - (state) => state.downloadedContent || {} -) - -export const selectDownloadedContentFileInfos = createSelector( - selectDownloadedContent, - (downloadedContent) => downloadedContent.fileInfos || [] -) - -export const selectFetchingPublishedContent = createSelector( - _selectState, - (state) => !!state.fetchingPublishedContent -) - -export const selectPublishedContent = createSelector( - _selectState, - (state) => state.publishedContent || {} +export const selectFileListDownloadedOrPublishedIsPending = createSelector( + selectFileListIsPending, + selectClaimListMineIsPending, + (isFileListPending, isClaimListMinePending) => isFileListPending || isClaimListMinePending ) export const selectFileInfoForUri = (state, props) => { const claims = selectClaimsByUri(state), claim = claims[props.uri], + fileInfos = selectAllFileInfos(state), outpoint = claim ? `${claim.txid}:${claim.nout}` : undefined - console.log('select file info') - console.log(claims) - console.log(claim) - console.log(outpoint) - console.log(selectAllFileInfos(state)) - return outpoint ? selectAllFileInfos(state)[outpoint] : undefined + return outpoint && fileInfos ? fileInfos[outpoint] : undefined } export const makeSelectFileInfoForUri = () => { @@ -73,8 +42,13 @@ export const makeSelectFileInfoForUri = () => { ) } +export const selectUrisDownloading = createSelector( + _selectState, + (state) => state.urisDownloading || {} +) + const selectDownloadingForUri = (state, props) => { - const byUri = selectDownloadingByUri(state) + const byUri = selectUrisDownloading(state) return byUri[props.uri] } @@ -85,18 +59,13 @@ export const makeSelectDownloadingForUri = () => { ) } -export const selectLoading = createSelector( +export const selectUrisLoading = createSelector( _selectState, - (state) => state.loading || {} -) - -export const selectLoadingByUri = createSelector( - selectLoading, - (loading) => loading.byUri || {} + (state) => state.urisLoading || {} ) const selectLoadingForUri = (state, props) => { - const byUri = selectLoadingByUri(state) + const byUri = selectUrisLoading(state) return byUri[props.uri] } @@ -107,13 +76,13 @@ export const makeSelectLoadingForUri = () => { ) } -export const selectDownloadedFileInfo = createSelector( +export const selectFileInfosDownloaded = createSelector( selectAllFileInfos, - (fileInfos) => { + selectMyClaimsOutpoints, + (fileInfos, myClaimOutpoints) => { const fileInfoList = [] - Object.keys(fileInfos).forEach(outpoint => { - const fileInfo = fileInfos[outpoint] - if (fileInfo.completed || fileInfo.written_bytes) { + Object.values(fileInfos).forEach(fileInfo => { + if (fileInfo && myClaimOutpoints.indexOf(fileInfo.outpoint) === -1 && (fileInfo.completed || fileInfo.written_bytes)) { fileInfoList.push(fileInfo) } }) @@ -121,20 +90,24 @@ export const selectDownloadedFileInfo = createSelector( } ) -export const selectPublishedFileInfo = createSelector( - selectAllFileInfos, - selectMyClaimsOutpoints, - (byUri, outpoints) => { - const fileInfos = [] - outpoints.forEach(outpoint => { - Object.keys(byUri).forEach(key => { - const fileInfo = byUri[key] - if (fileInfo.outpoint == outpoint) { - fileInfos.push(fileInfo) - } - }) - }) - - return fileInfos +export const selectFileInfosPendingPublish = createSelector( + _selectState, + (state) => { + return lbry.getPendingPublishes() + } +) + +export const selectFileInfosPublished = createSelector( + selectAllFileInfos, + selectFileInfosPendingPublish, + selectMyClaimsOutpoints, + (allFileInfos, pendingFileInfos, outpoints) => { + const fileInfos = [] + outpoints.forEach(outpoint => { + if (allFileInfos[outpoint]) { + fileInfos.push(allFileInfos[outpoint]) + } + }) + return [...fileInfos, ...pendingFileInfos] } )