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

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

Issue 133433002: Docserver: Support markdown for HTML content. Request thirdparty submission review. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: change the version of app & cron.yaml 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 posixpath
7 7
8 from compiled_file_system import SingleFile 8 from compiled_file_system import SingleFile
9 from directory_zipper import DirectoryZipper 9 from directory_zipper import DirectoryZipper
10 from docs_server_utils import ToUnicode 10 from docs_server_utils import ToUnicode
11 from file_system import FileNotFoundError
11 from future import Gettable, Future 12 from future import Gettable, Future
12 from third_party.handlebar import Handlebar 13 from third_party.handlebar import Handlebar
14 from third_party.markdown import markdown
13 15
14 16
15 class ContentAndType(object): 17 class ContentAndType(object):
16 '''Return value from ContentProvider.GetContentAndType. 18 '''Return value from ContentProvider.GetContentAndType.
17 ''' 19 '''
18 20
19 def __init__(self, content, content_type): 21 def __init__(self, content, content_type):
20 self.content = content 22 self.content = content
21 self.content_type = content_type 23 self.content_type = content_type
22 24
(...skipping 25 matching lines...) Expand all
48 self._supports_templates = supports_templates 50 self._supports_templates = supports_templates
49 if supports_zip: 51 if supports_zip:
50 self._directory_zipper = DirectoryZipper(compiled_fs_factory, file_system) 52 self._directory_zipper = DirectoryZipper(compiled_fs_factory, file_system)
51 else: 53 else:
52 self._directory_zipper = None 54 self._directory_zipper = None
53 55
54 @SingleFile 56 @SingleFile
55 def _CompileContent(self, path, text): 57 def _CompileContent(self, path, text):
56 assert text is not None, path 58 assert text is not None, path
57 mimetype = mimetypes.guess_type(path)[0] 59 mimetype = mimetypes.guess_type(path)[0]
58 if mimetype is None: 60 if posixpath.splitext(path)[1] == '.md':
61 # See http://pythonhosted.org/Markdown/extensions
62 # for details on "extensions=".
63 content = markdown(ToUnicode(text),
64 extensions=('extra', 'headerid', 'sane_lists'))
65 if self._supports_templates:
66 content = Handlebar(content, name=path)
67 mimetype = 'text/html'
68 elif mimetype is None:
59 content = text 69 content = text
60 mimetype = 'text/plain' 70 mimetype = 'text/plain'
61 elif mimetype == 'text/html': 71 elif mimetype == 'text/html':
62 content = ToUnicode(text) 72 content = ToUnicode(text)
63 if self._supports_templates: 73 if self._supports_templates:
64 content = Handlebar(content, name=path) 74 content = Handlebar(content, name=path)
65 elif (mimetype.startswith('text/') or 75 elif (mimetype.startswith('text/') or
66 mimetype in ('application/javascript', 'application/json')): 76 mimetype in ('application/javascript', 'application/json')):
67 content = ToUnicode(text) 77 content = ToUnicode(text)
68 else: 78 else:
69 content = text 79 content = text
70 return ContentAndType(content, mimetype) 80 return ContentAndType(content, mimetype)
71 81
82 def _MaybeMarkdown(self, path):
83 if posixpath.splitext(path)[1] != '.html':
84 return path
85
86 dirname, file_name = posixpath.split(path)
87 if dirname != '':
88 dirname = dirname + '/'
89 file_list = self.file_system.ReadSingle(dirname).Get()
90 if file_name in file_list:
91 return path
92
93 if posixpath.splitext(file_name)[0] + '.md' in file_list:
94 return posixpath.splitext(path)[0] + '.md'
95 return path
96
72 def GetContentAndType(self, path): 97 def GetContentAndType(self, path):
73 path = path.lstrip('/') 98 path = path.lstrip('/')
74 base, ext = os.path.splitext(path) 99 base, ext = posixpath.splitext(path)
75 100
76 # Check for a zip file first, if zip is enabled. 101 # Check for a zip file first, if zip is enabled.
77 if self._directory_zipper and ext == '.zip': 102 if self._directory_zipper and ext == '.zip':
78 zip_future = self._directory_zipper.Zip(base) 103 zip_future = self._directory_zipper.Zip(base)
79 return Future(delegate=Gettable( 104 return Future(delegate=Gettable(
80 lambda: ContentAndType(zip_future.Get(), 'application/zip'))) 105 lambda: ContentAndType(zip_future.Get(), 'application/zip')))
81 106
82 return self._content_cache.GetFromFile(path) 107 return self._content_cache.GetFromFile(self._MaybeMarkdown(path))
83 108
84 def Cron(self): 109 def Cron(self):
85 # Running Refresh() on the file system is enough to pull GitHub content, 110 # 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 111 # which is all we need for now while the full render-every-page cron step
87 # is in effect. 112 # is in effect.
88 # TODO(kalman): Walk over the whole filesystem and compile the content. 113 # TODO(kalman): Walk over the whole filesystem and compile the content.
89 return self.file_system.Refresh() 114 return self.file_system.Refresh()
90 115
91 def __repr__(self): 116 def __repr__(self):
92 return 'ContentProvider of <%s>' % repr(self.file_system) 117 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