;
+ }
});
\ No newline at end of file
diff --git a/js/lbry.js b/js/lbry.js
index 3c8d7a0a8..16b8f5ef8 100644
--- a/js/lbry.js
+++ b/js/lbry.js
@@ -103,6 +103,22 @@ lbry.getFileStatus = function(name, callback) {
lbry.call('get_lbry_file', { 'name': name }, callback);
}
+lbry.getFilesInfo = function(callback) {
+ lbry.call('get_lbry_files', {}, callback);
+}
+
+lbry.startFile = function(name, callback) {
+ lbry.call('start_lbry_file', { name: name }, callback);
+}
+
+lbry.stopFile = function(name, callback) {
+ lbry.call('stop_lbry_file', { name: name }, callback);
+}
+
+lbry.deleteFile = function(name, callback) {
+ lbry.call('delete_lbry_file', { name: name }, callback)
+}
+
lbry.getVersionInfo = function(callback) {
lbry.call('version', {}, callback);
};
@@ -154,6 +170,26 @@ lbry.imagePath = function(file)
return lbry.rootPath + '/img/' + file;
}
+lbry.getMediaType = function(filename) {
+ var dotIndex = filename.lastIndexOf('.');
+ if (dotIndex == -1) {
+ return 'unknown';
+ }
+
+ var ext = filename.substr(dotIndex + 1);
+ if (/^mp4|mov|m4v|flv|f4v$/i.test(ext)) {
+ return 'video';
+ } else if (/^mp3|m4a|aac|wav|flac|ogg$/i.test(ext)) {
+ return 'audio';
+ } else if (/^html|htm|pdf|odf|doc|docx|md|markdown|txt$/i.test(ext)) {
+ return 'document';
+ } else {
+ return 'unknown';
+ }
+}
+
lbry.stop = function(callback) {
lbry.call('stop', {}, callback);
};
+
+
diff --git a/js/page/help.js b/js/page/help.js
index c4599692f..64f0845cb 100644
--- a/js/page/help.js
+++ b/js/page/help.js
@@ -3,7 +3,8 @@
var HelpPage = React.createClass({
render: function() {
return (
- Troubleshooting
Here are the most commonly encountered problems and what to try doing about them.
diff --git a/js/page/home.js b/js/page/home.js index 914c24248..a05acd075 100644 --- a/js/page/home.js +++ b/js/page/home.js @@ -228,23 +228,41 @@ var Header = React.createClass({ }); var topBarStyle = { - 'float': 'right' + 'float': 'right', + 'position': 'relative', + 'height': '26px', }, balanceStyle = { 'marginRight': '5px' -}, -closeIconStyle = { - 'color': '#ff5155' }; +var mainMenuStyle = { + position: 'absolute', + top: '26px', + right: '0px', +}; + +var MainMenu = React.createClass({ + render: function() { + var isLinux = /linux/i.test(navigator.userAgent); // @TODO: find a way to use getVersionInfo() here without messy state management + return ( +
+
+
+ );
+ }
+});
+
var TopBar = React.createClass({
- onClose: function() {
- window.location.href = "?start";
- },
getInitialState: function() {
return {
balance: 0,
- showClose: /linux/i.test(navigator.userAgent) // @TODO: find a way to use getVersionInfo() here without messy state management
};
},
componentDidMount: function() {
@@ -254,27 +272,34 @@ var TopBar = React.createClass({
});
}.bind(this));
},
-
+ onClose: function() {
+ window.location.href = "?start";
+ },
render: function() {
return (
+
);
+ }
+ }
+ return (
+
+
+
+
+
+ );
+ }
+});
\ No newline at end of file
diff --git a/js/page/report.js b/js/page/report.js
index ddfb999c4..bd46f2919 100644
--- a/js/page/report.js
+++ b/js/page/report.js
@@ -20,7 +20,8 @@ var ReportPage = React.createClass({
},
render: function() {
return (
-
+
+
+
+
+
+
diff --git a/js/page/watch.js b/js/page/watch.js
index a34e5eddb..c0af88688 100644
--- a/js/page/watch.js
+++ b/js/page/watch.js
@@ -1,6 +1,6 @@
var videoStyle = {
width: '100%',
- height: '100%',
+// height: '100%',
backgroundColor: '#000'
};
@@ -19,19 +19,6 @@ var WatchPage = React.createClass({
lbry.getStream(this.props.name);
this.updateLoadStatus();
},
- reloadIfNeeded: function() {
- // Fallback option for loading problems: every 15 seconds, if the video hasn't reported being
- // playable yet, ask it to reload.
- if (!this.state.readyToPlay) {
- this._video.load()
- setTimeout(() => { this.reloadIfNeeded() }, 15000);
- }
- },
- onCanPlay: function() {
- this.setState({
- readyToPlay: true
- });
- },
updateLoadStatus: function() {
lbry.getFileStatus(this.props.name, (status) => {
if (!status || status.code != 'running' || status.written_bytes == 0) {
@@ -44,31 +31,20 @@ var WatchPage = React.createClass({
setTimeout(() => { this.updateLoadStatus() }, 250);
} else {
this.setState({
- loadStatusMessage: "Buffering",
- downloadStarted: true,
- });
- setTimeout(() => { this.reloadIfNeeded() }, 15000);
+ readyToPlay: true
+ })
+ flowplayer('player', 'js/flowplayer/flowplayer-3.2.18.swf');
}
});
},
render: function() {
- if (!this.state.downloadStarted) {
- var video = null;
- } else {
- // If the download has started, render the
+
+ );
+ }
+});
+
+var MyFilesPage = React.createClass({
+ getInitialState: function() {
+ return {
+ filesInfo: null,
+ };
+ },
+ componentWillMount: function() {
+ this.updateFilesInfo();
+ },
+ updateFilesInfo: function() {
+ lbry.getFilesInfo((filesInfo) => {
+ this.setState({
+ filesInfo: (filesInfo ? filesInfo : []),
+ });
+ setTimeout(() => { this.updateFilesInfo() }, 1000);
+ });
+ },
+ render: function() {
+ if (this.state.filesInfo === null) {
+ return null;
+ }
+
+ if (!this.state.filesInfo.length) {
+ var content = You haven't downloaded anything from LBRY yet. Go !;
+ } else {
+ var content = [];
+ for (let fileInfo of this.state.filesInfo) {
+ let {completed, written_bytes, total_bytes, lbry_uri, file_name, stopped, metadata} = fileInfo;
+ let {name, stream_name, thumbnail} = metadata;
+
+ var title = (name || stream_name || ('lbry://' + lbry_uri));
+ var ratioLoaded = written_bytes / total_bytes;
+ var showWatchButton = (lbry.getMediaType(file_name) == 'video');
+
+ content.push(
+ 
+
+
+
+
+ {this.props.title}
+ + { ' ' } + {this.props.completed ? 'Download complete' : (parseInt(this.props.ratioLoaded * 100) + '%')} +{ pauseLink }
+ { watchLink }
+
+ { this.onRemoveClicked() } } />
+
+ +
My files
+ {content} +Report a bug
Please describe the problem you experienced and any information you think might be useful to us. Links to screenshots are great!
diff --git a/js/page/settings.js b/js/page/settings.js index 958bcd312..31b7c1d27 100644 --- a/js/page/settings.js +++ b/js/page/settings.js @@ -73,7 +73,8 @@ var SettingsPage = React.createClass({ } return ( -