Changeset 7626

Timestamp:

Mar 7, 2019, 2:43:04 PM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2159: It should be possible to specify a character set in the "Edit file" dialog when saving

This should work now. If the user selects a character set that can't encode the characters used in the text the "Save" action will display an error message.

Location:

trunk/www/filemanager/files

Files:

• ajax.jsp (modified) (3 diffs)
• edit_file_data.js (modified) (6 diffs)
• edit_file_data.jsp (modified) (5 diffs)

trunk/www/filemanager/files/ajax.jsp

@@ -37 +37 @@
   import="java.io.Writer"
   import="java.io.Reader"
+  import="java.nio.charset.Charset"
+  import="java.nio.charset.CodingErrorAction"
+  import="java.nio.charset.CharsetEncoder"
+  import="java.nio.charset.CharacterCodingException"
 %>
 <%
@@ -62 +66 @@
   else if ("StoreFile".equals(cmd))
   {
+    String charset = null;
     try
     {
       int size = Values.getInt(request.getParameter("size"), -1);
+      charset = Values.getStringOrNull(request.getParameter("charset"));
+      
       dc = sc.newDbControl();
       File f = File.getById(dc, itemId);
       Reader in = request.getReader();
-      String charset = f.getCharacterSet();
       if (charset == null)
       {
-        charset = "UTF-8";
-        f.setCharacterSet(charset);
+        charset = Values.getString(f.getCharacterSet(), "UTF-8");
       }
+      boolean charsetModified = !charset.equals(f.getCharacterSet());
+      if (charsetModified) f.setCharacterSet(charset);
+      Charset cs = Charset.forName(charset);
+      if (!cs.canEncode())
+      {
+        throw new UnsupportedOperationException("Encoding is not supported by '" + charset + "'.");
+      }
+      CharsetEncoder encoder = Charset.forName(charset).newEncoder();
+      encoder.onMalformedInput(CodingErrorAction.REPORT);
+      encoder.onUnmappableCharacter(CodingErrorAction.REPORT);
       Writer toFile = new OutputStreamWriter(
-          f.getUploadStream(false, f.isCompressed()), charset);
+          f.getUploadStream(false, f.isCompressed()), encoder);
       int copied = (int)FileUtil.copy(in, toFile);
       if (size >= 0 && copied != size)
@@ -85 +100 @@
       toFile.close();
       dc.commit();
-      json.put("message", "File saved successfully");
+      json.put("message", "File saved " + (charsetModified ? " with character set " + charset : " successfully"));
+    }
+    catch (CharacterCodingException ex)
+    {
+      throw new Exception("Save failed: The text contains characters that can't be encoded in '" + charset + "'.");
     }
     catch (Exception ex)
     {
-      ex.printStackTrace();
       throw new Exception("Save failed: " + ex.getMessage(), ex);
     }

trunk/www/filemanager/files/edit_file_data.js

@@ -28 +28 @@
   var editFile = {};
   var originalText = '';
+  var originalCharset = '';
   var isModified = false;
   
@@ -41 +42 @@
     Events.addEventHandler('filedata', 'keydown', editFile.detectTab);
     Events.addEventHandler('filedata', 'keyup', editFile.detectChanges);
+    Events.addEventHandler('filedata', 'blur', editFile.detectChangesFull);
+    Events.addEventHandler('charset', 'change', editFile.detectChangesFull);
   }
   
@@ -58 +61 @@
     frm.filedata.value = request.responseText;
     originalText = frm.filedata.value;
+    originalCharset = frm.charset.value;
     editFile.setModified(false);
     editFile.updateLineNumbers();
@@ -123 +127 @@
     url += '&cmd=StoreFile&item_id='+Data.get('page-data', 'file-id');
     url += '&size='+frm.filedata.value.length;
+    url += '&charset='+frm.charset.value;
     var request = Ajax.getXmlHttpRequest();
     request.open("POST", url, true);
@@ -134 +139 @@
     if (response.status != 'ok')
     {
-      Forms.showNotification('btnSave', response.message);
+      Forms.showNotification('btnSave', response.message, 'bigger-notify');
       return;
     }
@@ -155 +160 @@
   }
 
+  editFile.detectChangesFull = function()
+  {
+    var frm = document.forms['file'];
+    var modified = frm.filedata.value != originalText || frm.charset.value != originalCharset;
+    editFile.setModified(modified);
+    
+    Doc.addOrRemoveClass('charsetSection','utf8-warning', frm.charset.value != 'UTF-8' && frm.charset.value != originalCharset);
+  }
+  
   editFile.detectChanges = function()
   {
-    if (!isModified)
-    {
-      var frm = document.forms['file'];
-      if (frm.filedata.value != originalText)
-      {
-        editFile.setModified(true);
-      }
-    }
-  }
-
+    if (!isModified) editFile.detectChangesFull();
+  }
   
   editFile.detectTab = function(event)

trunk/www/filemanager/files/edit_file_data.jsp

@@ -39 +39 @@
   import="net.sf.basedb.clients.web.util.HTML"
   import="net.sf.basedb.util.Values"
+  import="net.sf.basedb.core.Config"
   import="java.util.List"
   import="java.util.Set"
   import="java.util.HashSet"
+  import="java.nio.charset.Charset"
 %>
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
@@ -74 +76 @@
     {
       position: absolute;
-      top: 0em;
-      left: 0em;
-      bottom: 0em;
+      top: 0;
+      left: 0;
+      bottom: 0;
       width: 3.6em;
+      padding-top: 2px;
       padding-right: 0.4em;
       text-align: right;
@@ -90 +93 @@
     {
       position: absolute;
-      top: 0em;
+      top: 2px;
       left: 4em;
-      bottom: 0em;
-      right: 0em;
+      bottom: 0;
+      right: 0;
       margin-left: 2px;
     }
@@ -101 +104 @@
       width: 100%; 
       height: 100%; 
-      border: 0px;
-      margin: 0px;
-      padding: 0px;
+      border: 0;
+      margin: 0;
+      padding: 0;
+    }
+    
+    .bigger-notify
+    {
+      width: 30em;
+    }
+    
+    #charsetSection
+    {
+      top: auto; 
+      bottom: 0; 
+      height: 2.4em; 
+      left: auto; 
+      right: calc(50% + 7em);
+      z-index: 2;
+    }
+    
+    #nonUtf8Warning
+    {
+      visibility: hidden;
+    }
+    
+    #charsetSection.utf8-warning #nonUtf8Warning
+    {
+      visibility: visible;
     }
     </style>
@@ -125 +153 @@
         >Loading file; please wait...</textarea>
       </div>
+    </div>
+
+    <div id="charsetSection" class="absolutefull">
+      <b>Character set</b>
+      <select name="charset" id="charset">
+      <%
+      String currentCharset = Values.getString(file.getCharacterSet(), "UTF-8");
+      int numCommon = Config.getCommonCharsets().size();
+      int i = 0;
+      boolean hasSelected = false;
+      for (String charset : Config.getAllCharsets())
+      {
+        // The UTF-32 charset is not working well in browsers and we do not include non-encoding character sets
+        if (charset.startsWith("UTF-32") || !Charset.forName(charset).canEncode()) continue;
+        boolean selected = false;
+        if (!hasSelected)
+        {
+          selected = charset.equalsIgnoreCase(currentCharset);
+          hasSelected |= selected;
+        }
+        %>
+        <option value="<%=charset%>" <%=selected ? "selected" : ""%> 
+          <%=i==numCommon ? "style=\"border-top: 1px solid #666666;\"" : "" %>><%=charset%>
+        <%
+        i++;
+      }
+      if (!hasSelected && currentCharset != null)
+      {
+        %>
+        <option value="<%=currentCharset%>" selected><%=currentCharset%>
+        <%
+      }
+      %>
+      </select>
+      <span id="nonUtf8Warning"><img src="../../images/warning.png" 
+        title="The selected character set may not be able to encode all characters"></span>
     </div>
     </form>