Deprecated -> Discontinued (#1006)

* Rename deprecated to discontinued.

* Remove packages from search index when deprecated flag is set.

Author: isoos

app/bin/tools/deprecate.dart renamed to app/bin/tools/discontinue.dart

@@ -54,8 +54,8 @@ Future _read(String packageName) async {
   if (p == null) {
     throw new Exception('Package $packageName does not exist.');
   }
-  final isDeprecated = p.isDeprecated ?? false;
-  final label = isDeprecated ? 'deprecated' : '-';
+  final isDiscontinued = p.isDiscontinued ?? false;
+  final label = isDiscontinued ? 'discontinued' : '-';
   print('Package $packageName: $label');
 }
 
@@ -67,10 +67,10 @@ Future _set(String packageName, bool value) {
     if (p == null) {
       throw new Exception('Package $packageName does not exist.');
     }
-    p.isDeprecated = value;
+    p.isDiscontinued = value;
     tx.queueMutations(inserts: [p]);
     await tx.commit();
-    print('Package $packageName: isDeprecated=$value');
+    print('Package $packageName: isDiscontinued=$value');
     await new AnalyzerClient()
         .triggerAnalysis(packageName, p.latestVersion, new Set());
   });

app/lib/analyzer/backend.dart

@@ -347,7 +347,7 @@ class AnalysisBackend {
       exists: true,
       publishDate: pv.created,
       isLatestStable: p.latestVersion == version,
-      isDeprecated: p.isDeprecated ?? false,
+      isDiscontinued: p.isDiscontinued ?? false,
     );
   }
 }
@@ -356,13 +356,13 @@ class PackageStatus {
   final bool exists;
   final DateTime publishDate;
   final bool isLatestStable;
-  final bool isDeprecated;
+  final bool isDiscontinued;
 
   PackageStatus({
     this.exists,
     this.publishDate,
     this.isLatestStable: false,
-    this.isDeprecated: false,
+    this.isDiscontinued: false,
   });
 }
 

app/lib/analyzer/model_properties.dart

@@ -25,8 +25,8 @@ class AnalysisStatusProperty extends StringProperty {
           return 'failure';
         case AnalysisStatus.success:
           return 'success';
-        case AnalysisStatus.deprecated:
-          return 'deprecated';
+        case AnalysisStatus.discontinued:
+          return 'discontinued';
         case AnalysisStatus.outdated:
           return 'outdated';
         default:
@@ -47,8 +47,8 @@ class AnalysisStatusProperty extends StringProperty {
           return AnalysisStatus.failure;
         case 'success':
           return AnalysisStatus.success;
-        case 'deprecated':
-          return AnalysisStatus.deprecated;
+        case 'discontinued':
+          return AnalysisStatus.discontinued;
         case 'outdated':
           return AnalysisStatus.outdated;
         default:

app/lib/analyzer/pana_runner.dart

@@ -56,9 +56,9 @@ class PanaRunner implements TaskRunner {
     final Analysis analysis =
         new Analysis.init(task.package, task.version, timestamp);
 
-    if (packageStatus.isDeprecated) {
-      _logger.info('Package is deprecated: $task.');
-      analysis.analysisStatus = AnalysisStatus.deprecated;
+    if (packageStatus.isDiscontinued) {
+      _logger.info('Package is discontinued: $task.');
+      analysis.analysisStatus = AnalysisStatus.discontinued;
       analysis.maintenanceScore = 0.0;
       final backendStatus = await _analysisBackend.storeAnalysis(analysis);
       return backendStatus.wasRace;

app/lib/frontend/models.dart

@@ -50,7 +50,7 @@ class Package extends db.ExpandoModel {
   List<String> uploaderEmails;
 
   @db.BoolProperty()
-  bool isDeprecated;
+  bool isDiscontinued;
 
   // Convenience Fields:
 

app/lib/frontend/templates.dart

@@ -192,8 +192,8 @@ class TemplateService {
       case AnalysisStatus.failure:
         statusText = 'tool failures';
         break;
-      case AnalysisStatus.deprecated:
-        statusText = 'skipped (deprecated)';
+      case AnalysisStatus.discontinued:
+        statusText = 'skipped (discontinued)';
         break;
       case AnalysisStatus.outdated:
         statusText = 'skipped (outdated)';
@@ -226,10 +226,10 @@ class TemplateService {
 
     final Map<String, dynamic> data = {
       'package': package,
-      'show_deprecated': analysisStatus == AnalysisStatus.deprecated,
+      'show_discontinued': analysisStatus == AnalysisStatus.discontinued,
       'show_outdated': analysisStatus == AnalysisStatus.outdated,
       'show_analysis': analysisStatus != AnalysisStatus.outdated &&
-          analysisStatus != AnalysisStatus.deprecated,
+          analysisStatus != AnalysisStatus.discontinued,
       'date_completed': analysis.timestamp == null
           ? null
           : shortDateFormat.format(analysis.timestamp),
@@ -683,12 +683,11 @@ class TemplateService {
         'text': '[awaiting]',
         'title': 'Analysis should be ready soon.',
       });
-    } else if (status == AnalysisStatus.deprecated) {
+    } else if (status == AnalysisStatus.discontinued) {
       tags.add({
-        // TODO: replace with a new deprecated style
-        'status': 'unidentified',
-        'text': '[deprecated]',
-        'title': 'Package was deprecated.',
+        'status': 'discontinued',
+        'text': '[discontinued]',
+        'title': 'Package was discontinued.',
       });
     } else if (status == AnalysisStatus.outdated) {
       tags.add({
@@ -787,8 +786,8 @@ String _getAuthorsHtml(List<String> authors) {
 
 String _renderScoreBox(AnalysisStatus status, double overallScore,
     {bool isNewPackage, String package}) {
-  final skippedAnalysis =
-      status == AnalysisStatus.outdated || status == AnalysisStatus.deprecated;
+  final skippedAnalysis = status == AnalysisStatus.outdated ||
+      status == AnalysisStatus.discontinued;
   final score = skippedAnalysis ? null : overallScore;
   final String formattedScore = _formatScore(score);
   final String scoreClass = _classifyScore(score);

app/lib/search/backend.dart

@@ -91,7 +91,7 @@ class SearchBackend {
         created: p.created,
         updated: pv.created,
         readme: compactReadme(pv.readmeContent),
-        isDeprecated: p.isDeprecated ?? false,
+        isDiscontinued: p.isDiscontinued ?? false,
         health: analysisView.health,
         popularity: popularity,
         maintenance: analysisView.maintenanceScore,

app/lib/search/index_simple.dart

@@ -68,6 +68,7 @@ class SimplePackageIndex implements PackageIndex {
   Future addPackage(PackageDocument document) async {
     final PackageDocument doc = document.intern(_internPool.intern);
     await removePackage(doc.package);
+    if (document.isDiscontinued == true) return; // isDiscontinued may be null
     _packages[doc.package] = doc;
     _nameIndex.add(doc.package, doc.package);
     _descrIndex.add(doc.package, doc.description);
@@ -195,16 +196,13 @@ class SimplePackageIndex implements PackageIndex {
         results = _rankWithComparator(packages, _compareUpdated);
         break;
       case SearchOrder.popularity:
-        results = _rankWithValues(getPopularityScore(packages),
-            deprecatedRank: _DeprecatedRank.keep);
+        results = _rankWithValues(getPopularityScore(packages));
         break;
       case SearchOrder.health:
-        results = _rankWithValues(getHealthScore(packages),
-            deprecatedRank: _DeprecatedRank.remove);
+        results = _rankWithValues(getHealthScore(packages));
         break;
       case SearchOrder.maintenance:
-        results = _rankWithValues(getMaintenanceScore(packages),
-            deprecatedRank: _DeprecatedRank.remove);
+        results = _rankWithValues(getMaintenanceScore(packages));
         break;
     }
 
@@ -324,25 +322,10 @@ class SimplePackageIndex implements PackageIndex {
     return null;
   }
 
-  List<PackageScore> _rankWithValues(Map<String, double> values,
-      {_DeprecatedRank deprecatedRank: _DeprecatedRank.back}) {
+  List<PackageScore> _rankWithValues(Map<String, double> values) {
     final List<PackageScore> list = values.keys
         .map((package) {
-          final doc = _packages[package];
-          double score = values[package];
-          // isDeprecated may be null
-          if (doc.isDeprecated == true) {
-            switch (deprecatedRank) {
-              case _DeprecatedRank.keep:
-                // keeps score
-                break;
-              case _DeprecatedRank.back:
-                score -= 100.0;
-                break;
-              case _DeprecatedRank.remove:
-                return null;
-            }
-          }
+          final score = values[package];
           return new PackageScore(package: package, score: score);
         })
         .where((ps) => ps != null)
@@ -635,14 +618,3 @@ Set<String> _tokenize(String originalText, int minLength) {
 }
 
 bool _isLower(String c) => c.toLowerCase() == c;
-
-enum _DeprecatedRank {
-  /// Keep original score.
-  keep,
-
-  /// Remove deprecated package from the results.
-  remove,
-
-  /// Move deprecated package to the back.
-  back,
-}

app/lib/shared/analyzer_service.dart

@@ -40,8 +40,8 @@ enum AnalysisStatus {
   /// One or more tools failed to produce the expected output.
   failure,
 
-  /// Analysis was not started, because package is considered deprecated.
-  deprecated,
+  /// Analysis was not started, because package is considered discontinued.
+  discontinued,
 
   /// Analysis was not started, because package is considered old and has a
   /// newer stable release.
@@ -59,7 +59,7 @@ int analysisStatusLevel(AnalysisStatus status) {
       return 0;
     case AnalysisStatus.failure:
       return 1;
-    case AnalysisStatus.deprecated:
+    case AnalysisStatus.discontinued:
     case AnalysisStatus.outdated:
     case AnalysisStatus.success:
       return 2;

app/lib/shared/search_service.dart

@@ -47,7 +47,7 @@ class PackageDocument extends Object with _$PackageDocumentSerializerMixin {
   final DateTime created;
   final DateTime updated;
   final String readme;
-  final bool isDeprecated;
+  final bool isDiscontinued;
 
   final List<String> platforms;
 
@@ -69,7 +69,7 @@ class PackageDocument extends Object with _$PackageDocumentSerializerMixin {
     this.created,
     this.updated,
     this.readme,
-    this.isDeprecated,
+    this.isDiscontinued,
     this.platforms,
     this.health,
     this.popularity,
@@ -91,7 +91,7 @@ class PackageDocument extends Object with _$PackageDocumentSerializerMixin {
       created: created,
       updated: updated,
       readme: readme,
-      isDeprecated: isDeprecated,
+      isDiscontinued: isDiscontinued,
       platforms: platforms?.map(internFn)?.toList(),
       health: health,
       popularity: popularity,

app/lib/shared/search_service.g.dart

@@ -25,7 +25,7 @@ PackageDocument _$PackageDocumentFromJson(Map<String, dynamic> json) =>
             ? null
             : DateTime.parse(json['updated'] as String),
         readme: json['readme'] as String,
-        isDeprecated: json['isDeprecated'] as bool,
+        isDiscontinued: json['isDiscontinued'] as bool,
         platforms:
             (json['platforms'] as List)?.map((e) => e as String)?.toList(),
         health: (json['health'] as num)?.toDouble(),
@@ -47,7 +47,7 @@ abstract class _$PackageDocumentSerializerMixin {
   DateTime get created;
   DateTime get updated;
   String get readme;
-  bool get isDeprecated;
+  bool get isDiscontinued;
   List<String> get platforms;
   double get health;
   double get popularity;
@@ -63,7 +63,7 @@ abstract class _$PackageDocumentSerializerMixin {
         'created': created?.toIso8601String(),
         'updated': updated?.toIso8601String(),
         'readme': readme,
-        'isDeprecated': isDeprecated,
+        'isDiscontinued': isDiscontinued,
         'platforms': platforms,
         'health': health,
         'popularity': popularity,

app/test/frontend/golden/authorized_page.html

@@ -17,7 +17,7 @@
   <meta property="og:description" content="Pub is a package manager for the Dart programming language." />
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
-  <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
+  <link href="/static/css/style.css?hash=07j2kluf48ctep1e1u8kf6bvn4qdkkfo" rel="stylesheet" type="text/css" />
   <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

app/test/frontend/golden/error_page.html

@@ -17,7 +17,7 @@
   <meta property="og:description" content="Pub is a package manager for the Dart programming language." />
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
-  <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
+  <link href="/static/css/style.css?hash=07j2kluf48ctep1e1u8kf6bvn4qdkkfo" rel="stylesheet" type="text/css" />
   <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

app/test/frontend/golden/flutter_landing_page.html

@@ -17,7 +17,7 @@
   <meta property="og:description" content="Pub is a package manager for the Dart programming language." />
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
-  <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
+  <link href="/static/css/style.css?hash=07j2kluf48ctep1e1u8kf6bvn4qdkkfo" rel="stylesheet" type="text/css" />
   <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

app/test/frontend/golden/index_page.html

@@ -17,7 +17,7 @@
   <meta property="og:description" content="Pub is a package manager for the Dart programming language." />
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
-  <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
+  <link href="/static/css/style.css?hash=07j2kluf48ctep1e1u8kf6bvn4qdkkfo" rel="stylesheet" type="text/css" />
   <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

app/test/frontend/golden/pkg_index_page.html

@@ -17,7 +17,7 @@
   <meta property="og:description" content="Pub is a package manager for the Dart programming language." />
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
-  <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
+  <link href="/static/css/style.css?hash=07j2kluf48ctep1e1u8kf6bvn4qdkkfo" rel="stylesheet" type="text/css" />
   <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

app/test/frontend/golden/pkg_show_page.html

@@ -17,7 +17,7 @@
   <meta property="og:description" content="foobar_pkg 0.1.1 Dart package - my package description" />
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
-  <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
+  <link href="/static/css/style.css?hash=07j2kluf48ctep1e1u8kf6bvn4qdkkfo" rel="stylesheet" type="text/css" />
   <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

app/test/frontend/golden/pkg_show_page_deprecated.html renamed to app/test/frontend/golden/pkg_show_page_discontinued.html

@@ -17,7 +17,7 @@
   <meta property="og:description" content="foobar_pkg 0.1.1 Dart package - my package description" />
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
-  <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
+  <link href="/static/css/style.css?hash=07j2kluf48ctep1e1u8kf6bvn4qdkkfo" rel="stylesheet" type="text/css" />
   <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -78,7 +78,7 @@ <h2 class="title">foobar_pkg 0.1.1</h2>
   <div class="metadata">
     Published <span>Jan 1, 2014</span>
     <!-- &bull; Downloads: X -->
-    <div class="tags">    <span class="package-tag unidentified" title="Package was deprecated.">[deprecated]</span>
+    <div class="tags">    <span class="package-tag discontinued" title="Package was discontinued.">[discontinued]</span>
 </div>
   </div>
 </div>
@@ -180,7 +180,7 @@ <h2>Analysis</h2>
   More details: <a href="/help#scoring">scoring</a>.
 </div>
 
-<p>This package is not analyzed, because it is deprecated.</p>
+<p>This package is not analyzed, because it is discontinued.</p>
 
     </section>
   </div>

app/test/frontend/golden/pkg_show_page_flutter_plugin.html

@@ -17,7 +17,7 @@
   <meta property="og:description" content="foobar_pkg 0.1.1 Flutter and Dart package - my package description" />
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
-  <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
+  <link href="/static/css/style.css?hash=07j2kluf48ctep1e1u8kf6bvn4qdkkfo" rel="stylesheet" type="text/css" />
   <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

app/test/frontend/golden/pkg_show_page_outdated.html

@@ -17,7 +17,7 @@
   <meta property="og:description" content="foobar_pkg 0.1.1 Dart package - my package description" />
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
-  <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
+  <link href="/static/css/style.css?hash=07j2kluf48ctep1e1u8kf6bvn4qdkkfo" rel="stylesheet" type="text/css" />
   <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){