From b61f4bfe1f3bdeb7c746fad1d2ab781cbe08b5b1 Mon Sep 17 00:00:00 2001
From: zxawry <zxawry@gmail.com>
Date: Tue, 11 Jun 2019 16:09:14 +0100
Subject: [PATCH 1/2] add note to reselect file on edit

---
 src/ui/component/publishForm/view.jsx | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/ui/component/publishForm/view.jsx b/src/ui/component/publishForm/view.jsx
index c7cfe67d3..897dd7f20 100644
--- a/src/ui/component/publishForm/view.jsx
+++ b/src/ui/component/publishForm/view.jsx
@@ -394,15 +394,16 @@ class PublishForm extends React.PureComponent<Props> {
               <header className="card__header">
                 <h2 className="card__title">{__('Thumbnail')}</h2>
                 <p className="card__subtitle">
-                  {uploadThumbnailStatus === THUMBNAIL_STATUSES.API_DOWN ? (
-                    __('Enter a URL for your thumbnail.')
-                  ) : (
-                    <React.Fragment>
-                      {__('Upload your thumbnail (.png/.jpg/.jpeg/.gif) to')}{' '}
-                      <Button button="link" label={__('spee.ch')} href="https://spee.ch/about" />.{' '}
-                      {__('Recommended size: 800x450 (16:9)')}
-                    </React.Fragment>
-                  )}
+                  {(uploadThumbnailStatus === undefined && __('You should reselect your file to choose a thumbnail')) ||
+                    (uploadThumbnailStatus === THUMBNAIL_STATUSES.API_DOWN ? (
+                      __('Enter a URL for your thumbnail.')
+                    ) : (
+                      <React.Fragment>
+                        {__('Upload your thumbnail (.png/.jpg/.jpeg/.gif) to')}{' '}
+                        <Button button="link" label={__('spee.ch')} href="https://spee.ch/about" />.{' '}
+                        {__('Recommended size: 800x450 (16:9)')}
+                      </React.Fragment>
+                    ))}
                 </p>
               </header>
 

From 0c0c63487268f1f833d615c58713fe83e742905c Mon Sep 17 00:00:00 2001
From: zxawry <zxawry@gmail.com>
Date: Tue, 11 Jun 2019 16:30:36 +0100
Subject: [PATCH 2/2] auto select file on edit

---
 src/ui/page/file/index.js       |  2 +-
 src/ui/page/file/view.jsx       |  4 ++--
 src/ui/redux/actions/publish.js | 11 ++++++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/ui/page/file/index.js b/src/ui/page/file/index.js
index 300d38a5c..03107eb03 100644
--- a/src/ui/page/file/index.js
+++ b/src/ui/page/file/index.js
@@ -49,7 +49,7 @@ const perform = dispatch => ({
   fetchFileInfo: uri => dispatch(doFetchFileInfo(uri)),
   fetchCostInfo: uri => dispatch(doFetchCostInfoForUri(uri)),
   openModal: (modal, props) => dispatch(doOpenModal(modal, props)),
-  prepareEdit: (publishData, uri) => dispatch(doPrepareEdit(publishData, uri)),
+  prepareEdit: (publishData, uri, fileInfo) => dispatch(doPrepareEdit(publishData, uri, fileInfo)),
   setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
   setViewed: uri => dispatch(doSetContentHistoryItem(uri)),
   markSubscriptionRead: (channel, uri) => dispatch(doRemoveUnreadSubscription(channel, uri)),
diff --git a/src/ui/page/file/view.jsx b/src/ui/page/file/view.jsx
index d16cef361..9bc270c08 100644
--- a/src/ui/page/file/view.jsx
+++ b/src/ui/page/file/view.jsx
@@ -36,7 +36,7 @@ type Props = {
   isSubscribed: boolean,
   channelUri: string,
   viewCount: number,
-  prepareEdit: ({}, string) => void,
+  prepareEdit: ({}, string, {}) => void,
   openModal: (id: string, { uri: string }) => void,
   markSubscriptionRead: (string, string) => void,
   fetchViewCount: string => void,
@@ -268,7 +268,7 @@ class FilePage extends React.Component<Props> {
                   label={__('Edit')}
                   navigate="/$/publish"
                   onClick={() => {
-                    prepareEdit(claim, editUri);
+                    prepareEdit(claim, editUri, fileInfo);
                   }}
                 />
               )}
diff --git a/src/ui/redux/actions/publish.js b/src/ui/redux/actions/publish.js
index 4c40575b3..b525c9632 100644
--- a/src/ui/redux/actions/publish.js
+++ b/src/ui/redux/actions/publish.js
@@ -137,7 +137,7 @@ export const doUploadThumbnail = (filePath: string, thumbnailBuffer: Uint8Array)
     .catch(err => uploadError(err.message));
 };
 
-export const doPrepareEdit = (claim: StreamClaim, uri: string) => (dispatch: Dispatch) => {
+export const doPrepareEdit = (claim: StreamClaim, uri: string, fileInfo: FileListItem) => (dispatch: Dispatch) => {
   const { name, amount, channel_name: channelName, value } = claim;
 
   const {
@@ -189,6 +189,15 @@ export const doPrepareEdit = (claim: StreamClaim, uri: string) => (dispatch: Dis
     publishData.licenseType = license;
   }
 
+  if (fileInfo && fileInfo.download_path) {
+    try {
+      fs.accessSync(fileInfo.download_path, fs.constants.R_OK);
+      publishData.filePath = fileInfo.download_path;
+    } catch (e) {
+      console.error(e.name, e.message);
+    }
+  }
+
   dispatch({ type: ACTIONS.DO_PREPARE_EDIT, data: publishData });
 };