evan/rats-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(top): top over different time over all types #26

Browse Source
This commit is contained in:
Alexey Kasyanchuk 2018-05-14 12:32:50 +03:00
parent 80fea92cbb
commit 7ba5aab9a2
2 changed files with 99 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
src/app/top-page.js
View File

@ -16,7 +16,7 @@ export default class TopPage extends Page {
super(props) super(props)
this.setTitle('Rats On The Boat - Torrents top'); this.setTitle('Rats On The Boat - Torrents top');
this.topTorrents = {}; this.topTorrents = {};
this.types = ['main', 'week', 'hours', 'month', 'video', 'audio', 'books', 'pictures', 'application', 'archive'] this.types = ['main', 'video', 'audio', 'books', 'pictures', 'application', 'archive']
this.descriptions = { this.descriptions = {
main: 'All', main: 'All',
video: 'Video', video: 'Video',
@ -24,24 +24,31 @@ export default class TopPage extends Page {
books: 'Books', books: 'Books',
pictures: 'Pictures/Images', pictures: 'Pictures/Images',
application: 'Apps/Games', application: 'Apps/Games',
archive: 'Archives', archive: 'Archives'
}
this.times = {
overall: 'Overall',
hours: 'Last hour',
week: 'Last week', week: 'Last week',
hours: 'Last 24 hours',
month: 'Last month' month: 'Last month'
} }
this.state = {value: 'All'} this.state = {type: 'main', time: 'overall'}
} }
loadMoreTorrents(type) loadMoreTorrents(type, time)
{ {
time = time ? time : this.state.time
window.torrentSocket.emit('topTorrents', window.torrentSocket.emit('topTorrents',
type == 'main' ? null : type, type == 'main' ? null : type,
{index: (this.topTorrents[type] && this.topTorrents[type].length) || 0}, {index: (this.topTorrents[type] && this.topTorrents[type][time] && this.topTorrents[type][time].length) || 0, time},
window.customLoader((data) => { window.customLoader((data) => {
if(!this.topTorrents[type]) if(!this.topTorrents[type])
this.topTorrents[type] = [] this.topTorrents[type] = {}
if(!this.topTorrents[type][time])
this.topTorrents[type][time] = []
if(data && data.length > 0) if(data && data.length > 0)
{ {
this.topTorrents[type] = this.topTorrents[type].concat(data); this.topTorrents[type][time] = this.topTorrents[type][time].concat(data);
this._update() this._update()
} }
}) })
@ -63,11 +70,13 @@ export default class TopPage extends Page {
{ {
this.loadMoreTorrents(type) this.loadMoreTorrents(type)
} }
this.remoteTopTorrents = ({torrents, type}) => { this.remoteTopTorrents = ({torrents, type, time}) => {
if(!torrents) if(!torrents)
return return
time = time ? time : 'overall'
type = type ? type : 'main' type = type ? type : 'main'
this.topTorrents[type] = _.orderBy(_.unionBy(this.topTorrents[type], torrents, 'hash'), ['seeders'], ['desc']) this.topTorrents[type][time] = _.orderBy(_.unionBy(this.topTorrents[type][time], torrents, 'hash'), ['seeders'], ['desc'])
this._update(); this._update();
} }
window.torrentSocket.on('remoteTopTorrents', this.remoteTopTorrents); window.torrentSocket.on('remoteTopTorrents', this.remoteTopTorrents);
@ -77,12 +86,6 @@ export default class TopPage extends Page {
if(this.remoteTopTorrents) if(this.remoteTopTorrents)
window.torrentSocket.off('remoteTopTorrents', this.remoteTopTorrents); window.torrentSocket.off('remoteTopTorrents', this.remoteTopTorrents);
} }
handleChange = (value) =>
{
this.setState({
value,
});
}
render() { render() {
return ( return (
<div> <div>
@ -96,38 +99,76 @@ export default class TopPage extends Page {
} }
<Tabs <Tabs
className='w100p' className='w100p'
value={this.state.value} value={this.state.type}
onChange={this.handleChange} onChange={(type) => {
this.setState({type});
// lost other content
if(!this.topTorrents[type][this.state.time])
{
this.loadMoreTorrents(type, this.state.time)
}
}}
tabItemContainerStyle={{flexWrap: 'wrap', alignItems: 'stretch'}} tabItemContainerStyle={{flexWrap: 'wrap', alignItems: 'stretch'}}
inkBarStyle={{display: 'none'}} inkBarStyle={{display: 'none'}}
> >
{ {
this.types.map((type, index) => { this.types.map((type, index) => {
const torrents = this.topTorrents[type]; if(!this.topTorrents[type])
if(!torrents)
return null; return null;
return ( return (
<Tab style={{minWidth: 150}} key={index} label={this.descriptions[type]} value={type}>
<Tabs
className='w100p'
value={this.state.time}
onChange={(time) => {
this.setState({time})
// lost other content
if(!this.topTorrents[type][time])
{
this.loadMoreTorrents(type, time)
}
}}
tabItemContainerStyle={{flexWrap: 'wrap', alignItems: 'stretch'}}
inkBarStyle={{display: 'none'}}
>
{
Object.keys(this.times).map((time, index) => {
const torrents = this.topTorrents[type][time];
<Tab style={{minWidth: 150}} key={index} label={this.descriptions[type]} value={this.descriptions[type]}> if(!torrents)
<List style={{minWidth: '20em'}}> return (
{ <Tab style={{minWidth: 150}} key={index} label={this.times[time]} value={time}>
torrents.map((torrent, index) => { <div className='pad0-75 w100p '>
return <TorrentLine key={index} torrent={torrent} /> <LinearProgress mode="indeterminate" />
}) </div>
} </Tab>
{ )
torrents.length > 0
&& return (
<div> <Tab style={{minWidth: 150}} key={index} label={this.times[time]} value={time}>
<ListItem innerDivStyle={{textAlign: 'center', padding: '1em'}} primaryText={<span>More Torrents</span>} onClick={() => { <List style={{minWidth: '20em'}}>
this.loadMoreTorrents(type) {
}} /> torrents.map((torrent, index) => {
<Divider /> return <TorrentLine key={index} torrent={torrent} />
</div> })
} }
</List> {
torrents.length > 0
&&
<div>
<ListItem innerDivStyle={{textAlign: 'center', padding: '1em'}} primaryText={<span>More Torrents</span>} onClick={() => {
this.loadMoreTorrents(type)
}} />
<Divider />
</div>
}
</List>
</Tab>)
})
}
</Tabs>
</Tab> </Tab>
) )

25
src/background/api.js
View File

@ -435,29 +435,30 @@ module.exports = ({
const index = parseInt(navigation.index) || 0; const index = parseInt(navigation.index) || 0;
const limit = parseInt(navigation.limit) || 20; const limit = parseInt(navigation.limit) || 20;
const time = navigation.time
if(type && type.length > 0) if(type && type.length > 0)
{ {
if(type == 'hours') where += ' and contentType = ' + sphinx.escape(type) + ' ';
}
if(time)
{
if(time == 'hours')
{ {
where = ' and `added` > ' + (Math.floor(Date.now() / 1000) - (60 * 60 * 24)) where += ' and `added` > ' + (Math.floor(Date.now() / 1000) - (60 * 60 * 24))
} }
else if(type == 'week') else if(time == 'week')
{ {
where = ' and `added` > ' + (Math.floor(Date.now() / 1000) - (60 * 60 * 24 * 7)) where += ' and `added` > ' + (Math.floor(Date.now() / 1000) - (60 * 60 * 24 * 7))
} }
else if(type == 'month') else if(time == 'month')
{ {
where = ' and `added` > ' + (Math.floor(Date.now() / 1000) - (60 * 60 * 24 * 30)) where += ' and `added` > ' + (Math.floor(Date.now() / 1000) - (60 * 60 * 24 * 30))
}
else
{
where += ' and contentType = ' + sphinx.escape(type) + ' ';
} }
} }
const query = `SELECT * FROM torrents WHERE seeders > 0 and contentCategory != 'xxx' ${where} ORDER BY seeders DESC LIMIT ${index},${limit}`; const query = `SELECT * FROM torrents WHERE seeders > 0 and contentCategory != 'xxx' ${where} ORDER BY seeders DESC LIMIT ${index},${limit}`;
console.log(query)
if(topCache[query]) if(topCache[query])
{ {
callback(topCache[query]); callback(topCache[query]);
@ -486,7 +487,7 @@ module.exports = ({
const peer = { address: socket.remoteAddress, port: socket.remotePort } const peer = { address: socket.remoteAddress, port: socket.remotePort }
remote = remote.map(torrent => Object.assign(torrent, {peer})) remote = remote.map(torrent => Object.assign(torrent, {peer}))
} }
send('remoteTopTorrents', {torrents: remote, type}) send('remoteTopTorrents', {torrents: remote, type, time: navigation && navigation.time})
}) })
}); });