Skip to content

Commit d4c3f8d

Browse files
committed
Auto merge of #2977 - Turbo87:downloads-cleanup, r=locks
Cleanup crate version downloads processing code This gets rid of a few instances of unnecessary `Date` parsing. In most cases we can just use the ISO8601 string directly, without having to convert to `Date` and back to a string all the time. r? `@locks`
2 parents 1212742 + 2d85521 commit d4c3f8d

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

app/controllers/crate/version.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,20 @@ export default class CrateVersionController extends Controller {
5555
let versions = [];
5656
for (let i = 0; i < 90; i++) {
5757
let now = moment().subtract(i, 'days');
58-
dates[now.format('MMM D')] = { date: now, cnt: {} };
58+
dates[now.toISOString().slice(0, 10)] = { date: now, cnt: {} };
5959
}
6060

6161
downloads.forEach(d => {
62-
let version_id = d.get('version.id');
63-
let key = moment(d.get('date')).utc().format('MMM D');
62+
let version_id = d.version.id;
63+
let key = d.date;
6464
if (dates[key]) {
6565
let prev = dates[key].cnt[version_id] || 0;
66-
dates[key].cnt[version_id] = prev + d.get('downloads');
66+
dates[key].cnt[version_id] = prev + d.downloads;
6767
}
6868
});
6969

7070
extra.forEach(d => {
71-
let key = moment(d.date).utc().format('MMM D');
71+
let key = d.date;
7272
if (dates[key]) {
7373
let prev = dates[key].cnt[null] || 0;
7474
dates[key].cnt[null] = prev + d.downloads;

app/models/version-download.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import Model, { belongsTo, attr } from '@ember-data/model';
22

33
export default class VersionDownload extends Model {
4+
/** @type number */
45
@attr downloads;
5-
@attr('date') date;
6+
/** @type string */
7+
@attr date;
68

79
@belongsTo('version', { async: false }) version;
810
}

0 commit comments

Comments
 (0)