zoriya/flood
1
0
Fork 0
mirror of https://github.com/zoriya/flood.git synced 2026-06-03 11:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add sort by eta

Browse Source
This commit is contained in:
John F
2015-04-12 22:42:06 -04:00
parent 80d7778ad8
commit 21d5f2c1eb
3 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
models/client.js
+10 -4
View File
@@ -170,27 +170,33 @@ client.prototype.getTorrentList = function(callback) {
var hours = Math.floor((((seconds % 31536000) % 604800) % 86400) / 3600);
var minutes = Math.floor(((((seconds % 31536000) % 604800) % 86400) % 3600) / 60);
var wholeSeconds = Math.floor((((((seconds % 31536000) % 604800) % 86400) % 3600) % 60) / 60);
var timeRemaining = {};
seconds = Math.floor(seconds);
if (years > 0) {
timeRemaining = {
years: years,
weeks: weeks
weeks: weeks,
seconds: seconds
}
} else if (weeks > 0) {
timeRemaining = {
weeks: weeks,
days: days
days: days,
seconds: seconds
}
} else if (days > 0) {
timeRemaining = {
days: days,
hours: hours
hours: hours,
seconds: seconds
}
} else if (hours > 0) {
timeRemaining = {
hours: hours,
minutes: minutes
minutes: minutes,
seconds: seconds
}
} else if (minutes > 0) {
timeRemaining = {
source/scripts/components/torrent-list/TorrentListHeader.js
+1 -1
View File
@@ -52,7 +52,7 @@ var TorrentListHeader = React.createClass({
<div className="torrent__detail--secondary">
<HeaderItem label="Up" slug="speed" propertyVar="uploadRate" sortCriteria={this.props.sortCriteria} />
<HeaderItem label="Down" slug="speed" propertyVar="downloadRate" sortCriteria={this.props.sortCriteria} />
<HeaderItem label="ETA" slug="eta" propertyVar="name" sortCriteria={this.props.sortCriteria} />
<HeaderItem label="ETA" slug="eta" propertyVar="eta" sortCriteria={this.props.sortCriteria} />
<HeaderItem label="Completed" slug="completed" propertyVar="percentComplete" sortCriteria={this.props.sortCriteria} />
<HeaderItem label="Size" slug="size" propertyVar="sizeBytes" sortCriteria={this.props.sortCriteria} />
<HeaderItem label="Ratio" slug="ratio" propertyVar="ratio" sortCriteria={this.props.sortCriteria} />
source/scripts/stores/TorrentStore.js
+31 -11
View File
@@ -124,34 +124,54 @@ var sortTorrentList = function() {
var sortedList = _torrents.sort(function(a, b) {
var propA = a[property];
var propB = b[property];
var valA = a[property];
var valB = b[property];
if (property === 'name') {
propA = propA.toLowerCase();
propB = propB.toLowerCase();
if (property === 'eta') {
// keep infinity at bottom of array when sorting by eta
if (valA === 'Infinity' && valB !== 'Infinity') {
return 1;
} else if (valA !== 'Infinity' && valB === 'Infinity') {
return -1;
}
// if it's not infinity, compare the second as numbers
if (valA !== 'Infinity') {
valA = Number(valA.seconds);
}
if (valB !== 'Infinity') {
valB = Number(valB.seconds);
}
} else if (property === 'name') {
valA = valA.toLowerCase();
valB = valB.toLowerCase();
} else {
propA = Number(propA);
propB = Number(propB);
valA = Number(valA);
valB = Number(valB);
}
if (direction === 'asc') {
if (propA > propB) {
if (valA > valB) {
return 1;
}
if (propA < propB) {
if (valA < valB) {
return -1;
}
} else {
if (propA > propB) {
if (valA > valB) {
return -1;
}
if (propA < propB) {
if (valA < valB) {
return 1;
}