You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2024/04/26 22:41:30 UTC

(incubator-ponymail-foal) branch bad_encoding created (now ffa7c41)

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch bad_encoding
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


      at ffa7c41  Regen JS

This branch includes the following new commits:

     new 1164bf8  Skip bad encoding
     new ffa7c41  Regen JS

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(incubator-ponymail-foal) 01/02: Skip bad encoding

Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch bad_encoding
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 1164bf8661232365286dcb27ed157246eb704146
Author: Sebb <se...@apache.org>
AuthorDate: Fri Apr 26 23:40:05 2024 +0100

    Skip bad encoding
---
 tools/archiver.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/archiver.py b/tools/archiver.py
index 2feb887..89d7af1 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -211,6 +211,9 @@ class Body:
                         break
                     except UnicodeDecodeError:
                         pass
+                    except LookupError:
+                        print("Body detected invalid encoding: %s" % cs)
+                        pass
             # If no character set was defined, the email MUST be US-ASCII by RFC822 defaults
             # This isn't always the case, as we're about to discover.
             if not self.string:
@@ -428,7 +431,7 @@ class Archiver(object):  # N.B. Also used by import-mbox.py
                 ):
                     first_html = Body(part)
             except Exception as err:
-                print(err)
+                print("Failed to extract Body: %s" % err)
 
         # this requires a GPL lib, user will have to install it themselves
         if first_html and (


(incubator-ponymail-foal) 02/02: Regen JS

Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch bad_encoding
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit ffa7c4145fb47c5790749bdabc6774bbe1afb64e
Author: Sebb <se...@apache.org>
AuthorDate: Fri Apr 26 23:41:21 2024 +0100

    Regen JS
---
 webui/admin.html     | 8 ++++----
 webui/index.html     | 6 +++---
 webui/js/ponymail.js | 4 ++--
 webui/list.html      | 8 ++++----
 webui/oauth.html     | 8 ++++----
 webui/thread.html    | 8 ++++----
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/webui/admin.html b/webui/admin.html
index 6473d30..9c67643 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
     <!-- Bootstrap -->
 
     <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-    <link href="css/scaffolding.css?revision=f3a4716" rel="stylesheet" media="all">
+    <link href="css/scaffolding.css?revision=5a0f102" rel="stylesheet" media="all">
     <link href="css/modal.css" rel="stylesheet" media="all">
     <link href="css/spinner.css" rel="stylesheet" media="all">
     <link rel="alternate" href="/api/static.lua"/>
@@ -79,9 +79,9 @@ the License. -->
     <script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="js/bootstrap.min.js"></script>
-    <script src="js/config.js?revision=f3a4716"></script>
-    <script src="js/wordcloud.js?revision=f3a4716"></script>
-    <script src="js/ponymail.js?revision=f3a4716"></script>
+    <script src="js/config.js?revision=5a0f102"></script>
+    <script src="js/wordcloud.js?revision=5a0f102"></script>
+    <script src="js/ponymail.js?revision=5a0f102"></script>
     <div id="splash" class="splash fade-in"> &nbsp; </div>
     <div style="clear: both;"></div>
   </body>
diff --git a/webui/index.html b/webui/index.html
index ddcf7a4..c0d5ef4 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
     <!-- Bootstrap -->
     
     <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-    <link href="css/scaffolding.css?revision=f3a4716" rel="stylesheet" media="all">
+    <link href="css/scaffolding.css?revision=5a0f102" rel="stylesheet" media="all">
     <link href="css/modal.css" rel="stylesheet" media="all">
     <link href="css/spinner.css" rel="stylesheet" media="all">
     <link rel="alternate" href="/api/static.lua"/>
@@ -63,8 +63,8 @@ the License. -->
     <script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="js/bootstrap.min.js"></script>
-    <script src="js/config.js?revision=f3a4716"></script>
-    <script src="js/ponymail.js?revision=f3a4716"></script>
+    <script src="js/config.js?revision=5a0f102"></script>
+    <script src="js/ponymail.js?revision=5a0f102"></script>
     <div id="splash" class="splash fade-in"> &nbsp; </div>
     <div style="clear: both;"></div>
     
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 6b6a35e..a1e3516 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
 */
 // THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
 
-const PONYMAIL_REVISION = 'f3a4716';
+const PONYMAIL_REVISION = '5a0f102';
 
 
 /******************************************
@@ -627,7 +627,7 @@ function fixup_quotes(splicer) {
             quote = m[0];
             i = quote.length;
             t = splicer.substr(0, i);
-            quote = quote.replace(/(>*\s*\r?\n)+$/g, "");
+            quote = quote.replace(/\n>[>\s]*$/g, "\n");
             qdiv = new HTML('div', {
                 "class": "email_quote_parent"
             }, [
diff --git a/webui/list.html b/webui/list.html
index 4006aee..8466aed 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
     <!-- Bootstrap -->
     
     <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-    <link href="css/scaffolding.css?revision=f3a4716" rel="stylesheet" media="all">
+    <link href="css/scaffolding.css?revision=5a0f102" rel="stylesheet" media="all">
     <link href="css/modal.css" rel="stylesheet" media="all">
     <link href="css/spinner.css" rel="stylesheet" media="all">
     <link rel="alternate" href="/api/static.lua"/>
@@ -181,9 +181,9 @@ the License. -->
     </script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="js/bootstrap.min.js"></script>
-    <script src="js/config.js?revision=f3a4716"></script>
-    <script src="js/wordcloud.js?revision=f3a4716"></script>
-    <script src="js/ponymail.js?revision=f3a4716"></script>
+    <script src="js/config.js?revision=5a0f102"></script>
+    <script src="js/wordcloud.js?revision=5a0f102"></script>
+    <script src="js/ponymail.js?revision=5a0f102"></script>
     <div id="splash" class="splash fade-in"> &nbsp; </div>
     <div style="clear: both;"></div>
     <script type="text/javascript">
diff --git a/webui/oauth.html b/webui/oauth.html
index f44c0f8..ae4bb24 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
 
     <!-- CSS -->
     <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-    <link href="css/scaffolding.css?revision=f3a4716" rel="stylesheet" media="all">
+    <link href="css/scaffolding.css?revision=5a0f102" rel="stylesheet" media="all">
     <link href="css/modal.css" rel="stylesheet" media="all">
     <link href="css/spinner.css" rel="stylesheet" media="all">
 
@@ -54,8 +54,8 @@ the License. -->
     <script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="js/bootstrap.min.js"></script>
-    <script src="js/config.js?revision=f3a4716"></script>
-    <script src="js/ponymail.js?revision=f3a4716"></script>
-    <script src="js/oauth.js?revision=f3a4716"></script>
+    <script src="js/config.js?revision=5a0f102"></script>
+    <script src="js/ponymail.js?revision=5a0f102"></script>
+    <script src="js/oauth.js?revision=5a0f102"></script>
   </body>
 </html>
diff --git a/webui/thread.html b/webui/thread.html
index d229418..4a18034 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
     <!-- Bootstrap -->
     
     <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-    <link href="css/scaffolding.css?revision=f3a4716" rel="stylesheet" media="all">
+    <link href="css/scaffolding.css?revision=5a0f102" rel="stylesheet" media="all">
     <link href="css/modal.css" rel="stylesheet" media="all">
     <link href="css/spinner.css" rel="stylesheet" media="all">
     <link rel="alternate" href="/api/static.lua"/>
@@ -97,9 +97,9 @@ the License. -->
     <script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="js/bootstrap.min.js"></script>
-    <script src="js/config.js?revision=f3a4716"></script>
-    <script src="js/wordcloud.js?revision=f3a4716"></script>
-    <script src="js/ponymail.js?revision=f3a4716"></script>
+    <script src="js/config.js?revision=5a0f102"></script>
+    <script src="js/wordcloud.js?revision=5a0f102"></script>
+    <script src="js/ponymail.js?revision=5a0f102"></script>
     <div id="splash" class="splash fade-in"> &nbsp; </div>
     <div style="clear: both;"></div>
   </body>