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

Upgrade daemon to 0.19.0 #1032

Merged
liamcardenas merged 15 commits from daemon19 into master 2018-03-09 08:53:39 +01:00
Conversation 1 Commits 15 Files changed 17 +7 -7
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 26c62fc326 - Show all commits

2
src/renderer/component/fileList/view.jsx
View file

@ -74,7 +74,7 @@ class FileList extends React.PureComponent {
uriParams.claimId = this.getChannelSignature(fileInfo); uriParams.claimId = this.getChannelSignature(fileInfo);
} else { } else {
uriParams.claimId = fileInfo.claim_id; uriParams.claimId = fileInfo.claim_id;
uriParams.claim_name = fileInfo.claim_name; uriParams.claimName = fileInfo.claim_name;
} }
const uri = buildURI(uriParams); const uri = buildURI(uriParams);

12
src/renderer/lbryURI.js
View file

@ -34,7 +34,7 @@ export function parseURI(URI, requireProto = false) {
'([:$#]?)([^/]*)' + // modifier separator, modifier (stops at the first path separator or end) '([:$#]?)([^/]*)' + // modifier separator, modifier (stops at the first path separator or end)
'(/?)(.*)' // path separator, path '(/?)(.*)' // path separator, path
); );
const [proto, claim_name, modSep, modVal, pathSep, path] = componentsRegex const [proto, claimName, modSep, modVal, pathSep, path] = componentsRegex
.exec(URI) .exec(URI)
.slice(1) .slice(1)
.map(match => match || null); .map(match => match || null);
@ -47,12 +47,12 @@ export function parseURI(URI, requireProto = false) {
} }
// Validate and process name // Validate and process name
if (!claim_name) { if (!claimName) {
throw new Error(__('URI does not include name.')); throw new Error(__('URI does not include name.'));
} }
const isChannel = claim_name.startsWith('@'); const isChannel = claimName.startsWith('@');
const channelName = isChannel ? claim_name.slice(1) : claim_name; const channelName = isChannel ? claimName.slice(1) : claimName;
if (isChannel) { if (isChannel) {
if (!channelName) { if (!channelName) {
@ -66,7 +66,7 @@ export function parseURI(URI, requireProto = false) {
contentName = path; contentName = path;
} }
const nameBadChars = (channelName || claim_name).match(regexInvalidURI); const nameBadChars = (channelName || claimName).match(regexInvalidURI);
if (nameBadChars) { if (nameBadChars) {
throw new Error( throw new Error(
__( __(
@ -128,7 +128,7 @@ export function parseURI(URI, requireProto = false) {
} }
return { return {
claim_name, claim_name: claimName,
path, path,
isChannel, isChannel,
...(contentName ? { contentName } : {}), ...(contentName ? { contentName } : {}),