summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/controllers/file.php16
-rw-r--r--application/libraries/Pygments.php206
-rw-r--r--application/models/mfile.php183
3 files changed, 215 insertions, 190 deletions
diff --git a/application/controllers/file.php b/application/controllers/file.php
index 0dd6eaffe..5bfec4c44 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -130,21 +130,22 @@ class File extends MY_Controller {
foreach ($files as $key => $filedata) {
$file = $this->mfile->file($filedata['hash']);
+ $pygments = new \libraries\Pygments($file, $filedata["mimetype"], $filedata["filename"]);
// autodetect the lexer for highlighting if the URL contains a / after the ID (/ID/)
// /ID/lexer disables autodetection
$autodetect_lexer = !$lexer && substr_count(ltrim($this->uri->uri_string(), "/"), '/') >= 1;
$autodetect_lexer = $is_multipaste ? true : $autodetect_lexer;
if ($autodetect_lexer) {
- $lexer = $this->mfile->autodetect_lexer($filedata["mimetype"], $filedata["filename"]);
+ $lexer = $pygments->autodetect_lexer();
}
// resolve aliases
// this is mainly used for compatibility
- $lexer = $this->mfile->resolve_lexer_alias($lexer);
+ $lexer = $pygments->resolve_lexer_alias($lexer);
// if there is no mimetype mapping we can't highlight it
- $can_highlight = $this->mfile->can_highlight($filedata["mimetype"]);
+ $can_highlight = $pygments->can_highlight();
$filesize_too_big = filesize($file) > $this->config->item('upload_max_text_size');
@@ -187,7 +188,7 @@ class File extends MY_Controller {
}
// TODO: move lexers json to dedicated URL
- $this->data['lexers'] = $this->mfile->get_lexers();
+ $this->data['lexers'] = \libraries\Pygments::get_lexers();
// Output everything
// Don't use the output class/append_output because it does too
@@ -467,8 +468,8 @@ class File extends MY_Controller {
if (count($ids) == 1) {
$filedata = $this->mfile->get_filedata($id);
$file = $this->mfile->file($filedata['hash']);
- $type = $filedata['mimetype'];
- $lexer = $this->mfile->should_highlight($type);
+ $pygments = new \libraries\Pygments($file, $filedata["mimetype"], $filedata["filename"]);
+ $lexer = $pygments->should_highlight();
// If we detected a highlightable file redirect,
// otherwise show the URL because browsers would just show a DL dialog
@@ -535,7 +536,8 @@ class File extends MY_Controller {
if ($repaste_id) {
$filedata = $this->mfile->get_filedata($repaste_id);
- if ($filedata !== false && $this->mfile->can_highlight($filedata["mimetype"])) {
+ $pygments = new \libraries\Pygments($this->mfile->file($filedata["hash"]), $filedata["mimetype"], $filedata["filename"]);
+ if ($filedata !== false && $pygments->can_highlight()) {
$this->data["textarea_content"] = file_get_contents($this->mfile->file($filedata["hash"]));
}
}
diff --git a/application/libraries/Pygments.php b/application/libraries/Pygments.php
new file mode 100644
index 000000000..ddddf40d9
--- /dev/null
+++ b/application/libraries/Pygments.php
@@ -0,0 +1,206 @@
+<?php
+/*
+ * Copyright 2015 Florian "Bluewind" Pritz <bluewind@server-speed.net>
+ *
+ * Licensed under AGPLv3
+ * (see COPYING for full license text)
+ *
+ */
+
+namespace libraries;
+
+class Pygments {
+ private $file;
+ private $mimetype;
+ private $filename;
+
+ public function __construct($file, $mimetype, $filename) {
+ $this->file = $file;
+ $this->mimetype = $mimetype;
+ $this->filename = $filename;
+ }
+
+ public static function get_lexers() {
+ return cache_function('lexers', 1800, function() {
+ $lexers = array();
+ $last_desc = "";
+ exec("python ".escapeshellarg(FCPATH."scripts/get_lexer_list.py"), $output);
+
+ foreach ($output as $line) {
+ list($name, $desc) = explode("|", $line);
+ if ($desc == $last_desc) {
+ continue;
+ }
+ $last_desc = $desc;
+ $lexers[$name] = $desc;
+ }
+ $lexers["text"] = "Plain text";
+ return $lexers;
+ });
+ }
+
+ public function should_highlight()
+ {
+ if ($this->mime2lexer($this->mimetype)) return true;
+
+ return false;
+ }
+
+ // Allow certain types to be highlight without doing it automatically
+ public function can_highlight()
+ {
+ $typearray = array(
+ 'image/svg+xml',
+ );
+ if (in_array($this->mimetype, $typearray)) return true;
+
+ if ($this->mime2lexer($this->mimetype)) return true;
+
+ return false;
+ }
+
+ // Return the lexer that should be used for highlighting
+ public function autodetect_lexer()
+ {
+ if (!$this->can_highlight($this->mimetype)) {
+ return false;
+ }
+
+ $lexer = $this->mime2lexer($this->mimetype);
+
+ // filename lexers overwrite mime type mappings
+ $filename_lexer = $this->filename2lexer();
+ if ($filename_lexer) {
+ return $filename_lexer;
+ }
+
+ return $lexer;
+ }
+
+ // Map MIME types to lexers needed for highlighting
+ private function mime2lexer()
+ {
+ $typearray = array(
+ 'application/javascript' => 'javascript',
+ 'application/mbox' => 'text',
+ 'application/postscript' => 'postscript',
+ 'application/smil' => 'ocaml',
+ 'application/x-applix-spreadsheet' => 'actionscript',
+ 'application/x-awk' => 'awk',
+ 'application/x-desktop' => 'text',
+ 'application/x-fluid' => 'text',
+ 'application/x-genesis-rom' => 'text',
+ 'application/x-java' => 'java',
+ 'application/x-m4' => 'text',
+ 'application/xml-dtd' => "xml",
+ 'application/xml' => 'xml',
+ 'application/x-perl' => 'perl',
+ 'application/x-php' => 'php',
+ 'application/x-ruby' => 'ruby',
+ 'application/x-shellscript' => 'bash',
+ 'application/xslt+xml' => "xml",
+ 'application/x-x509-ca-cert' => 'text',
+ 'message/rfc822' => 'text',
+ 'text/css' => 'css',
+ 'text/html' => 'xml',
+ 'text/plain-ascii' => 'ascii',
+ 'text/plain' => 'text',
+ 'text/troff' => 'groff',
+ 'text/x-asm' => 'nasm',
+ 'text/x-awk' => 'awk',
+ 'text/x-c' => 'c',
+ 'text/x-c++' => 'cpp',
+ 'text/x-c++hdr' => 'c',
+ 'text/x-chdr' => 'c',
+ 'text/x-csrc' => 'c',
+ 'text/x-c++src' => 'cpp',
+ 'text/x-diff' => 'diff',
+ 'text/x-gawk' => 'awk',
+ 'text/x-haskell' => 'haskell',
+ 'text/x-java' => 'java',
+ 'text/x-lisp' => 'cl',
+ 'text/x-literate-haskell' => 'haskell',
+ 'text/x-lua' => 'lua',
+ 'text/x-makefile' => 'make',
+ 'text/x-ocaml' => 'ocaml',
+ 'text/x-patch' => 'diff',
+ 'text/x-perl' => 'perl',
+ 'text/x-php' => 'php',
+ 'text/x-python' => 'python',
+ 'text/x-ruby' => 'ruby',
+ 'text/x-scheme' => 'scheme',
+ 'text/x-shellscript' => 'bash',
+ 'text/x-subviewer' => 'bash',
+ 'text/x-tcl' => 'tcl',
+ 'text/x-tex' => 'tex',
+ );
+ if (array_key_exists($this->mimetype, $typearray)) return $typearray[$this->mimetype];
+
+ if (strpos($this->mimetype, 'text/') === 0) return 'text';
+
+ # default
+ return false;
+ }
+
+ // Map special filenames to lexers
+ private function filename2lexer()
+ {
+ $namearray = array(
+ 'PKGBUILD' => 'bash',
+ '.vimrc' => 'vim'
+ );
+ if (array_key_exists($this->filename, $namearray)) return $namearray[$this->filename];
+
+
+ if (strpos($this->filename, ".") !== false) {
+ $extension = substr($this->filename, strrpos($this->filename, ".") + 1);
+
+ $extensionarray = array(
+ 'awk' => 'awk',
+ 'c' => 'c',
+ 'coffee' => 'coffee-script',
+ 'cpp' => 'cpp',
+ 'diff' => 'diff',
+ 'h' => 'c',
+ 'hs' => 'haskell',
+ 'html' => 'xml',
+ 'java' => 'java',
+ 'js' => 'js',
+ 'lua' => 'lua',
+ 'mli' => 'ocaml',
+ 'mll' => 'ocaml',
+ 'ml' => 'ocaml',
+ 'mly' => 'ocaml',
+ 'patch' => 'diff',
+ 'php' => 'php',
+ 'pl' => 'perl',
+ 'pp' => 'puppet',
+ 'py' => 'python',
+ 'rb' => 'ruby',
+ 's' => 'asm',
+ 'sh' => 'bash',
+ 'tcl' => 'tcl',
+ 'tex' => 'tex',
+ );
+ if (array_key_exists($extension, $extensionarray)) return $extensionarray[$extension];
+ }
+
+ return false;
+ }
+
+ // Handle lexer aliases
+ public function resolve_lexer_alias($alias)
+ {
+ if ($alias === false) return false;
+ $aliasarray = array(
+ 'py' => 'python',
+ 'sh' => 'bash',
+ 's' => 'asm',
+ 'pl' => 'perl'
+ );
+ if (array_key_exists($alias, $aliasarray)) return $aliasarray[$alias];
+
+ return $alias;
+ }
+
+}
diff --git a/application/models/mfile.php b/application/models/mfile.php
index 772141487..724994f83 100644
--- a/application/models/mfile.php
+++ b/application/models/mfile.php
@@ -262,189 +262,6 @@ class Mfile extends CI_Model {
['user'];
}
- public function get_lexers() {
- return cache_function('lexers', 1800, function() {
- $lexers = array();
- $last_desc = "";
- exec("python ".escapeshellarg(FCPATH."scripts/get_lexer_list.py"), $output);
-
- foreach ($output as $line) {
- list($name, $desc) = explode("|", $line);
- if ($desc == $last_desc) {
- continue;
- }
- $last_desc = $desc;
- $lexers[$name] = $desc;
- }
- $lexers["text"] = "Plain text";
- return $lexers;
- });
- }
-
- public function should_highlight($type)
- {
- if ($this->mime2lexer($type)) return true;
-
- return false;
- }
-
- // Allow certain types to be highlight without doing it automatically
- public function can_highlight($type)
- {
- $typearray = array(
- 'image/svg+xml',
- );
- if (in_array($type, $typearray)) return true;
-
- if ($this->mime2lexer($type)) return true;
-
- return false;
- }
-
- // Return the lexer that should be used for highlighting
- public function autodetect_lexer($type, $filename)
- {
- if (!$this->can_highlight($type)) {
- return false;
- }
-
- $lexer = $this->mime2lexer($type);
-
- // filename lexers overwrite mime type mappings
- $filename_lexer = $this->filename2lexer($filename);
- if ($filename_lexer) {
- return $filename_lexer;
- }
-
- return $lexer;
- }
-
- // Map MIME types to lexers needed for highlighting
- private function mime2lexer($type)
- {
- $typearray = array(
- 'application/javascript' => 'javascript',
- 'application/mbox' => 'text',
- 'application/postscript' => 'postscript',
- 'application/smil' => 'ocaml',
- 'application/x-applix-spreadsheet' => 'actionscript',
- 'application/x-awk' => 'awk',
- 'application/x-desktop' => 'text',
- 'application/x-fluid' => 'text',
- 'application/x-genesis-rom' => 'text',
- 'application/x-java' => 'java',
- 'application/x-m4' => 'text',
- 'application/xml-dtd' => "xml",
- 'application/xml' => 'xml',
- 'application/x-perl' => 'perl',
- 'application/x-php' => 'php',
- 'application/x-ruby' => 'ruby',
- 'application/x-shellscript' => 'bash',
- 'application/xslt+xml' => "xml",
- 'application/x-x509-ca-cert' => 'text',
- 'message/rfc822' => 'text',
- 'text/css' => 'css',
- 'text/html' => 'xml',
- 'text/plain-ascii' => 'ascii',
- 'text/plain' => 'text',
- 'text/troff' => 'groff',
- 'text/x-asm' => 'nasm',
- 'text/x-awk' => 'awk',
- 'text/x-c' => 'c',
- 'text/x-c++' => 'cpp',
- 'text/x-c++hdr' => 'c',
- 'text/x-chdr' => 'c',
- 'text/x-csrc' => 'c',
- 'text/x-c++src' => 'cpp',
- 'text/x-diff' => 'diff',
- 'text/x-gawk' => 'awk',
- 'text/x-haskell' => 'haskell',
- 'text/x-java' => 'java',
- 'text/x-lisp' => 'cl',
- 'text/x-literate-haskell' => 'haskell',
- 'text/x-lua' => 'lua',
- 'text/x-makefile' => 'make',
- 'text/x-ocaml' => 'ocaml',
- 'text/x-patch' => 'diff',
- 'text/x-perl' => 'perl',
- 'text/x-php' => 'php',
- 'text/x-python' => 'python',
- 'text/x-ruby' => 'ruby',
- 'text/x-scheme' => 'scheme',
- 'text/x-shellscript' => 'bash',
- 'text/x-subviewer' => 'bash',
- 'text/x-tcl' => 'tcl',
- 'text/x-tex' => 'tex',
- );
- if (array_key_exists($type, $typearray)) return $typearray[$type];
-
- if (strpos($type, 'text/') === 0) return 'text';
-
- # default
- return false;
- }
-
- // Map special filenames to lexers
- private function filename2lexer($name)
- {
- $namearray = array(
- 'PKGBUILD' => 'bash',
- '.vimrc' => 'vim'
- );
- if (array_key_exists($name, $namearray)) return $namearray[$name];
-
-
- if (strpos($name, ".") !== false) {
- $extension = substr($name, strrpos($name, ".") + 1);
-
- $extensionarray = array(
- 'awk' => 'awk',
- 'c' => 'c',
- 'coffee' => 'coffee-script',
- 'cpp' => 'cpp',
- 'diff' => 'diff',
- 'h' => 'c',
- 'hs' => 'haskell',
- 'html' => 'xml',
- 'java' => 'java',
- 'js' => 'js',
- 'lua' => 'lua',
- 'mli' => 'ocaml',
- 'mll' => 'ocaml',
- 'ml' => 'ocaml',
- 'mly' => 'ocaml',
- 'patch' => 'diff',
- 'php' => 'php',
- 'pl' => 'perl',
- 'pp' => 'puppet',
- 'py' => 'python',
- 'rb' => 'ruby',
- 's' => 'asm',
- 'sh' => 'bash',
- 'tcl' => 'tcl',
- 'tex' => 'tex',
- );
- if (array_key_exists($extension, $extensionarray)) return $extensionarray[$extension];
- }
-
- return false;
- }
-
- // Handle lexer aliases
- public function resolve_lexer_alias($alias)
- {
- if ($alias === false) return false;
- $aliasarray = array(
- 'py' => 'python',
- 'sh' => 'bash',
- 's' => 'asm',
- 'pl' => 'perl'
- );
- if (array_key_exists($alias, $aliasarray)) return $aliasarray[$alias];
-
- return $alias;
- }
-
}
# vim: set noet:
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-22 22:09:23 +0100