Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/lib/frontend/handlers/custom_api.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import '../../scorecard/backend.dart';
import '../../search/backend.dart';
import '../../search/search_client.dart';
import '../../search/search_service.dart';
import '../../service/download_counts/backend.dart';
import '../../service/topics/count_topics.dart';
import '../../shared/configuration.dart';
import '../../shared/exceptions.dart';
Expand Down Expand Up @@ -244,7 +245,8 @@ Future<VersionScore> packageVersionScoreHandler(
grantedPoints: card.grantedPubPoints,
maxPoints: card.maxPubPoints,
likeCount: pkg.likes,
downloadCount30Days: card.thirtyDaysDownloadCounts,
downloadCount30Days:
downloadCountsBackend.lookup30DaysTotalCounts(package),
tags: tags.toList(),
lastUpdated: updated,
);
Expand Down
4 changes: 3 additions & 1 deletion app/lib/frontend/templates/package_misc.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import 'package:_pub_shared/search/search_form.dart';
import 'package:_pub_shared/search/tags.dart';
import 'package:pub_dev/service/download_counts/backend.dart';

import '../../package/models.dart';
import '../../shared/urls.dart' as urls;
Expand Down Expand Up @@ -196,7 +197,8 @@ d.Node labeledScoresNodeFromPackageView(PackageView view, {String? version}) {
pkgScorePageUrl: urls.pkgScoreUrl(view.name, version: version),
likeCount: view.likes,
grantedPubPoints: view.grantedPubPoints,
thirtyDaysDownloads: view.thirtyDaysDownloadCounts,
thirtyDaysDownloads:
downloadCountsBackend.lookup30DaysTotalCounts(view.name),
);
}

Expand Down
4 changes: 3 additions & 1 deletion app/lib/frontend/templates/views/pkg/score_tab.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'dart:convert';
import 'package:_pub_shared/data/download_counts_data.dart';
import 'package:_pub_shared/format/number_format.dart';
import 'package:pana/models.dart';
import 'package:pub_dev/service/download_counts/backend.dart';
import 'package:pub_dev/shared/utils.dart';

import '../../../../scorecard/models.dart' hide ReportStatus;
Expand Down Expand Up @@ -43,7 +44,8 @@ d.Node scoreTabNode({
children: [
_likeKeyFigureNode(likeCount),
_pubPointsKeyFigureNode(report, showPending),
_downloadCountsKeyFigureNode(card.thirtyDaysDownloadCounts),
_downloadCountsKeyFigureNode(
downloadCountsBackend.lookup30DaysTotalCounts(package)),
],
),
if (showPending)
Expand Down
8 changes: 0 additions & 8 deletions app/lib/package/models.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import 'package:_pub_shared/search/tags.dart';
import 'package:clock/clock.dart';
import 'package:json_annotation/json_annotation.dart';
import 'package:pana/models.dart';
import 'package:pub_dev/service/download_counts/backend.dart';
import 'package:pub_dev/service/download_counts/download_counts.dart';
import 'package:pub_semver/pub_semver.dart';

Expand Down Expand Up @@ -937,7 +936,6 @@ class PackageView {
final List<ProcessedScreenshot>? screenshots;

final List<String>? topics;
final int? thirtyDaysDownloadCounts;

PackageView({
this.screenshots,
Expand All @@ -955,7 +953,6 @@ class PackageView {
this.spdxIdentifiers,
this.apiPages,
this.topics,
required this.thirtyDaysDownloadCounts,
}) : isPending = isPending ?? false,
tags = tags ?? <String>[];

Expand All @@ -968,7 +965,6 @@ class PackageView {
PackageVersion? version,
required ScoreCardData scoreCard,
List<ApiPageRef>? apiPages,
required int? thirtyDaysDownloadCounts,
}) {
final tags = <String>{
...package.getTags(),
Expand All @@ -992,7 +988,6 @@ class PackageView {
apiPages: apiPages,
screenshots: scoreCard.panaReport?.screenshots,
topics: version?.pubspec?.canonicalizedTopics,
thirtyDaysDownloadCounts: thirtyDaysDownloadCounts,
);
}

Expand All @@ -1013,7 +1008,6 @@ class PackageView {
apiPages: apiPages ?? this.apiPages,
screenshots: screenshots,
topics: topics,
thirtyDaysDownloadCounts: thirtyDaysDownloadCounts,
);
}

Expand Down Expand Up @@ -1172,8 +1166,6 @@ class PackagePageData {
releases: latestReleases,
version: version,
scoreCard: scoreCard,
thirtyDaysDownloadCounts:
downloadCountsBackend.lookup30DaysTotalCounts(package.name!),
);
}
}
Expand Down
4 changes: 0 additions & 4 deletions app/lib/package/models.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions app/lib/scorecard/backend.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import 'package:gcloud/service_scope.dart' as ss;
import 'package:logging/logging.dart';
import 'package:meta/meta.dart';
import 'package:pool/pool.dart';
import 'package:pub_dev/service/download_counts/backend.dart';
import 'package:pub_dev/service/download_counts/computations.dart';
import 'package:pub_dev/shared/exceptions.dart';
import 'package:pub_dev/task/backend.dart';
Expand Down Expand Up @@ -97,8 +96,6 @@ class ScoreCardBackend {
releases: releases,
version: pv,
scoreCard: card,
thirtyDaysDownloadCounts:
downloadCountsBackend.lookup30DaysTotalCounts(package),
);
});
}
Expand Down
5 changes: 0 additions & 5 deletions app/lib/scorecard/models.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import 'package:_pub_shared/data/download_counts_data.dart';
import 'package:_pub_shared/search/tags.dart';
import 'package:json_annotation/json_annotation.dart';
import 'package:pana/models.dart';
import 'package:pub_dev/service/download_counts/backend.dart';
import 'package:pub_dev/task/models.dart';

import '../scorecard/backend.dart';
Expand Down Expand Up @@ -70,10 +69,6 @@ class ScoreCardData {
late final report = panaReport?.report;

List<String>? get tags => panaReport?.derivedTags;

// TODO: refactor code to use downloadCountsBackend directly.
int? get thirtyDaysDownloadCounts =>
downloadCountsBackend.lookup30DaysTotalCounts(packageName!);
}

@JsonSerializable(includeIfNull: false)
Expand Down
Loading