From 63b496f7cab8a2022639023afc67c8e025bc9937 Mon Sep 17 00:00:00 2001 From: btzr-io Date: Thu, 22 Mar 2018 18:20:00 -0700 Subject: [PATCH 1/4] implement lbry.getFileTitle function fix sort by title on download / publish page --- src/renderer/component/fileList/view.jsx | 9 +++------ src/renderer/lbry.js | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/renderer/component/fileList/view.jsx b/src/renderer/component/fileList/view.jsx index 9c926e825..1af98000b 100644 --- a/src/renderer/component/fileList/view.jsx +++ b/src/renderer/component/fileList/view.jsx @@ -1,4 +1,5 @@ import React from 'react'; +import lbry from 'lbry.js'; import { buildURI } from 'lbryURI'; import FormField from 'component/formField'; import FileTile from 'component/fileTile'; @@ -49,12 +50,8 @@ class FileList extends React.PureComponent { : fileInfos, title: fileInfos => fileInfos.slice().sort((fileInfo1, fileInfo2) => { - const title1 = fileInfo1.value - ? fileInfo1.value.stream.metadata.title.toLowerCase() - : fileInfo1.claim_name; - const title2 = fileInfo2.value - ? fileInfo2.value.stream.metadata.title.toLowerCase() - : fileInfo2.claim_name; + const title1 = lbry.getFileTitle(fileInfo1).toLowerCase(); + const title2 = lbry.getFileTitle(fileInfo2).toLowerCase(); if (title1 < title2) { return -1; } else if (title1 > title2) { diff --git a/src/renderer/lbry.js b/src/renderer/lbry.js index 79855b4ce..f6887be1e 100644 --- a/src/renderer/lbry.js +++ b/src/renderer/lbry.js @@ -204,6 +204,20 @@ Lbry.getAppVersionInfo = () => ipcRenderer.send('version-info-requested'); }); +Lbry.getFileTitle = fileInfo => { + const { value, metadata, claim_name, name } = fileInfo; + if (metadata) { + // downloaded claim + return metadata.title || claim_name; + } else if (value) { + // published claim + const { title } = value.stream.metadata; + return title || name; + } + // Invalid claim + return ''; +}; + /** * Wrappers for API methods to simulate missing or future behavior. Unlike the old-style stubs, * these are designed to be transparent wrappers around the corresponding API methods. From 172e3fd05abee24897393e3a0290344e27feda49 Mon Sep 17 00:00:00 2001 From: btzr-io Date: Fri, 23 Mar 2018 13:19:16 -0700 Subject: [PATCH 2/4] reduce usage of lbry.js --- src/renderer/component/fileList/view.jsx | 18 +++++++++++++++--- src/renderer/lbry.js | 22 ---------------------- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/src/renderer/component/fileList/view.jsx b/src/renderer/component/fileList/view.jsx index 1af98000b..a3e6f4726 100644 --- a/src/renderer/component/fileList/view.jsx +++ b/src/renderer/component/fileList/view.jsx @@ -1,5 +1,4 @@ import React from 'react'; -import lbry from 'lbry.js'; import { buildURI } from 'lbryURI'; import FormField from 'component/formField'; import FileTile from 'component/fileTile'; @@ -50,8 +49,21 @@ class FileList extends React.PureComponent { : fileInfos, title: fileInfos => fileInfos.slice().sort((fileInfo1, fileInfo2) => { - const title1 = lbry.getFileTitle(fileInfo1).toLowerCase(); - const title2 = lbry.getFileTitle(fileInfo2).toLowerCase(); + const getFileTitle = fileInfo => { + const { value, metadata, claim_name, name } = fileInfo; + if (metadata) { + // downloaded claim + return metadata.title || claim_name; + } else if (value) { + // published claim + const { title } = value.stream.metadata; + return title || name; + } + // Invalid claim + return ''; + }; + const title1 = getFileTitle(fileInfo1).toLowerCase(); + const title2 = getFileTitle(fileInfo2).toLowerCase(); if (title1 < title2) { return -1; } else if (title1 > title2) { diff --git a/src/renderer/lbry.js b/src/renderer/lbry.js index f6887be1e..b7356894b 100644 --- a/src/renderer/lbry.js +++ b/src/renderer/lbry.js @@ -196,28 +196,6 @@ Lbry.getMediaType = (contentType, fileName) => { return 'unknown'; }; -Lbry.getAppVersionInfo = () => - new Promise(resolve => { - ipcRenderer.once('version-info-received', (event, versionInfo) => { - resolve(versionInfo); - }); - ipcRenderer.send('version-info-requested'); - }); - -Lbry.getFileTitle = fileInfo => { - const { value, metadata, claim_name, name } = fileInfo; - if (metadata) { - // downloaded claim - return metadata.title || claim_name; - } else if (value) { - // published claim - const { title } = value.stream.metadata; - return title || name; - } - // Invalid claim - return ''; -}; - /** * Wrappers for API methods to simulate missing or future behavior. Unlike the old-style stubs, * these are designed to be transparent wrappers around the corresponding API methods. From 9dcf3959a360f85af3f31974e73a678a0aacd0ba Mon Sep 17 00:00:00 2001 From: btzr-io Date: Sat, 24 Mar 2018 10:15:13 -0700 Subject: [PATCH 3/4] revert getAppVersion --- src/renderer/lbry.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/renderer/lbry.js b/src/renderer/lbry.js index b7356894b..bdcd095c5 100644 --- a/src/renderer/lbry.js +++ b/src/renderer/lbry.js @@ -174,6 +174,14 @@ Lbry.publishDeprecated = (params, fileListedCallback, publishedCallback, errorCa Lbry.imagePath = file => `${staticResourcesPath}/img/${file}`; +Lbry.getAppVersionInfo = () => + new Promise(resolve => { + ipcRenderer.once('version-info-received', (event, versionInfo) => { + resolve(versionInfo); + }); + ipcRenderer.send('version-info-requested'); + }); + Lbry.getMediaType = (contentType, fileName) => { if (contentType) { return /^[^/]+/.exec(contentType)[0]; From 6ec3a8f8ee24f19f43c9dabb795e58476f38b432 Mon Sep 17 00:00:00 2001 From: btzr-io Date: Sat, 24 Mar 2018 10:30:57 -0700 Subject: [PATCH 4/4] make codacy-bot happy again! --- src/renderer/component/fileList/view.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderer/component/fileList/view.jsx b/src/renderer/component/fileList/view.jsx index a3e6f4726..a18aac95f 100644 --- a/src/renderer/component/fileList/view.jsx +++ b/src/renderer/component/fileList/view.jsx @@ -50,10 +50,10 @@ class FileList extends React.PureComponent { title: fileInfos => fileInfos.slice().sort((fileInfo1, fileInfo2) => { const getFileTitle = fileInfo => { - const { value, metadata, claim_name, name } = fileInfo; + const { value, metadata, name, claim_name: claimName } = fileInfo; if (metadata) { // downloaded claim - return metadata.title || claim_name; + return metadata.title || claimName; } else if (value) { // published claim const { title } = value.stream.metadata;