LBRYCommunity/lbry-redux
1
0
Fork 0
Code Issues 5 Pull requests 6 Projects Releases Packages Wiki Activity

updated redux/selectors/file_info with latest changes from lbry-app master

Browse source
This commit is contained in:
Akinwale Ariwodola 2018-04-04 15:39:43 +01:00
parent ab4104d6f4
commit d2e4d6ef13
2 changed files with 43 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
build/index.js
View file

@ -1749,10 +1749,10 @@ exports.selectSearchDownloadUris = exports.selectTotalDownloadProgress = exports
var _claims = __webpack_require__(3);
var _lbryURI = __webpack_require__(2);
var _reselect = __webpack_require__(1);
var _lbryURI = __webpack_require__(2);
var selectState = exports.selectState = function selectState(state) {
return state.fileInfo || {};
};
@ -1846,7 +1846,7 @@ var selectTotalDownloadProgress = exports.selectTotalDownloadProgress = (0, _res
});
var selectSearchDownloadUris = exports.selectSearchDownloadUris = function selectSearchDownloadUris(query) {
return (0, _reselect.createSelector)(selectFileInfosDownloaded, function (fileInfos) {
return (0, _reselect.createSelector)(selectFileInfosDownloaded, _claims.selectClaimsById, function (fileInfos, claimsById) {
if (!query || !fileInfos.length) {
return null;
}
@ -1869,24 +1869,24 @@ var selectSearchDownloadUris = exports.selectSearchDownloadUris = function selec
var downloadResultsFromQuery = [];
fileInfos.forEach(function (fileInfo) {
var channel_name = fileInfo.channel_name,
claim_name = fileInfo.claim_name,
var channelName = fileInfo.channel_name,
claimName = fileInfo.claim_name,
metadata = fileInfo.metadata;
var author = metadata.author,
description = metadata.description,
title = metadata.title;
if (channel_name) {
var channelName = channel_name.toLowerCase();
var strippedOutChannelName = channelName.slice(1); // trim off the @
if (searchQueryDictionary[channel_name] || searchQueryDictionary[strippedOutChannelName]) {
if (channelName) {
var lowerCaseChannel = channelName.toLowerCase();
var strippedOutChannelName = lowerCaseChannel.slice(1); // trim off the @
if (searchQueryDictionary[channelName] || searchQueryDictionary[strippedOutChannelName]) {
downloadResultsFromQuery.push(fileInfo);
return;
}
}
var nameParts = claim_name.toLowerCase().split('-');
var nameParts = claimName.toLowerCase().split('-');
if (arrayContainsQueryPart(nameParts)) {
downloadResultsFromQuery.push(fileInfo);
return;
@ -1917,20 +1917,25 @@ var selectSearchDownloadUris = exports.selectSearchDownloadUris = function selec
return downloadResultsFromQuery.length ? downloadResultsFromQuery.map(function (fileInfo) {
var channelName = fileInfo.channel_name,
claimId = fileInfo.claim_id,
claimName = fileInfo.claim_name,
value = fileInfo.value,
metadata = fileInfo.metadata;
claimName = fileInfo.claim_name;
var uriParams = {};
if (channelName) {
var claim = claimsById[claimId];
if (claim.value) {
uriParams.claimId = claim.value.publisherSignature.certificateId;
} else {
uriParams.claimId = claimId;
}
uriParams.channelName = channelName;
uriParams.contentName = claimName;
} else {
uriParams.claimId = claimId;
uriParams.claimName = claimName;
}
uriParams.claimId = claimId;
uriParams.claimId = claimId;
uriParams.contentName = claimName;
var uri = (0, _lbryURI.buildURI)(uriParams);
return uri;
}) : null;

40
src/redux/selectors/file_info.js
View file

@ -2,9 +2,10 @@ import {
selectClaimsByUri,
selectIsFetchingClaimListMine,
selectMyClaims,
selectClaimsById,
} from 'redux/selectors/claims';
import { buildURI } from 'lbryURI';
import { createSelector } from 'reselect';
import { buildURI } from 'lbryURI';
export const selectState = state => state.fileInfo || {};
@ -106,7 +107,7 @@ export const selectTotalDownloadProgress = createSelector(selectDownloadingFileI
});
export const selectSearchDownloadUris = query =>
createSelector(selectFileInfosDownloaded, fileInfos => {
createSelector(selectFileInfosDownloaded, selectClaimsById, (fileInfos, claimsById) => {
if (!query || !fileInfos.length) {
return null;
}
@ -129,19 +130,19 @@ export const selectSearchDownloadUris = query =>
const downloadResultsFromQuery = [];
fileInfos.forEach(fileInfo => {
const { channel_name, claim_name, metadata } = fileInfo;
const { channel_name: channelName, claim_name: claimName, metadata } = fileInfo;
const { author, description, title } = metadata;
if (channel_name) {
const channelName = channel_name.toLowerCase();
const strippedOutChannelName = channelName.slice(1); // trim off the @
if (searchQueryDictionary[channel_name] || searchQueryDictionary[strippedOutChannelName]) {
if (channelName) {
const lowerCaseChannel = channelName.toLowerCase();
const strippedOutChannelName = lowerCaseChannel.slice(1); // trim off the @
if (searchQueryDictionary[channelName] || searchQueryDictionary[strippedOutChannelName]) {
downloadResultsFromQuery.push(fileInfo);
return;
}
}
const nameParts = claim_name.toLowerCase().split('-');
const nameParts = claimName.toLowerCase().split('-');
if (arrayContainsQueryPart(nameParts)) {
downloadResultsFromQuery.push(fileInfo);
return;
@ -171,23 +172,24 @@ export const selectSearchDownloadUris = query =>
return downloadResultsFromQuery.length
? downloadResultsFromQuery.map(fileInfo => {
const {
channel_name: channelName,
claim_id: claimId,
claim_name: claimName,
value,
metadata,
} = fileInfo;
const { channel_name: channelName, claim_id: claimId, claim_name: claimName } = fileInfo;
const uriParams = {};
if (channelName) {
const claim = claimsById[claimId];
if (claim.value) {
uriParams.claimId = claim.value.publisherSignature.certificateId;
} else {
uriParams.claimId = claimId;
}
uriParams.channelName = channelName;
uriParams.contentName = claimName;
} else {
uriParams.claimId = claimId;
uriParams.claimName = claimName;
}
uriParams.claimId = claimId;
uriParams.claimId = claimId;
uriParams.contentName = claimName;
const uri = buildURI(uriParams);
return uri;
})