LBRYCommunity/lbry-android
1
0
Fork 0
Code Issues 155 Pull requests 6 Projects Releases 84 Packages Wiki Activity

Uri encode filenames with spaces for the media player #229

Merged
akinwale merged 1 commit from uri-encode-paths into master 2018-08-14 08:51:05 +02:00
Conversation 0 Commits 1 Files changed 1 +7 -1
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/component/mediaPlayer/view.js
View file

@ -261,6 +261,12 @@ class MediaPlayer extends React.PureComponent {
return null;
}
getEncodedDownloadPath = (fileInfo) => {
const { file_name: fileName } = fileInfo;
const encodedFileName = encodeURIComponent(fileName).replace(/!/g, '%21');
skhameneh commented 2018-08-14 06:27:35 +02:00 (Migrated from github.com)
Review
Copy link

The entire set of unescaped characters is -_.!~*'(), does this need to reflect that?

The entire set of unescaped characters is `-_.!~*'()`, does this need to reflect that?
akinwale commented 2018-08-14 08:50:51 +02:00 (Migrated from github.com)
Review
Copy link

Not necessarily. The rest of the characters can be left as is in the filename, but if we have to escape any of them in the future, we could just add an additional replace call here.

Not necessarily. The rest of the characters can be left as is in the filename, but if we have to escape any of them in the future, we could just add an additional `replace` call here.
return fileInfo.download_path.replace(new RegExp(fileName, 'g'), encodedFileName);
}
render() {
const { backgroundPlayEnabled, fileInfo, thumbnail, onLayout, style } = this.props;
const completedWidth = this.getCurrentTimePercentage() * this.seekerWidth;
@ -279,7 +285,7 @@ class MediaPlayer extends React.PureComponent {
return (
<View style={styles} onLayout={onLayout}>
<Video source={{ uri: 'file:///' + fileInfo.download_path }}
<Video source={{ uri: 'file:///' + this.getEncodedDownloadPath(fileInfo) }}
ref={(ref: Video) => { this.video = ref }}
resizeMode={this.state.resizeMode}
playInBackground={backgroundPlayEnabled}