pkg/mime: layout as mini-libraries

pkg/mime/lib/src/mime_type.dart

Index: pkg/mime/lib/src/mime_type.dart
diff --git a/pkg/mime/lib/src/mime_type.dart b/pkg/mime/lib/src/mime_type.dart
index c9daa2bd37a066c20acbf220748f9f495df844a2..7b71479825cd084667e110fa6210b71a5798ad8c 100644
--- a/pkg/mime/lib/src/mime_type.dart
+++ b/pkg/mime/lib/src/mime_type.dart
@@ -2,15 +2,17 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of mime;
+library mime.mime_type;
 
+import 'extension_map.dart';
+import 'magic_number.dart';
 
 final MimeTypeResolver _globalResolver = new MimeTypeResolver();
 
 /**
  * The maximum number of bytes needed, to match all default magic-numbers.
  */
-int get defaultMagicNumbersMaxLength => _DEFAULT_MAGIC_NUMBERS_MAX_LENGTH;
+int get defaultMagicNumbersMaxLength => DEFAULT_MAGIC_NUMBERS_MAX_LENGTH;

[Anders Johnsen, 2014/05/12 06:23:18]

This is weird. Now we expose the same thing twice. Why?

[kevmoo, 2014/05/12 14:45:18]

Keep in mind the imported magic_number file is not exported. It's an
implementation detail.

I've rolled this into one const, though.

 
 /**
  * Extract the extension from [path] and use that for MIME-type lookup, using
@@ -32,7 +34,7 @@ String lookupMimeType(String path, {List<int> headerBytes}) =>
  */
 class MimeTypeResolver {
   final Map<String, String> _extensionMap = {};
-  final List<_MagicNumber> _magicNumbers = [];
+  final List<MagicNumber> _magicNumbers = [];
   final bool _useDefault;
   int _magicNumbersMaxLength;
 
@@ -46,7 +48,7 @@ class MimeTypeResolver {
    */
   MimeTypeResolver() :
       _useDefault = true,
-      _magicNumbersMaxLength = _DEFAULT_MAGIC_NUMBERS_MAX_LENGTH;
+      _magicNumbersMaxLength = DEFAULT_MAGIC_NUMBERS_MAX_LENGTH;
 
   /**
    * Get the maximum number of bytes required to match all magic numbers, when
@@ -71,7 +73,7 @@ class MimeTypeResolver {
       result = _matchMagic(headerBytes, _magicNumbers);
       if (result != null) return result;
       if (_useDefault) {
-        result = _matchMagic(headerBytes, _DEFAULT_MAGIC_NUMBERS);
+        result = _matchMagic(headerBytes, DEFAULT_MAGIC_NUMBERS);
         if (result != null) return result;
       }
     }
@@ -79,7 +81,7 @@ class MimeTypeResolver {
     result = _extensionMap[ext];
     if (result != null) return result;
     if (_useDefault) {
-      result = _DEFAULT_EXTENSION_MAP[ext];
+      result = EXTENSION_MAP[ext];
       if (result != null) return result;
     }
     return null;
@@ -106,11 +108,11 @@ class MimeTypeResolver {
     if (bytes.length > _magicNumbersMaxLength) {
       _magicNumbersMaxLength = bytes.length;
     }
-    _magicNumbers.add(new _MagicNumber(mimeType, bytes, mask: mask));
+    _magicNumbers.add(new MagicNumber(mimeType, bytes, mask: mask));
   }
 
   static String _matchMagic(List<int> headerBytes,
-                            List<_MagicNumber> magicNumbers) {
+                            List<MagicNumber> magicNumbers) {
     for (var mn in magicNumbers) {
       if (mn.matches(headerBytes)) return mn.mimeType;
     }