Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(281)

Side by Side Diff: chrome/common/extensions/docs/server2/content_provider.py

Issue 93743005: Support markdown template for html editor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: polish unittest Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import mimetypes 5 import mimetypes
6 import os 6 import os
7 import posixpath
7 8
8 from compiled_file_system import SingleFile 9 from compiled_file_system import SingleFile
9 from directory_zipper import DirectoryZipper 10 from directory_zipper import DirectoryZipper
10 from docs_server_utils import ToUnicode 11 from docs_server_utils import ToUnicode
12 from file_system import FileNotFoundError
11 from future import Gettable, Future 13 from future import Gettable, Future
12 from third_party.handlebar import Handlebar 14 from third_party.handlebar import Handlebar
15 from third_party.markdown import markdown
13 16
14 17
15 class ContentAndType(object): 18 class ContentAndType(object):
16 '''Return value from ContentProvider.GetContentAndType. 19 '''Return value from ContentProvider.GetContentAndType.
17 ''' 20 '''
18 21
19 def __init__(self, content, content_type): 22 def __init__(self, content, content_type):
20 self.content = content 23 self.content = content
21 self.content_type = content_type 24 self.content_type = content_type
22 25
(...skipping 25 matching lines...) Expand all
48 self._supports_templates = supports_templates 51 self._supports_templates = supports_templates
49 if supports_zip: 52 if supports_zip:
50 self._directory_zipper = DirectoryZipper(compiled_fs_factory, file_system) 53 self._directory_zipper = DirectoryZipper(compiled_fs_factory, file_system)
51 else: 54 else:
52 self._directory_zipper = None 55 self._directory_zipper = None
53 56
54 @SingleFile 57 @SingleFile
55 def _CompileContent(self, path, text): 58 def _CompileContent(self, path, text):
56 assert text is not None, path 59 assert text is not None, path
57 mimetype = mimetypes.guess_type(path)[0] 60 mimetype = mimetypes.guess_type(path)[0]
58 if mimetype is None: 61 if os.path.splitext(path)[1] == '.md':
not at google - send to devlin 2014/01/07 22:36:40 posixpath.splitext
hukun 2014/01/08 17:13:41 done On 2014/01/07 22:36:40, kalman wrote:
62 # See http://pythonhosted.org/Markdown/extensions
63 # for details on "extensions=".
64 content = markdown(ToUnicode(text),
65 extensions=('extra', 'headerid', 'sane_lists'))
66 if self._supports_templates:
67 content = Handlebar(content, name=path)
68 mimetype = 'text/html'
69 elif mimetype is None:
59 content = text 70 content = text
60 mimetype = 'text/plain' 71 mimetype = 'text/plain'
61 elif mimetype == 'text/html': 72 elif mimetype == 'text/html':
62 content = ToUnicode(text) 73 content = ToUnicode(text)
63 if self._supports_templates: 74 if self._supports_templates:
64 content = Handlebar(content, name=path) 75 content = Handlebar(content, name=path)
65 elif (mimetype.startswith('text/') or 76 elif (mimetype.startswith('text/') or
66 mimetype in ('application/javascript', 'application/json')): 77 mimetype in ('application/javascript', 'application/json')):
67 content = ToUnicode(text) 78 content = ToUnicode(text)
68 else: 79 else:
69 content = text 80 content = text
70 return ContentAndType(content, mimetype) 81 return ContentAndType(content, mimetype)
71 82
83 def _MaybeMarkdown(self, path):
84 if posixpath.splitext(path)[1] != '.html':
85 return path
86
87 dirname, file_name = posixpath.split(path)
88 file_list = self.file_system.ReadSingle(dirname + '/').Get()
89 if file_name in file_list:
90 return path
91
92 if posixpath.splitext(file_name)[0] + '.md' in file_list:
93 return posixpath.splitext(path)[0] + '.md'
94 return path
95
72 def GetContentAndType(self, path): 96 def GetContentAndType(self, path):
73 path = path.lstrip('/') 97 path = path.lstrip('/')
74 base, ext = os.path.splitext(path) 98 base, ext = os.path.splitext(path)
not at google - send to devlin 2014/01/07 22:36:40 cleanup: posixpath.splitext then you can remove t
hukun 2014/01/08 17:13:41 done
75 99
76 # Check for a zip file first, if zip is enabled. 100 # Check for a zip file first, if zip is enabled.
77 if self._directory_zipper and ext == '.zip': 101 if self._directory_zipper and ext == '.zip':
78 zip_future = self._directory_zipper.Zip(base) 102 zip_future = self._directory_zipper.Zip(base)
79 return Future(delegate=Gettable( 103 return Future(delegate=Gettable(
80 lambda: ContentAndType(zip_future.Get(), 'application/zip'))) 104 lambda: ContentAndType(zip_future.Get(), 'application/zip')))
81 105
82 return self._content_cache.GetFromFile(path) 106 return self._content_cache.GetFromFile(self._MaybeMarkdown(path))
83 107
84 def Cron(self): 108 def Cron(self):
85 # Running Refresh() on the file system is enough to pull GitHub content, 109 # Running Refresh() on the file system is enough to pull GitHub content,
86 # which is all we need for now while the full render-every-page cron step 110 # which is all we need for now while the full render-every-page cron step
87 # is in effect. 111 # is in effect.
88 # TODO(kalman): Walk over the whole filesystem and compile the content. 112 # TODO(kalman): Walk over the whole filesystem and compile the content.
89 return self.file_system.Refresh() 113 return self.file_system.Refresh()
90 114
91 def __repr__(self): 115 def __repr__(self):
92 return 'ContentProvider of <%s>' % repr(self.file_system) 116 return 'ContentProvider of <%s>' % repr(self.file_system)
OLDNEW
« no previous file with comments | « chrome/common/extensions/docs/server2/build_server.py ('k') | chrome/common/extensions/docs/server2/content_provider_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698