flnews_post_proc 1.40 → 1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f76e4432bd460f49ef15abd469ac4f79e1c4887c99229620b0a79ec9cb8ad836
-  data.tar.gz: a6416c6b5f53bdfb9995e1b64accadf97a18fbb2b2dc69b36f4aff86e38f35e3
+  metadata.gz: 6d1a635207d4ca4d8fa516c00b23716f0446fa015bd26527483686895a4d37a8
+  data.tar.gz: 99a27fa42f530982a3854fb783f69146fdf62a4910f0145dc7551a4e6d7ec4b2
 SHA512:
-  metadata.gz: 4f331c0092c7ffeb7ac6b8ee485de68a8ad30534166b65b6be049d6b1d16a3a0a7754396da615dc397a6dd17ffdbf555363e4d41576a604963d09b21c4834031
-  data.tar.gz: 057cf2f67069ac2708d8b2444a6339b4671415bd55e86662f23d2ced0d95e5a7e80b69c3514123dab71a1edceab3717f346de7c876119c7c68bb6f31179dc3bb
+  metadata.gz: ef0f0e4c3e3b04cb1c3c1b3213ec4ef2d7c5ec8909bd7d22d581269953c4a1283c5263680990d0ff5a085077f01ddbc8b2808f90b0052c8bbbb169bae8d9622a
+  data.tar.gz: 387191fb0c3bdc9c434c970ee2b72de669dbd9d66791eb8a65c987e7ef3b6d523e39d56ebbdf2c2471bcd9897060f151c3c710bd6d03f6eeb7694e621c03e1b6

data/lib/flnews_post_proc.conf

@@ -86,13 +86,13 @@ GROUP_SIGS:
 CUSTOM_HEADERS:
 - "X-Post-Processor: flnews_post_proc"
 
-# XNAY_GROUPS:
+# NO_ARCHIVE_GROUPS:
 # The newsgroups, where a header X-No-Archive: YES shall be set.
 # CONTENT: a dash and space, then a String, containing the name of the group
 #          or a regexp.
 # DEFAULT: empty
 # EXAMPLE: - "alt.test"
-XNAY_GROUPS:
+NO_ARCHIVE_GROUPS:
 - ".*.test"
 
 # DEBUG_LOG:

data/lib/headers.rb

@@ -55,9 +55,13 @@ class Headers
           error ("Cannot match a header in line " << l << "(" << ex.message << ")")
           exit false;
         end
+        # Consider the two following fixes as preliminary until proven. 
+        # Getting older, this kind of problem occupies me a lot more than
+        # it should.
+        #
         # value is all after the first colon
         #  BUGGY: val = l.match(/:(.*)/)[1].strip
-        #  BUGFIX 3/2024
+        #  BUGFIX 3/2024, use lstrip
         val = l.match(/:(.*)/)[1].lstrip
       else # start_with?('  ')
         # a wrapped value is not devided
@@ -95,14 +99,15 @@ class Headers
 
   # Modify headers, if need be.
   def update()
-    xnay = @newsgroups.xnay
-    debug('xnay should be set now : ' << xnay.to_s)
-    if xnay 
-      @headers["X-No-Archive".to_sym] = xnay
+    no_archive = @newsgroups.no_archive
+    debug('no_archive should be set now : ' << no_archive.to_s)
+    if no_archive 
+      @headers["X-No-Archive".to_sym] = no_archive
+      @headers["Archive".to_sym] = 'no'
     end
-    ch = @@config.CUSTOM_HEADERS
-    debug('setting custom headers : ' << ch.inspect)
     if @@config.CUSTOM_HEADERS    
+      ch = @@config.CUSTOM_HEADERS
+      debug('setting custom headers : ' << ch.inspect)
       @@config.CUSTOM_HEADERS.each do |pair| 
         ch = pair.split(':')
         hn = ch[0].strip
@@ -143,6 +148,6 @@ class Headers
   end
 
   attr_reader :lines, :newsgroups
-  
+
 end
 # EOF

data/lib/newsgroups.rb

@@ -26,18 +26,18 @@ class Newsgroups
 
   def initialize(groups)
     @groups = groups.split(',')
-    debug('set signature, intro, xnay')
+    debug('set signature, intro, no_archive')
     # set details for this post
     if @groups.size == 1
       set_signature
       set_intro 
-      set_xnay 
+      set_no_archive 
     end
   end
 
-  def xnay
-    debug('returning ' <<( @xnay ? @xnay : ' nil ') )
-    return @xnay ? @xnay : nil 
+  def no_archive
+    debug('returning ' <<( @no_archive ? @no_archive : ' nil ') )
+    return @no_archive ? @no_archive : nil 
   end
   attr_reader :signature, :intro, :groups
 
@@ -121,13 +121,13 @@ class Newsgroups
     end
   end
 
-  # define the xnay header.
-  def set_xnay
-    @xnay = nil
-    xgs = @@config.XNAY_GROUPS
+  # define the no_archive header.
+  def set_no_archive
+    @no_archive = nil
+    xgs = @@config.NO_ARCHIVE_GROUPS
     if xgs && !xgs.empty? && xgs.detect {|g| @groups[0].match(g) }
-      debug("setting XNAY")
-      @xnay = 'YES' 
+      debug("setting no_archive")
+      @no_archive = 'yes' 
     end
   end
 end

data/lib/override.rb

@@ -40,7 +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, :XNAY_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.
@@ -66,7 +66,7 @@ class OverrideDlg
   # display a dialog and return the new options.
   def show
     if(@executables && !@executables.empty?)
-      debug('found executables ' << @executables.join(', ') )
+      debug('found executables ' << @executables.join(', '))
       opts = nil
       begin
         if has?(YAD)

data/lib/ruby_dlg

@@ -35,27 +35,25 @@ def wait_for_user()
   end
   return char
 end
+if !ARGV.empty? && ARGV.length > 0
+  ofl = nil
+  begin
+    ofl = File.open(ARGV[0], 'w+') 
+    puts 'writing to ' << ARGV[0]
+  rescue Exception => ex
+    puts red ('cannot open ' << ARGV[1])
+    puts ex.message
+    puts 'hit any key to exit'
+    wait_for_user
+    exit false 
+  end
 
-
-ofl = nil
-begin
-  ofl = File.open(ARGV[0], 'w+') if ARGV.length > 0
-  puts 'writing to ' << ARGV[0]
-rescue Exception => ex
-  puts red ('cannot open ' << ARGV[1])
-  puts 'hit any key to exit'
-  wait_for_user
-  exit false 
-end
-
-
-
-opt_array = []
-message = ''
-menu ||= %=
+  opt_array = []
+  message = ''
+  menu ||= %=
   1 Unset Signature         GROUP_SIGS 
   2 Unset Custom headers    CUSTOM_HEADERS
-  3 Unset X-No-Archive      XNAY_GROUPS
+  3 Unset No Archive        NO_ARCHIVE_GROUPS
   4 Do not correct URLs     VFY_URLS
   5 Disable log             DEBUG_LOG
   ––––––––––––––––––––––––––––––––––––––––––––––
@@ -65,72 +63,77 @@ menu ||= %=
 ––––––––––––––––––––––––––––––––––––––––––––––––
 #{bold("Esc, Ctrl+C and 'q'")} terminate the Post-processor 
 and no changes will be applied.
-=
-
-loop do
-  system 'clear'
-  puts yellow(menu)
-  puts cyan(message)
-  option = wait_for_user - 48
-  case option
-    # Esc, Ctrl+C, 'q'
-  when -21, -45, 65
-    puts red('Aborting. Bye.')
-    ofl.write 'exit'
-    ofl.close
-    exit true
-  when 0
-    puts green('Applying changes.') if !opt_array.empty?
-    # write the list of variables to unset (others remain)
-    ofl.write opt_array.join(' ')
-    ofl.close
-    exit true
-
-# toggle options
-# ADD option to the option array, if it should be *removed* 
-    # from the configuration, else remove it from the array.
-  when 1
-    active = !opt_array.include?(:GROUP_SIGS)
-    opt_array << :GROUP_SIGS if active
-    opt_array.delete(:GROUP_SIGS) if !active
-
-    message = "Signature #{active ? 'unset' : 'as configured'}!"
-    menu.sub!("Unset Signature", "Set Signature  ") if active
-    menu.sub!("Set Signature  ", "Unset Signature") if !active
-  when 2
-    active = !opt_array.include?(:CUSTOM_HEADERS)
-    opt_array << :CUSTOM_HEADERS if active
-    opt_array.delete(:CUSTOM_HEADERS) if !active
-
-    message = "Custom headers #{active ? 'removed' : 'are added'}!"
-    menu.sub!("Unset Custom headers", "Add Custom headers  ") if active
-    menu.sub!("Add Custom headers  ", "Unset Custom headers") if !active
-  when 3
-    active = !opt_array.include?(:XNAY_GROUPS)
-    opt_array << :XNAY_GROUPS if active
-    opt_array.delete(:XNAY_GROUPS) if !active
-
-    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
-    active = !opt_array.include?(:DEBUG_LOG)
-    opt_array << :DEBUG_LOG if active
-    opt_array.delete(:DEBUG_LOG) if !active
-
-    message = "Log is #{ active ? 'not ' : ''} " << "written!"
-    menu.sub!("Disable log", "Enable log ") if active
-    menu.sub!("Enable log ", "Disable log") if !active
-  when 6
-    message = "Summary of " << bold('disabled') << " options: " << opt_array.join(' ')
+  =
+
+  loop do
+    system 'clear'
+    puts yellow(menu)
+    puts cyan(message)
+    option = wait_for_user - 48
+    case option
+      # Esc, Ctrl+C, 'q'
+    when -21, -45, 65
+      puts red('Aborting. Bye.')
+      ofl.write 'exit'
+      ofl.close
+      exit true
+    when 0
+      puts green('Applying changes.') if !opt_array.empty?
+      # write the list of variables to unset (others remain)
+      ofl.write opt_array.join(' ')
+      ofl.close
+      exit true
+
+      # toggle options
+      # ADD option to the option array, if it should be *removed* 
+      # from the configuration, else remove it from the array.
+    when 1
+      active = !opt_array.include?(:GROUP_SIGS)
+      opt_array << :GROUP_SIGS if active
+      opt_array.delete(:GROUP_SIGS) if !active
+
+      message = "Signature #{active ? 'unset' : 'as configured'}!"
+      menu.sub!("Unset Signature", "Set Signature  ") if active
+      menu.sub!("Set Signature  ", "Unset Signature") if !active
+    when 2
+      active = !opt_array.include?(:CUSTOM_HEADERS)
+      opt_array << :CUSTOM_HEADERS if active
+      opt_array.delete(:CUSTOM_HEADERS) if !active
+
+      message = "Custom headers #{active ? 'removed' : 'are added'}!"
+      menu.sub!("Unset Custom headers", "Add Custom headers  ") if active
+      menu.sub!("Add Custom headers  ", "Unset Custom headers") if !active
+    when 3
+      active = !opt_array.include?(:NO_ARCHIVE_GROUPS)
+      opt_array << :NO_ARCHIVE_GROUPS if active
+      opt_array.delete(:NO_ARCHIVE_GROUPS) if !active
+
+      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
+      active = !opt_array.include?(:DEBUG_LOG)
+      opt_array << :DEBUG_LOG if active
+      opt_array.delete(:DEBUG_LOG) if !active
+
+      message = "Log is #{ active ? 'not ' : ''} " << "written!"
+      menu.sub!("Disable log", "Enable log ") if active
+      menu.sub!("Enable log ", "Disable log") if !active
+    when 6
+      message = "Summary of " << bold('disabled') << " options: " << opt_array.join(' ')
+    end
   end
+else # ARGV
+  puts red('missing file argument')
+  exit false
 end
 
+

data/lib/version.rb

@@ -14,8 +14,8 @@
 =end
 
 PROGNAME = 'flnews_post_proc'
-PROGVERSION = "1.40"
+PROGVERSION = "1.41"
 AUTHORS = "Michael Uplawski"
 EMAIL = "michael.uplawski@uplawski.eu"
 YEARS = "2023 - 2024"
-SUMMARY = "Moved the override-dialog scripts from the executables directory to lib"
+SUMMARY = "Additional Header 'Archive: no', when No Archive is chosen."

data/lib/whiptail_dlg

@@ -16,6 +16,11 @@
 # The main difficulty arises from the fact that positive defaults 
 # are negated, while a checklist wants to give positive results.
 
+if [ $# -eq 0 ]
+then
+  echo "ERROR: file-argument missing"
+  exit 1
+fi
 OUTFILE="$1"
 
 # empty the file
@@ -25,10 +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 XNAY_GROUPS VFY_URLS 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 XNAY_GROUPS 'X-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 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

@@ -18,16 +18,16 @@ TITLE="Override post-processor configuration"
 # unset.
 GROUP_SIGS=1
 CUSTOM_HEADERS=2
-XNAY_GROUPS=3
+NO_ARCHIVE_GROUPS=3
 VFY_URLS=4
 DEBUG_LOG=5
-CONF=($(yad --item-separator=" " --title "$TITLE" --image="" --window-icon="" --form \
+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="XNAY":CHK 'true' \
+		--field="No Archive":CHK 'true' \
 		--field="URL Correction":CHK 'true' \
-		--field="Log":CHK 'true'))
+		--field="Log":CHK 'true') 
 
 if [ $? == 0 ]
 then
@@ -38,7 +38,7 @@ then
   # echo ${C_ARR[@]}
   # <-------------
 
-  for i in GROUP_SIGS CUSTOM_HEADERS XNAY_GROUPS VFY_URLS DEBUG_LOG
+  for i in GROUP_SIGS CUSTOM_HEADERS NO_ARCHIVE_GROUPS VFY_URLS DEBUG_LOG
   do  
 	if [ 'FALSE' == "${C_ARR[$i]}" ]
 	then

data/lib/zenity_dlg

@@ -20,7 +20,7 @@ CONF=$(zenity --title "$TITLE" --text "Deselect options to disable.\n<b>Esc and
         --height 450 --list --checklist --column 'set' --column 'Option' --column '' \
 	   	TRUE GROUP_SIGS Signature\
 	  	TRUE CUSTOM_HEADERS "Custom Headers"\
-		TRUE XNAY_GROUPS "X-No-Archive"\
+		TRUE NO_ARCHIVE_GROUPS "No Archive"\
 		TRUE VFY_URLS "Correct URLs"\
 		TRUE DEBUG_LOG Log)
 
@@ -33,7 +33,7 @@ then
   # echo ${C_ARR[@]}
   # <-------------
 
-  for c in GROUP_SIGS CUSTOM_HEADERS XNAY_GROUPS VFY_URLS DEBUG_LOG
+  for c in GROUP_SIGS CUSTOM_HEADERS NO_ARCHIVE_GROUPS VFY_URLS DEBUG_LOG
   do  
 	# disable only the options which are missing in
 	# the Zenity return value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flnews_post_proc
 version: !ruby/object:Gem::Version
-  version: '1.40'
+  version: '1.41'
 platform: ruby
 authors:
 - Michael Uplawski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-07 00:00:00.000000000 Z
+date: 2024-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -84,5 +84,5 @@ requirements: []
 rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
-summary: Moved the override-dialog scripts from the executables directory to lib
+summary: 'Additional Header ''Archive: no'', when No Archive is chosen.'
 test_files: []