flnews_post_proc 1.55 → 1.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7893f5a913ec2f1682d699180984ffa61603c01722c7f88edd7840b4f3cce797
-  data.tar.gz: a71ea92cc87014b4f75cd99e01d6bafd6b368cb076e5f1420a9e1105c95b97ff
+  metadata.gz: 1b1429b1ae2eb519f5e35c6f12a6cb56705a4b24b87a33111af776f3759addd9
+  data.tar.gz: 33009debfaadea2a4e1c2868d3eac2c74ff1216601bb511fc418702a51966511
 SHA512:
-  metadata.gz: 4606de5db3e9f9ea86777e60135f4e80b5d6437380692e446493752d461a8ff0c5e08b042f14ed3de33f52eb6290a89cbd2443c8d0dcb55e36b6819c20e90462
-  data.tar.gz: 8f9a783124f7ec6a1256488fde0bcead47868621506e8b23a7558aa87cca65881afeb9aa13280257a0bc5a7915917b5c592ee98d5ee2aa4fdd30e0dc25e31208
+  metadata.gz: 07ae7873e4f1786ee8b12b0b3b38be2f9e3245714de8675495ba6ca0b037828dbfae9c232f72ee44ed906fa38d4e0a8edae4d5f5c39428d9237287e08be549df
+  data.tar.gz: 897130b05216307f37d67143e0875179745fbd8bed256821075b6236619e99977e7143597d308be13fdad449c550e53c1e7b59109d3d8109f120c3415da5bff2

data/README.md

@@ -115,8 +115,8 @@ some users may not always agree with the result and for arbitrary reasons:
 
 * The program can attempt to correct ill formatted references. This is an  
   option, you can disable it by setting the option VFY_URLS to “no” in the  
-  configuration. Beware that mailto: links are not recognized and cannot be  
-  corrected. See the explanations for VFY_URLS, below.
+  configuration. Only URLs starting with http or https are currently 
+  handled.
 
 Dialog to override settings
 ---------------------------
@@ -302,15 +302,11 @@ the original message-body contains text marked for use as such a footnote. See
 **VFY_URLS**
 A Boolean constant. It determines if the program shall verify and possibly  
 try to correct URLs. Even if URLs are identified as such, only a few  
-manipulations are attempted :
+manipulations are attempted :  
 
 * Angular brackets '<' and '>' are added, if missing  
-* Article-references are prepended with "news:", if missing   
 * Slashes are added, if they are found missing after "http(s):"  
 
-ATTN! The program is unable to discern "mailto:" and "news:" references. If  
-neither is given, but '@' is present, "news:" is automatically prepended.  
-
 If the variable is not set, a value 'yes' is assumed.
 
 CONTENT: One of YES, yes, NO, no, and other variations of case.

data/bin/flnews_post_proc

@@ -22,8 +22,10 @@ if ! /linux/ =~ RUBY_PLATFORM
   exit false
 end
 
-require 'tempfile'
+# needs the ruby-filemagic gem
 require 'filemagic'
+require 'tempfile'
+
 require_relative '../lib/override'
 require_relative '../lib/flnews_post_proc'
 require_relative '../lib/basic_logging'
@@ -59,7 +61,7 @@ if (!STDIN.tty?)
   if !artext.strip.empty? 
     mime = FileMagic.mime.buffer artext
     debug('mime is ' << mime)
-    if mime.start_with?('message/news')  
+    if ['news', 'rfc822'].any? {|m|  mime.start_with?('message/' << m) }
       #----------->
       # Allow to override the configuration,
       # if not disabled (default is true)
@@ -90,7 +92,7 @@ if (!STDIN.tty?)
       # whatever.
       exit false
     else 
-      error ("Input is of wrong mime-type" << mime)
+      error ("Input is of wrong mime-type " << mime)
     end
   else
     error( "Cannot read the article, no content" ) 

data/doc/fr/html/flnews_post_proc.html

@@ -621,11 +621,10 @@ remplace le texte d'une future note du pied de page dans le corps du message.</p
 </dd>
 <dt><strong>VFY_URLS</strong></dt>
 <dd><p class="first">Une constante booléen. Elle détermine si le programme doit essayer de corriger
-des URIs. Même si les URIs sont identifiables, seulement quelques manipulations
+des URLs. Même si les URLs sont identifiables, seulement quelques manipulations
 sont temptées :</p>
 <ul class="simple">
 <li>'&lt;' et '&gt;' sont ajoutés, si manquants</li>
-<li>&quot;news:&quot; est ajouté au début des références à d'autres articles</li>
 <li>Des slashes sont insérés, s'ils manquent après &quot;http(s):&quot;</li>
 </ul>
 <p>ATTN! Le programme ne peut pas différencier entre &quot;mailto:&quot; et &quot;news:&quot;. Si ni l'un
@@ -636,11 +635,11 @@ ni l'autre est donné, mais '&#64;' est présent, &quot;news:&quot; est ajouté
 <p class="last">EXEMPLE: No</p>
 </dd>
 <dt><strong>OVERRIDE_CONFIG</strong></dt>
-<dd><p class="first">Une constante booléenne. Vous pouvez décider d'ignorer les options
-suivantes avant qu'un article est posté :
-GROUP_SIGS, XNAY_GROUPS, CUSTOM_HEADERS, VFY_URLS et DEBUG_LOG.
-Un dialogue peut être affiché, qui permet la désactivation de chacune de ces
-options. Les valeurs par défaut, définis pour flnews, vont donc prévaloir.</p>
+<dd><p class="first">Une constante booléenne. Vous pouvez décider d'ignorer les options suivantes
+avant qu'un article est posté : GROUP_SIGS, XNAY_GROUPS, CUSTOM_HEADERS,
+VFY_URLS et DEBUG_LOG.  Un dialogue peut être affiché, qui permet la
+désactivation de chacune de ces options. Les valeurs par défaut, définis pour
+flnews, vont donc prévaloir.</p>
 <p>ATTN ! En poussant Esc ou le bouton « Annuler » du dialogue, vous interrompez
 le programme et flnews ne va rien envoyer.</p>
 <p>Notez la valeur 'no', 'NO' ou pareil pour désactiver le dialogue.</p>

data/doc/fr/rst/flnews_post_proc.rst

@@ -297,11 +297,10 @@ variables définis dans ce fichier peuvent être classées en deux catégories :
 
 **VFY_URLS**  
  Une constante booléen. Elle détermine si le programme doit essayer de corriger
- des URIs. Même si les URIs sont identifiables, seulement quelques manipulations
+ des URLs. Même si les URLs sont identifiables, seulement quelques manipulations
  sont temptées :
 
  * '<' et '>' sont ajoutés, si manquants
- * "news:" est ajouté au début des références à d'autres articles 
  * Des slashes sont insérés, s'ils manquent après "http(s):"
 
  ATTN! Le programme ne peut pas différencier entre "mailto:" et "news:". Si ni l'un
@@ -316,11 +315,11 @@ variables définis dans ce fichier peuvent être classées en deux catégories :
  EXEMPLE: No
 
 **OVERRIDE_CONFIG**
- Une constante booléenne. Vous pouvez décider d'ignorer les options
- suivantes avant qu'un article est posté :
- GROUP_SIGS, XNAY_GROUPS, CUSTOM_HEADERS, VFY_URLS et DEBUG_LOG.
- Un dialogue peut être affiché, qui permet la désactivation de chacune de ces
- options. Les valeurs par défaut, définis pour flnews, vont donc prévaloir.
+ Une constante booléenne. Vous pouvez décider d'ignorer les options suivantes
+ avant qu'un article est posté : GROUP_SIGS, XNAY_GROUPS, CUSTOM_HEADERS,
+ VFY_URLS et DEBUG_LOG.  Un dialogue peut être affiché, qui permet la
+ désactivation de chacune de ces options. Les valeurs par défaut, définis pour
+ flnews, vont donc prévaloir.
 
  ATTN ! En poussant Esc ou le bouton « Annuler » du dialogue, vous interrompez 
  le programme et flnews ne va rien envoyer.

data/doc/html/flnews_post_proc.html

@@ -579,23 +579,19 @@ text in the message body.</p>
 try to correct URLs. Even if URLs are identified as such, only a few
 manipulations are attempted :
 * Angular brackets '&lt;' and '&gt;' are added, if missing
-* Article-references are prepended with &quot;news:&quot;, if missing
 * Slashes are added, if they are found missing after &quot;http(s):&quot;</p>
-<p>ATTN! The program is unable to discern &quot;mailto:&quot; and &quot;news:&quot; references.  If
-neither is given, but '&#64;' is present, &quot;news:&quot; is automatically prepended.</p>
 <p>If the variable is not set, a value 'yes' is assumed.</p>
 <p>CONTENT: One of YES, yes, NO, no, and other variations of case.</p>
 <p>DEFAULT: yes</p>
 <p class="last">Example: ... I let you guess.</p>
 </dd>
 <dt><strong>OVERRIDE_CONFIG</strong></dt>
-<dd><p class="first">A Boolean constant. You can choose to override the following
-configuration options before an article is posted:
-GROUP_SIGS, XNAY_GROUPS, CUSTOM_HEADERS and DEBUG_LOG.
-A dialog may be displayed which allows you to disable any of these
-four options, so that the defaults from flnews prevail.</p>
-<p>ATTN! Canceling the dialog or pushing the Esc-key does interrupt
-the process. Flnews will not post the article.</p>
+<dd><p class="first">A Boolean constant. You can choose to override the following configuration
+options before an article is posted: GROUP_SIGS, XNAY_GROUPS, CUSTOM_HEADERS,
+DEBUG_LOG and VFY_URLS.  A dialog may be displayed which allows you to disable
+any of these five options, so that the defaults from flnews prevail.</p>
+<p>ATTN! Canceling the dialog or pushing the Esc-key does interrupt the process.
+Flnews will not post the article.</p>
 <p>Set this option to no, NO or similar to disable the dialog.</p>
 <p>DEFAULT: yes</p>
 <p class="last">EXAMPLE: No</p>

data/doc/rst/flnews_post_proc.rst

@@ -258,12 +258,8 @@ categories:
  try to correct URLs. Even if URLs are identified as such, only a few
  manipulations are attempted :
  * Angular brackets '<' and '>' are added, if missing
- * Article-references are prepended with "news:", if missing 
  * Slashes are added, if they are found missing after "http(s):" 
 
- ATTN! The program is unable to discern "mailto:" and "news:" references.  If
- neither is given, but '@' is present, "news:" is automatically prepended.
-
  If the variable is not set, a value 'yes' is assumed.
 
  CONTENT: One of YES, yes, NO, no, and other variations of case.
@@ -273,14 +269,13 @@ categories:
  Example: ... I let you guess.
 
 **OVERRIDE_CONFIG**
- A Boolean constant. You can choose to override the following
- configuration options before an article is posted:
- GROUP_SIGS, XNAY_GROUPS, CUSTOM_HEADERS and DEBUG_LOG.
- A dialog may be displayed which allows you to disable any of these 
- four options, so that the defaults from flnews prevail.
-
- ATTN! Canceling the dialog or pushing the Esc-key does interrupt 
- the process. Flnews will not post the article.
+ A Boolean constant. You can choose to override the following configuration
+ options before an article is posted: GROUP_SIGS, XNAY_GROUPS, CUSTOM_HEADERS,
+ DEBUG_LOG and VFY_URLS.  A dialog may be displayed which allows you to disable
+ any of these five options, so that the defaults from flnews prevail.
+
+ ATTN! Canceling the dialog or pushing the Esc-key does interrupt the process.
+ Flnews will not post the article.
 
  Set this option to no, NO or similar to disable the dialog.
 

data/lib/body.rb

@@ -153,6 +153,7 @@ class Body
       @lines.each_with_index do | l, i | 
         # leave cited lines as they are.
         if !l.start_with?( '>') 
+=begin
           # IMPORTANT --------------------------------->
           # IT IS HENCEFORTH PROHIBITED TO WRITE AN EMAIL-ADDRESS
           # IN THE BODY OF A NEWS-POST AND TO NOT PREPEND IT WITH
@@ -164,6 +165,7 @@ class Body
           # BUGFIX : Urls with @
           # BUGFIX : email address in the intro 
           new_line = handle_news(l) if !@intro || l.strip != @intro.strip
+=end
           # http(s)
           if l.include?('http')
             new_line = handle_http(l)
@@ -173,7 +175,7 @@ class Body
       end # @lines.each_with_index
     end # if verify
   end
-
+  #
   # extract URL or other stuff, if configured for footnotes, 
   def handle_references()
     # a symbol or string to mark the beginning an ending of a future footnote.

data/lib/configuration.rb

@@ -128,6 +128,8 @@ class Configuration
       rescue Exception => ex
         msg = ex.message
         error msg
+        STDERR.puts("Configuration: cannot use the configuration-file (" << @config_file << ")") 
+        STDERR.puts("Exception: " << msg)
         exit false
       end
     else

data/lib/flnews_post_proc.conf

@@ -145,11 +145,12 @@ REFERENCE_FORMAT: " ➤%s"
 # try to correct URLs. Even if URLs are identified as such, only a few
 # manipulations are attempted :
 # * Angular brackets '<' and '>' are added, if missing
+# -----> handling <news:/> is disabled
 # * Article-references are prepended with "news:", if missing 
 # * Slashes are added, if they are found missing after "http(s):" 
 # ATTN! The program is unable to discern "mailto:" and "news:" references.  If
 # neither is given, but '@' is present, "news:" is automatically prepended.
-#
+# <-----
 # If the variable is not set, a value 'yes' is assumed.
 # CONTENT: One of YES, yes, NO, no, and other variations of case.
 # DEFAULT: No

data/lib/flnews_post_proc.rb

@@ -15,6 +15,7 @@
 
 require 'yaml'
 require 'ostruct'
+
 # --needs the Diffy gem
 require 'diffy'
 
@@ -55,8 +56,21 @@ class PostProcessor
     body.set_signature(newsgroups.signature)
 
     # verify and eventually correct URIs.
-    # ----- DANGEROUS, disabled for the time. ----
-    # body.handle_uris
+    # Will only handle http(s) for the time.
+    body.handle_uris
+
+=begin
+    require 'gpgme'
+
+    debug('signing')
+    if ENV['GPG_AGENT_INFO']
+      crypto = GPGME::Crypto.new
+      data = GPGME::Data.new(body)
+      signature = crypto.clearsign(data, {
+        :output => File.new("/tmp/crypt_out.asc", 'w+')
+      })
+    end
+=end
 
     # get the headers and the body as a string.
     # Assemble.

data/lib/override.rb

@@ -40,8 +40,7 @@ class OverrideDlg
   @@LIBDIR = File::dirname(__FILE__)
   # The configuration variables that can be unset.
   # This class instance variable is exposed via a getter.
-  @cvars = [:GROUP_SIGS, :CUSTOM_HEADERS, :NO_ARCHIVE_GROUPS, :DEBUG_LOG]
-  # @cvars = [:GROUP_SIGS, :CUSTOM_HEADERS, :NO_ARCHIVE_GROUPS, :VFY_URLS, :DEBUG_LOG]
+  @cvars = [:GROUP_SIGS, :CUSTOM_HEADERS, :NO_ARCHIVE_GROUPS, :VFY_URLS, :DEBUG_LOG]
 
   # ... here
   # For the record: this is rather cool.

data/lib/ruby_dlg

@@ -50,35 +50,20 @@ if !ARGV.empty? && ARGV.length > 0
 
   opt_array = []
   message = ''
-
   menu ||= %=
   1 Unset Signature         GROUP_SIGS 
   2 Unset Custom headers    CUSTOM_HEADERS
   3 Unset No Archive        NO_ARCHIVE_GROUPS
-  4 Disable log             DEBUG_LOG
+  4 Do not correct URLs     VFY_URLS
+  5 Disable log             DEBUG_LOG
   ––––––––––––––––––––––––––––––––––––––––––––––
-  5 Summary
+  6 Summary
   ––––––––––––––––––––––––––––––––––––––––––––––
   0 Okay, use settings. 
 ––––––––––––––––––––––––––––––––––––––––––––––––
-#{bold("Esc, Ctrl+C and 'q'")} terminate the Post-processor 
+{bold("Esc, Ctrl+C and 'q'")} terminate the Post-processor 
 and no changes will be applied.
-  =
-
-#  menu ||= %=
-#  1 Unset Signature         GROUP_SIGS 
-#  2 Unset Custom headers    CUSTOM_HEADERS
-#  3 Unset No Archive        NO_ARCHIVE_GROUPS
-#  4 Do not correct URLs     VFY_URLS
-#  5 Disable log             DEBUG_LOG
-#  ––––––––––––––––––––––––––––––––––––––––––––––
-#  6 Summary
-#  ––––––––––––––––––––––––––––––––––––––––––––––
-#  0 Okay, use settings. 
-#––––––––––––––––––––––––––––––––––––––––––––––––
-##{bold("Esc, Ctrl+C and 'q'")} terminate the Post-processor 
-#and no changes will be applied.
-#  =
+=
 
   loop do
     system 'clear'
@@ -126,16 +111,15 @@ and no changes will be applied.
       message = "X-No-Archive #{active ? 'removed' : 'is added'}!"
       menu.sub!("Unset X-No-Archive", "Add X-No-Archive  ") if active
       menu.sub!("Add X-No-Archive  ", "Unset X-No-Archive") if !active
-  #  when 4
-  #    active = !opt_array.include?(:VFY_URLS)
-  #    opt_array << :VFY_URLS if active
-  #    opt_array.delete(:VFY_URLS) if !active
-#
-  #    message = "URLS will #{active ? 'not ' : ''}" <<  "be verified!"
-  #    menu.sub!("Do not correct URLs", "Correct URLs       ") if active
-  #    menu.sub!("Correct URLs       ", "Do not correct URLs") if !active
-  #  when 5
     when 4
+      active = !opt_array.include?(:VFY_URLS)
+      opt_array << :VFY_URLS if active
+      opt_array.delete(:VFY_URLS) if !active
+
+      message = "URLS will #{active ? 'not ' : ''}" <<  "be verified!"
+      menu.sub!("Do not correct URLs", "Correct URLs       ") if active
+      menu.sub!("Correct URLs       ", "Do not correct URLs") if !active
+    when 5
       active = !opt_array.include?(:DEBUG_LOG)
       opt_array << :DEBUG_LOG if active
       opt_array.delete(:DEBUG_LOG) if !active
@@ -143,8 +127,7 @@ and no changes will be applied.
       message = "Log is #{ active ? 'not ' : ''} " << "written!"
       menu.sub!("Disable log", "Enable log ") if active
       menu.sub!("Enable log ", "Disable log") if !active
-   # when 6
-    when 5
+    when 6
       message = "Summary of " << bold('disabled') << " options: " << opt_array.join(' ')
     end
   end

data/lib/version.rb

@@ -14,8 +14,10 @@
 =end
 
 PROGNAME = 'flnews_post_proc'
-PROGVERSION = "1.55"
+PROGVERSION = "1.57"
 AUTHORS = "Michael Uplawski"
 EMAIL = "michael.uplawski@uplawski.eu"
 YEARS = "2023 - 2024"
-SUMMARY = "more checks on the input data, URI corrections disabled"
+SUMMARY = "Better error-handling when interpreting the configuration."
+SUMMARY << " README updated"
+

data/lib/whiptail_dlg

@@ -30,12 +30,10 @@ TITLE="Override post-processor configuration"
 CHECKTITLE="Deselect to disable. Esc or Cancel close the dialog and no changes will be applied."
 
 # These are the configuration variables which can be unset.
-# VARS=(GROUP_SIGS CUSTOM_HEADERS NO_ARCHIVE_GROUPS VFY_URLS DEBUG_LOG)
-VARS=(GROUP_SIGS CUSTOM_HEADERS NO_ARCHIVE_GROUPS DEBUG_LOG)
+VARS=(GROUP_SIGS CUSTOM_HEADERS NO_ARCHIVE_GROUPS VFY_URLS DEBUG_LOG)
 
 # Checklist options
-# options=(GROUP_SIGS 'Signatures' ON CUSTOM_HEADERS 'Custom headers' ON NO_ARCHIVE_GROUPS 'No Archive' ON VFY_URLS 'Correct URLs' ON DEBUG_LOG 'Log' ON)
-options=(GROUP_SIGS 'Signatures' ON CUSTOM_HEADERS 'Custom headers' ON NO_ARCHIVE_GROUPS 'No Archive' ON DEBUG_LOG 'Log' ON)
+options=(GROUP_SIGS 'Signatures' ON CUSTOM_HEADERS 'Custom headers' ON NO_ARCHIVE_GROUPS 'No Archive' ON VFY_URLS 'Correct URLs' ON DEBUG_LOG 'Log' ON)
 
 # show dialog and store results
 result=$(whiptail --title "$TITLE" --checklist "$CHECKTITLE" 13 55 5 "${options[@]}" 3>&1 1>&2 2>&3)

data/lib/yad_dlg

@@ -22,20 +22,13 @@ NO_ARCHIVE_GROUPS=3
 #VFY_URLS=4
 DEBUG_LOG=4
 
-#CONF=$(yad --item-separator=" " --title "$TITLE" --image="" --window-icon="" --form \
-#		--field="Uncheck to disable options\n<b>Esc and Cancel</b> terminate the post-processor.":LBL ""\
-#		--field="Signature":CHK 'true' \
-#		--field="Custom-headers":CHK 'true' \
-#		--field="No Archive":CHK 'true' \
-#		--field="URL Correction":CHK 'true' \
-#		--field="Log":CHK 'true') 
-
 CONF=$(yad --item-separator=" " --title "$TITLE" --image="" --window-icon="" --form \
-		--field="Uncheck to disable options\n<b>Esc and Cancel</b> terminate the post-processor.":LBL ""\
-		--field="Signature":CHK 'true' \
-		--field="Custom-headers":CHK 'true' \
-		--field="No Archive":CHK 'true' \
-		--field="Log":CHK 'true') 
+  --field="Uncheck to disable options\n<b>Esc and Cancel</b> terminate the post-processor.":LBL ""\
+  --field="Signature":CHK 'true' \
+  --field="Custom-headers":CHK 'true' \
+  --field="No Archive":CHK 'true' \
+  --field="URL Correction":CHK 'true' \
+  --field="Log":CHK 'true') 
 
 if [ $? == 0 ]
 then

data/lib/zenity_dlg

@@ -16,21 +16,13 @@
 TITLE="Override post-processor configuration"
 # The options are the configuration variables which can be unset.
 
-#CONF=$(zenity --title "$TITLE" --text "Deselect options to disable.\n<b>Esc and Cancel</b> terminate the post-processor."\
-#        --height 450 --list --checklist --column 'set' --column 'Option' --column '' \
-#	   	TRUE GROUP_SIGS Signature\
-#	  	TRUE CUSTOM_HEADERS "Custom Headers"\
-#		TRUE NO_ARCHIVE_GROUPS "No Archive"\
-#		TRUE VFY_URLS "Correct URLs"\
-#		TRUE DEBUG_LOG Log)
-
 CONF=$(zenity --title "$TITLE" --text "Deselect options to disable.\n<b>Esc and Cancel</b> terminate the post-processor."\
-        --height 450 --list --checklist --column 'set' --column 'Option' --column '' \
-	   	TRUE GROUP_SIGS Signature\
-	  	TRUE CUSTOM_HEADERS "Custom Headers"\
-		TRUE NO_ARCHIVE_GROUPS "No Archive"\
-		TRUE DEBUG_LOG Log)
-
+  --height 450 --list --checklist --column 'set' --column 'Option' --column '' \
+  TRUE GROUP_SIGS Signature\
+  TRUE CUSTOM_HEADERS "Custom Headers"\
+  TRUE NO_ARCHIVE_GROUPS "No Archive"\
+  TRUE VFY_URLS "Correct URLs"\
+  TRUE DEBUG_LOG Log)
 
 if [ $? == 0 ]
 then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flnews_post_proc
 version: !ruby/object:Gem::Version
-  version: '1.55'
+  version: '1.57'
 platform: ruby
 authors:
 - Michael Uplawski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -105,5 +105,5 @@ requirements: []
 rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
-summary: more checks on the input data, URI corrections disabled
+summary: Better error-handling when interpreting the configuration. README updated
 test_files: []