Skip package:flutter in analyzer and dartdoc (with a bit of refactoring). (#996)

Author: isoos

app/lib/analyzer/pana_runner.dart

@@ -26,6 +26,9 @@ class PanaRunner implements TaskRunner {
 
   @override
   Future<bool> shouldSkipTask(Task task) async {
+    if (redirectPackagePages.containsKey(task.package)) {
+      return true;
+    }
     final TaskTargetStatus status = await _analysisBackend.getTargetStatus(
         task.package, task.version, task.updated);
     if (status.shouldSkip) {

app/lib/dartdoc/dartdoc_runner.dart

@@ -13,6 +13,7 @@ import 'package:uuid/uuid.dart';
 
 import '../shared/configuration.dart' show envConfig;
 import '../shared/task_scheduler.dart' show Task, TaskRunner;
+import '../shared/utils.dart' show redirectDartdocPages;
 
 import 'backend.dart';
 import 'models.dart';
@@ -29,6 +30,9 @@ class DartdocRunner implements TaskRunner {
 
   @override
   Future<bool> shouldSkipTask(Task task) async {
+    if (redirectDartdocPages.containsKey(task.package)) {
+      return true;
+    }
     final dartdocVersion = await _getDartdocVersion();
     final shouldRun = await dartdocBackend.shouldRunTask(task, dartdocVersion);
     return !shouldRun;

app/lib/dartdoc/handlers.dart

@@ -11,7 +11,7 @@ import '../shared/handlers.dart';
 import '../shared/notification.dart';
 import '../shared/scheduler_stats.dart';
 import '../shared/task_client.dart';
-import '../shared/utils.dart' show contentType;
+import '../shared/utils.dart' show contentType, redirectDartdocPages;
 
 import 'backend.dart';
 
@@ -26,9 +26,6 @@ Future<shelf.Response> dartdocServiceHandler(shelf.Request request) async {
 
   if (handler != null) {
     return handler(request);
-  } else if (path == '/documentation/flutter' ||
-      path.startsWith('/documentation/flutter/')) {
-    return redirectResponse('https://docs.flutter.io/');
   } else if (path.startsWith('/documentation/')) {
     return documentationHandler(request);
   } else if (path.startsWith('/packages/')) {
@@ -81,6 +78,9 @@ Future<shelf.Response> documentationHandler(shelf.Request request) async {
   if (docFilePath == null) {
     return notFoundHandler(request);
   }
+  if (redirectDartdocPages.containsKey(docFilePath.package)) {
+    return redirectResponse(redirectDartdocPages[docFilePath.package]);
+  }
   final String requestMethod = request.method?.toUpperCase();
   if (requestMethod == 'GET') {
     final entry = await dartdocBackend.getLatestEntry(
@@ -106,6 +106,7 @@ class DocFilePath {
 DocFilePath parseRequestUri(Uri uri) {
   final pathSegments = uri.pathSegments.where((s) => s.isNotEmpty).toList();
   if (pathSegments.length < 3) {
+    // TODO: handle URLs without versions, redirect to latest stable version
     return null;
   }
   if (pathSegments[0] != 'documentation') {

app/lib/frontend/handlers.dart

@@ -458,8 +458,8 @@ Future<shelf.Response> _packageVersionHandlerHtmlCore(
         AnalysisExtract extract,
         AnalysisView analysis),
     {String versionName}) async {
-  if (packageName == 'flutter') {
-    return redirectResponse('https://flutter.io/');
+  if (redirectPackagePages.containsKey(packageName)) {
+    return redirectResponse(redirectPackagePages[packageName]);
   }
   final Stopwatch sw = new Stopwatch()..start();
   String cachedPage;

app/lib/shared/utils.dart

@@ -189,6 +189,14 @@ const _knownGoodLowerCasePackages = const [
   'babylon',
 ];
 
+const redirectPackagePages = const <String, String>{
+  'flutter': 'https://flutter.io/',
+};
+
+const redirectDartdocPages = const <String, String>{
+  'flutter': 'https://docs.flutter.io/',
+};
+
 /// Sanity checks if the user would upload a package with a modified pub client
 /// that skips these verifications.
 /// TODO: share code to use the same validations as in

app/test/dartdoc/handlers_test.dart

@@ -66,11 +66,10 @@ void main() {
         new shelf.Request('GET', Uri.parse('https://www.dartdocs.org$uri')));
 
     test('/documentation/flutter redirect', () async {
-      expectRedirectResponse(
-        await issueGet('/documentation/flutter'),
-        'https://docs.flutter.io/',
-      );
+      // TODO: this should be redirect (after the url is redirected to the latest version)
+      expectNotFoundResponse(await issueGet('/documentation/flutter'));
     });
+
     test('/documentation/flutter/version redirect', () async {
       expectRedirectResponse(
         await issueGet('/documentation/flutter/version'),