cb6a044584
* Publish button: use spinner instead of "Publishing..." Looks better, plus the preview could take a while sometimes. * Refactor `doPublish`. No functional change This is to allow `doPublish` to accept a custom payload as an input (for resuming uploads), instead of always resolving it from the redux data. * Add doPublishResume * Support resume-able upload via tus ## Issue 38 Handle resumable file upload ## Notes Since we can't serialize a File object, we'll need to the user to re-select the file to resume. * Exclude "modified date" for Firefox/Android ## Issue It appears that the modification date of the Android file changes when selected, so that file was deemed "different" when trying to resume upload. ## Change Exclude modification date for now. Let's assume a smart user. * Move 'currentUploads' to 'publish' reducer `publish` is currently rehydrated, so we can ride on that and don't need to store the `currentUploads` in `localStorage` for persistence. This would allow us to store Markdown Post data too, as `localStorage` has a 5MB limit per app. We could have also made `webReducer` rehydrate, but in this repo, there is no need to split it to another reducer. It also makes more sense to be part of publish anyway (at least to me). This change is mostly moving items between files, with the exception of 1. An additional REHYDRATE in the publish reducer to clean up the tusUploader. 2. Not clearing `currentUploads` in CLEAR_PUBLISH. * Restore v1 code for livestream replay, etc. v2 (tus) does not handle `remote_url`, so the app still needs v1 for that. Since we'll still have v1 code, use v1 for previews as well.
208 lines
5.6 KiB
JavaScript
208 lines
5.6 KiB
JavaScript
// @flow
|
|
import { handleActions } from 'util/redux-utils';
|
|
import { buildURI } from 'util/lbryURI';
|
|
import { serializeFileObj } from 'util/file';
|
|
import * as ACTIONS from 'constants/action_types';
|
|
import * as THUMBNAIL_STATUSES from 'constants/thumbnail_upload_statuses';
|
|
import { CHANNEL_ANONYMOUS } from 'constants/claim';
|
|
|
|
const getKeyFromParam = (params) => `${params.name}#${params.channel || 'anonymous'}`;
|
|
|
|
type PublishState = {
|
|
editingURI: ?string,
|
|
fileText: ?string,
|
|
filePath: ?string,
|
|
remoteFileUrl: ?string,
|
|
contentIsFree: boolean,
|
|
fileDur: number,
|
|
fileSize: number,
|
|
fileVid: boolean,
|
|
fee: {
|
|
amount: number,
|
|
currency: string,
|
|
},
|
|
title: string,
|
|
thumbnail_url: string,
|
|
thumbnailPath: string,
|
|
uploadThumbnailStatus: string,
|
|
thumbnailError: ?boolean,
|
|
description: string,
|
|
language: string,
|
|
releaseTime: ?number,
|
|
releaseTimeEdited: ?number,
|
|
channel: string,
|
|
channelId: ?string,
|
|
name: string,
|
|
nameError: ?string,
|
|
bid: number,
|
|
bidError: ?string,
|
|
otherLicenseDescription: string,
|
|
licenseUrl: string,
|
|
tags: Array<string>,
|
|
optimize: boolean,
|
|
useLBRYUploader: boolean,
|
|
currentUploads: { [key: string]: FileUploadItem },
|
|
};
|
|
|
|
const defaultState: PublishState = {
|
|
editingURI: undefined,
|
|
fileText: '',
|
|
filePath: undefined,
|
|
fileDur: 0,
|
|
fileSize: 0,
|
|
fileVid: false,
|
|
remoteFileUrl: undefined,
|
|
contentIsFree: true,
|
|
fee: {
|
|
amount: 1,
|
|
currency: 'LBC',
|
|
},
|
|
title: '',
|
|
thumbnail_url: '',
|
|
thumbnailPath: '',
|
|
uploadThumbnailStatus: THUMBNAIL_STATUSES.API_DOWN,
|
|
thumbnailError: undefined,
|
|
description: '',
|
|
language: '',
|
|
releaseTime: undefined,
|
|
releaseTimeEdited: undefined,
|
|
nsfw: false,
|
|
channel: CHANNEL_ANONYMOUS,
|
|
channelId: '',
|
|
name: '',
|
|
nameError: undefined,
|
|
bid: 0.01,
|
|
bidError: undefined,
|
|
licenseType: 'None',
|
|
otherLicenseDescription: 'All rights reserved',
|
|
licenseUrl: '',
|
|
tags: [],
|
|
publishing: false,
|
|
publishSuccess: false,
|
|
publishError: undefined,
|
|
optimize: false,
|
|
useLBRYUploader: false,
|
|
currentUploads: {},
|
|
};
|
|
|
|
export const publishReducer = handleActions(
|
|
{
|
|
[ACTIONS.UPDATE_PUBLISH_FORM]: (state, action): PublishState => {
|
|
const { data } = action;
|
|
return {
|
|
...state,
|
|
...data,
|
|
};
|
|
},
|
|
[ACTIONS.CLEAR_PUBLISH]: (state: PublishState): PublishState => ({
|
|
...defaultState,
|
|
uri: undefined,
|
|
channel: state.channel,
|
|
bid: state.bid,
|
|
optimize: state.optimize,
|
|
language: state.language,
|
|
currentUploads: state.currentUploads,
|
|
}),
|
|
[ACTIONS.PUBLISH_START]: (state: PublishState): PublishState => ({
|
|
...state,
|
|
publishing: true,
|
|
publishSuccess: false,
|
|
}),
|
|
[ACTIONS.PUBLISH_FAIL]: (state: PublishState): PublishState => ({
|
|
...state,
|
|
publishing: false,
|
|
}),
|
|
[ACTIONS.PUBLISH_SUCCESS]: (state: PublishState): PublishState => ({
|
|
...state,
|
|
publishing: false,
|
|
publishSuccess: true,
|
|
}),
|
|
[ACTIONS.DO_PREPARE_EDIT]: (state: PublishState, action) => {
|
|
const { ...publishData } = action.data;
|
|
const { channel, name, uri } = publishData;
|
|
|
|
// The short uri is what is presented to the user
|
|
// The editingUri is the full uri with claim id
|
|
const shortUri = buildURI({
|
|
channelName: channel,
|
|
streamName: name,
|
|
});
|
|
|
|
return {
|
|
...defaultState,
|
|
...publishData,
|
|
editingURI: uri,
|
|
uri: shortUri,
|
|
currentUploads: state.currentUploads,
|
|
};
|
|
},
|
|
[ACTIONS.UPDATE_UPLOAD_ADD]: (state: PublishState, action) => {
|
|
const { file, params, uploader } = action.data;
|
|
const key = getKeyFromParam(params);
|
|
const currentUploads = Object.assign({}, state.currentUploads);
|
|
|
|
currentUploads[key] = {
|
|
file,
|
|
fileFingerprint: file ? serializeFileObj(file) : undefined, // TODO: get hash instead?
|
|
progress: '0',
|
|
params,
|
|
uploader,
|
|
resumable: !(uploader instanceof XMLHttpRequest),
|
|
};
|
|
|
|
return { ...state, currentUploads };
|
|
},
|
|
[ACTIONS.UPDATE_UPLOAD_PROGRESS]: (state: PublishState, action) => {
|
|
const { params, progress, status } = action.data;
|
|
const key = getKeyFromParam(params);
|
|
const currentUploads = Object.assign({}, state.currentUploads);
|
|
|
|
if (!currentUploads[key]) {
|
|
return state;
|
|
}
|
|
|
|
if (progress) {
|
|
currentUploads[key].progress = progress;
|
|
delete currentUploads[key].status;
|
|
} else if (status) {
|
|
currentUploads[key].status = status;
|
|
if (status === 'error') {
|
|
delete currentUploads[key].uploader;
|
|
}
|
|
}
|
|
|
|
return { ...state, currentUploads };
|
|
},
|
|
[ACTIONS.UPDATE_UPLOAD_REMOVE]: (state: PublishState, action) => {
|
|
const { params } = action.data;
|
|
const key = getKeyFromParam(params);
|
|
const currentUploads = Object.assign({}, state.currentUploads);
|
|
|
|
delete currentUploads[key];
|
|
|
|
return { ...state, currentUploads };
|
|
},
|
|
[ACTIONS.REHYDRATE]: (state: PublishState, action) => {
|
|
if (action && action.payload && action.payload.publish) {
|
|
const newPublish = { ...action.payload.publish };
|
|
|
|
// Cleanup for 'publish::currentUploads'
|
|
if (newPublish.currentUploads) {
|
|
Object.keys(newPublish.currentUploads).forEach((key) => {
|
|
const params = newPublish.currentUploads[key].params;
|
|
if (!params || Object.keys(params).length === 0) {
|
|
delete newPublish.currentUploads[key];
|
|
} else {
|
|
delete newPublish.currentUploads[key].uploader;
|
|
}
|
|
});
|
|
}
|
|
|
|
return newPublish;
|
|
}
|
|
|
|
return state;
|
|
},
|
|
},
|
|
defaultState
|
|
);
|