Changeset 748:cf87c0a47b04 in hatta-dev

Timestamp:

01/24/10 15:59:27 (2 years ago)

Author:

sheep@…

Branch:

default

Message:

move page_mime out of storage

File:

• hatta.py (modified) (6 diffs)

hatta.py

@@ -98 +98 @@
             or addr.startswith('ftp://')
             or addr.startswith('mailto:'))
+
+def page_mime(title):
+    """
+    Guess page's mime type ased on corresponding file name.
+    Default ot text/x-wiki for files without an extension.
+
+    >>> page_mime(u'something.txt')
+    'text/plain'
+    >>> page_mime(u'SomePage')
+    'text/x-wiki'
+    >>> page_mime(u'ąęśUnicodePage')
+    'text/x-wiki'
+    >>> page_mime(u'image.png')
+    'image/png'
+    >>> page_mime(u'style.css')
+    'text/css'
+    >>> page_mime(u'archive.tar.gz')
+    'archive/gzip'
+    """
+
+    addr = title.encode('utf-8') # the encoding doesn't relly matter here
+    mime, encoding = mimetypes.guess_type(addr, strict=False)
+    if encoding:
+        mime = 'archive/%s' % encoding
+    if mime is None:
+        mime = 'text/x-wiki'
+    return mime
 
 
@@ -542 +569 @@
         return self._changectx().rev()
 
-    def page_mime(self, title):
-        """
-        Guess page's mime type ased on corresponding file name.
-        Default ot text/x-wiki for files without an extension.
-
-        >>> page_mime('something.txt')
-        'text/plain'
-        >>> page_mime('SomePage')
-        'text/x-wiki'
-        >>> page_mime(u'ąęśUnicodePage')
-        'text/x-wiki'
-        >>> page_mime('image.png')
-        'image/png'
-        >>> page_mime('style.css')
-        'text/css'
-        >>> page_mime('archive.tar.gz')
-        'archive/gzip'
-        """
-
-        addr = self._file_path(title)
-        mime, encoding = mimetypes.guess_type(addr, strict=False)
-        if encoding:
-            mime = 'archive/%s' % encoding
-        if mime is None:
-            mime = 'text/x-wiki'
-        return mime
 
     def _changectx(self):
@@ -1474 +1475 @@
         """Updates the content of the database, needs locks around."""
 
-        mime = self.storage.page_mime(title)
+        mime = page_mime(title)
         if not mime.startswith('text/'):
             self.update_words(title, '', cursor=cursor)
@@ -1750 +1751 @@
             return html.a(name=chunk)
         if addr in self.storage:
-            mime = self.storage.page_mime(addr)
+            mime = page_mime(addr)
             if mime.startswith('image/'):
                 return html.img(src=self.get_download_url(addr), class_=class_,
@@ -2572 +2573 @@
                 page_class, mime = self.filename_map[title]
             except KeyError:
-                mime = self.storage.page_mime(title)
+                mime = page_mime(title)
                 major, minor = mime.split('/', 1)
                 try:
@@ -2879 +2880 @@
         """Serve the raw content of a page."""
 
-        mime = self.storage.page_mime(title)
+        mime = page_mime(title)
         if mime == 'text/x-wiki':
             mime = 'text/plain'