You can not select more than 25 topics Topics must start with a chinese character,a letter or number, can include dashes ('-') and can be up to 35 characters long.

orgmode.go 1.7 kB

Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
6 years ago
1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162
  1. // Copyright 2017 The Gitea Authors. All rights reserved.
  2. // Use of this source code is governed by a MIT-style
  3. // license that can be found in the LICENSE file.
  4. package markup
  5. import (
  6. "code.gitea.io/gitea/modules/log"
  7. "code.gitea.io/gitea/modules/markup"
  8. "code.gitea.io/gitea/modules/markup/markdown"
  9. "github.com/chaseadamsio/goorgeous"
  10. "github.com/russross/blackfriday"
  11. )
  12. func init() {
  13. markup.RegisterParser(Parser{})
  14. }
  15. // Parser implements markup.Parser for orgmode
  16. type Parser struct {
  17. }
  18. // Name implements markup.Parser
  19. func (Parser) Name() string {
  20. return "orgmode"
  21. }
  22. // Extensions implements markup.Parser
  23. func (Parser) Extensions() []string {
  24. return []string{".org"}
  25. }
  26. // Render renders orgmode rawbytes to HTML
  27. func Render(rawBytes []byte, urlPrefix string, metas map[string]string, isWiki bool) (result []byte) {
  28. defer func() {
  29. if err := recover(); err != nil {
  30. log.Error("Panic in orgmode.Render: %v Just returning the rawBytes", err)
  31. result = rawBytes
  32. }
  33. }()
  34. htmlFlags := blackfriday.HTML_USE_XHTML
  35. htmlFlags |= blackfriday.HTML_SKIP_STYLE
  36. htmlFlags |= blackfriday.HTML_OMIT_CONTENTS
  37. renderer := &markdown.Renderer{
  38. Renderer: blackfriday.HtmlRenderer(htmlFlags, "", ""),
  39. URLPrefix: urlPrefix,
  40. IsWiki: isWiki,
  41. }
  42. result = goorgeous.Org(rawBytes, renderer)
  43. return
  44. }
  45. // RenderString reners orgmode string to HTML string
  46. func RenderString(rawContent string, urlPrefix string, metas map[string]string, isWiki bool) string {
  47. return string(Render([]byte(rawContent), urlPrefix, metas, isWiki))
  48. }
  49. // Render implements markup.Parser
  50. func (Parser) Render(rawBytes []byte, urlPrefix string, metas map[string]string, isWiki bool) []byte {
  51. return Render(rawBytes, urlPrefix, metas, isWiki)
  52. }