improve textpreview even more

Author: JojiiOfficial

handlers/web/PreviewHandler.go

@@ -4,7 +4,6 @@ import (
 	"html/template"
 	"net/http"
 	"path"
-	"path/filepath"
 	"strings"
 
 	"github.com/DataManager-Go/DataManagerServer/models"
@@ -76,32 +75,13 @@ func PrevievFileHandler(handlerData HandlerData, w http.ResponseWriter, r *http.
 		Encrypted:      (file.Encryption.Valid && libdm.EncryptionIValid(file.Encryption.Int32)),
 		MimeType:       file.FileType,
 		Scheme:         scheme,
-		Lang:           getLang(file.Name),
 	}
 
 	//Serve preview
 	LogError(servePreviewTemplate(handlerData.Config, w, templateData))
 	return nil
 }
 
-func getLang(ext string) string {
-	ext = strings.ToLower(filepath.Ext(ext))
-	if len(ext) < 2 {
-		return ""
-	}
-
-	if strings.HasPrefix(ext, ".") {
-		ext = ext[1:]
-	}
-
-	switch ext {
-	case "go":
-		return "golang"
-	default:
-		return ""
-	}
-}
-
 func servePreviewTemplate(config *models.Config, w http.ResponseWriter, data interface{}) error {
 	PreviewFile := config.GetTemplateFile(PreviewFile)
 	ContentFile := config.GetTemplateFile(ContentFile)

html/templates/Content.html

@@ -38,29 +38,29 @@
 <script>
     $.get("{{.Scheme}}://{{.Host}}/preview/raw/{{.PublicFilename}}", {}, function (data) {
         editor.setValue(data, -1);
-
-        var heightUpdateFunction = function () {
-
-            // http://stackoverflow.com/questions/11584061/
-            var newHeight =
-                editor.getSession().getScreenLength()
-                * editor.renderer.lineHeight
-                + editor.renderer.scrollBar.getWidth()+1;
-
-            $('#editor').height(newHeight.toString() + "px");
-            $('#editor-section').height(newHeight.toString() + "px");
-
-            // This call is required for the editor to fix all of
-            // its inner structure for adapting to a change in size
-            editor.resize();
-        };
-
-        // Set initial size to match initial content
-        heightUpdateFunction();
-
-        // Whenever a change happens inside the ACE editor, update
-        // the size again
-        editor.getSession().on('change', heightUpdateFunction);
+        setTimeout(function(){
+            var heightUpdateFunction = function () {
+                // http://stackoverflow.com/questions/11584061/
+                var newHeight =
+                    editor.getSession().getScreenLength()
+                    * editor.renderer.lineHeight
+                    + editor.renderer.scrollBar.getWidth()+1;
+
+                $('#editor').height(newHeight.toString() + "px");
+                $('#editor-section').height(newHeight.toString() + "px");
+
+                // This call is required for the editor to fix all of
+                // its inner structure for adapting to a change in size
+                editor.resize();
+            };
+
+            // Set initial size to match initial content
+            heightUpdateFunction();
+
+            // Whenever a change happens inside the ACE editor, update
+            // the size again
+            editor.getSession().on('change', heightUpdateFunction);
+        }, 10);
     });
 
     function dl() {

html/templates/Preview.html

@@ -123,21 +123,16 @@
 <!-- Text preview -->
 <script src="/static/preview/ace/ace.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/preview/ace/theme-nord_dark.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/preview/ace/ext-modelist.js" type="text/javascript" charset="utf-8"></script>
 <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 
-{{ if not (eq (len .Lang) 0) }}
-<script src="/static/preview/ace/mode-{{.Lang}}.js" type="text/javascript" charset="utf-8"></script>
-{{ end }}
-
 <script>
-    var lang = "{{.Lang}}";
     var editor = ace.edit("editor");
-
     editor.setTheme("ace/theme/nord_dark");
-    if (lang.length != 0) {
-        var SyntaxMode = ace.require("ace/mode/" + lang).Mode;
-        editor.session.setMode(new SyntaxMode());
-    }
+
+    var modelist = ace.require("ace/ext/modelist");
+    var mode = modelist.getModeForPath( "{{.Filename}}").mode;
+    editor.session.setMode(mode);
 </script>
 {{ end }}
 

models/Preview.go

@@ -36,7 +36,6 @@ type PreviewTemplate struct {
 	Encrypted      bool
 	MimeType       string
 	Scheme         string
-	Lang           string
 }
 
 // PreviewTypeFromMime get Type to preview from mime