flnews_post_proc 1.40 → 1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f76e4432bd460f49ef15abd469ac4f79e1c4887c99229620b0a79ec9cb8ad836
-  data.tar.gz: a6416c6b5f53bdfb9995e1b64accadf97a18fbb2b2dc69b36f4aff86e38f35e3
+  metadata.gz: a84f5336c8383ef6fb884ac87a9ec3d0af44ab8acc03796746abae3046058b1f
+  data.tar.gz: 17fa345dc7971716a337ad79870850ec9746dc14bc6220eac513f923b33d1898
 SHA512:
-  metadata.gz: 4f331c0092c7ffeb7ac6b8ee485de68a8ad30534166b65b6be049d6b1d16a3a0a7754396da615dc397a6dd17ffdbf555363e4d41576a604963d09b21c4834031
-  data.tar.gz: 057cf2f67069ac2708d8b2444a6339b4671415bd55e86662f23d2ced0d95e5a7e80b69c3514123dab71a1edceab3717f346de7c876119c7c68bb6f31179dc3bb
+  metadata.gz: 2b893868b1eabb86ede03c8bdaa7c8c1f78fc456932f17f491703db310e94d8902bcd19f45e6751fb7738a855415e69df1938fedb258078c43029d03048f809d
+  data.tar.gz: 9661e25f26f573839cba32f2eef2032577e37e710357af202e6fa9e863f863c41c336ffa9e6e904f5a9a14314cd7decedcaf18a44c3847ee686a71d9e0e4f955

data/README.md

@@ -93,14 +93,14 @@ some users may not always agree with the result and for arbitrary reasons:
   Custom headers may be defined in the configuration file for the program  
   and will then be added to each outgoing post.
 
-* The X-No-Archive header is sometimes set to avoid that an article be  
-  saved and stays available to search-engines (Google, notably). Test-  
-  postings, for example, do probably not justify at all that they would be  
-  referenced in search results.  
-  The post-processor program can impose the X-No-Archive header for all  
-  posts to certain newsgroups.
+* The Archive- and X-No-Archive headers are sometimes set to avoid that an
+  article be saved and stays available to search-engines (Google, notably).
+  Test-  postings, for example, do probably not justify at all that they would
+  be  referenced in search results. The post-processor program can impose the
+  Archive- and X-No-Archive header for all posts to certain newsgroups.
 
-  **ATTN** As of 2024, this header might serve no purpose any more.
+  **ATTN** As of 2024, the X-No-Archive has lost most of its utility and it 
+  is the decision of server operators to honor it or not.
 
 * If a news post contains many references to either other posts or Web  
   pages, the text can be cluttered with URLs.  
@@ -129,7 +129,7 @@ have not yet been set in the configuration.
 * Signatures, as set in the configuration **can be ignored**. Either  
   a default signature will appear as set in flnews or none.  
 * Custom Headers, if configured, can be **omitted**.  
-* The X-No-Archive header, if set for the current newsgroup, **can be  
+* Archive- and X-No-Archive headers, if set for the current newsgroup, **can be
   ignored**.  
 * The verification & correction of references **can be disabled**.  
 * Logging can be **switched off**, if set.
@@ -225,9 +225,10 @@ intact.
   _\- 'X-My-Header: nothing fancy'_  
   _\- 'X-Another-Header: care not!'_ 
 
-**XNAY_GROUPS**  
- The newsgroups, where a header X-No-Archive: YES shall be set.
- **ATTN** As of 2024, this header might serve no purpose any more.
+**NO_ARCHIVE_GROUPS**  
+
+ The newsgroups, where the headers “Archive: no” and “X-No-Archive: YES” shall
+ be set.  
 
  CONTENT: a dash and space, then a String, containing the name of the group or   
  a regexp.

data/doc/html/flnews_post_proc.html

@@ -390,38 +390,33 @@ own creations.</p>
 <h2>The limits of a basic newsreader — what the program can do</h2>
 <p>While the articles that flnews creates, are complete and ready to be posted,
 some users may not always agree with the result and for arbitrary reasons:</p>
-<ul>
-<li><p class="first">There may be inconveniences when you post to different newsgroups in
+<ul class="simple">
+<li>There may be inconveniences when you post to different newsgroups in
 different languages, as an introductory line which refers to a previous
 post can only be set once in the flnews-configuration. The consequence
 can be that your post to a french newsgroup begins with an introduction
 in English.
 My post-processor program can set an introductory line specifically
-chosen for one or several newsgroups.</p>
-</li>
-<li><p class="first">The same conflict arises, when you have set a standard signature-text and
+chosen for one or several newsgroups.</li>
+<li>The same conflict arises, when you have set a standard signature-text and
 would like to replace it against another, based on the newsgroup you are
 about to post to.
 The post-processor program sets specific signatures as configured for one
-or several newsgroups.</p>
-</li>
-<li><p class="first">Some custom headers may serve to convey additional information to
+or several newsgroups.</li>
+<li>Some custom headers may serve to convey additional information to
 interested readers of your post, like GnuPG key IDs, your language skills
 or the like. The signature may be a better choice than custom headers.
 You are free. I just mention face and x-face but prefer that you do not
 remember I did.
 Custom-headers may be defined in the configuration file for the program
-and will then be added to each outgoing post.</p>
-</li>
-<li><p class="first">The X-No-Archive header is sometimes set to avoid that an article be
-saved and stays available to search-engines (Google, notably). Test-
-postings, for example, do probably not justify at all that they would be
-referenced in search-results.
-The post-processor program can impose the X-No-Archive header for all
-posts to certain newsgroups.</p>
-<p><strong>ATTN</strong> Since 2024, this header might no longer serve any purpose.</p>
-</li>
-<li><p class="first">If a news post contains many references to either other posts or Web
+and will then be added to each outgoing post.</li>
+<li>The Archive- and the X-No-Archive header are sometimes set to avoid that an
+article be saved and stays available to search-engines (Google, notably).
+Test- postings, for example, do probably not justify at all that they would
+be referenced in search-results.
+The post-processor program can impose both headers for all posts to certain
+newsgroups.</li>
+<li>If a news post contains many references to either other posts or Web
 pages, the text can be cluttered with URLs.
 The post-processor can identify marked text fragments and transform them
 into footnotes, which will be attached as a list at the bottom of the
@@ -430,8 +425,7 @@ This works almost like the &lt;ref/&gt; link in Wikipedia, but the delimiter
 can be determined in the configuration file.
 Example (with %=):
 This is an object %=and this becomes the footnote, describing the object
-further=%</p>
-</li>
+further=%</li>
 </ul>
 </div>
 <div class="section" id="dialog-to-override-settings">
@@ -445,8 +439,8 @@ have not yet been set in the configuration.</p>
 <li>Signatures, as set in the configuration <strong>can be ignored</strong>. Either
 a default signature will appear as set in flnews or none.</li>
 <li>Custom Headers, if configured, can be <strong>omitted</strong>.</li>
-<li>The X-No-Archive header, if set for the current newsgroup, <strong>can be
-ignored</strong>.</li>
+<li>The Archive- and X-No-Archive headers, if set for the current newsgroup,
+<strong>can be ignored</strong>.</li>
 <li>Logging can be <strong>switched off</strong>, if set.</li>
 </ul>
 <p>Pushing Esc or the cancle-button of the dialog interrupts the process, flnews
@@ -523,9 +517,9 @@ name of the header, ending in a colon and the value of the header.</p>
 <div class="line">- 'X-Another-Header: care not!'</div>
 </div>
 </dd>
-<dt><strong>XNAY_GROUPS</strong></dt>
-<dd><p class="first">The newsgroups, where a header X-No-Archive: YES shall be set.
-<strong>ATTN</strong> Since 2024, this header might no longer serve any purpose.</p>
+<dt><strong>NO_ARCHIVE_GROUPS</strong></dt>
+<dd><p class="first">The newsgroups, where the headers “Archive: no” and “X-No-Archive: YES” shall
+be set.</p>
 <p>CONTENT: a dash and space, then a String, containing the name of the group or a regexp.</p>
 <p>DEFAULT: empty</p>
 <div class="last line-block">

data/doc/html/flnews_post_proc_fr.html

@@ -421,14 +421,14 @@ ne vous en souvenez pas.</p>
 <p>Ces entêtes, – Custom-Headers – peuvent être définis dans la configuration
 du logiciel et vont être utilisées dans chaque article sortant.</p>
 </li>
-<li><p class="first">L'entête « X-No-Archive » est parfois utilisé afin d'éviter l'archivage
-d'un article. Il ne devrait par conséquence pas être trouvé par les moteurs
-de recherche ( Google notamment ). Les articles dans les groupes de test, par
-exemple, ne valent probablement pas qu'on les trouve parmi les résultats des
-recherches.</p>
+<li><p class="first">Les entêtes « Archive » et « X-No-Archive » sont parfois utilisés afin
+d'éviter l'archivage d'un article. Il ne devrait par conséquence pas être
+trouvé par les moteurs de recherche ( Google notamment ). Les articles dans
+les groupes de test, par exemple, ne valent probablement pas qu'on les trouve
+parmi les résultats des recherches.</p>
 <p>Avec flnews_post_proc vous pouvez décider et imposer que vos articles dans
-certains newsgroups contiendront d'office une entête <strong>X-No-Archive: Yes</strong>.</p>
-<p><strong>ATTN</strong> Depuis l'année 2024, cet entête n'a probablement plus de fonction.</p>
+certains newsgroups contiendront d'office les deux entêtes <strong>Archive: no</strong> et
+<strong>X-No-Archive: Yes</strong>.</p>
 </li>
 <li><p class="first">Certains messages mentionnent d'autres articles ou des URLs de pages Web.
 S'ils sont nombreux, ces références peuvent déranger la lecture à cause de
@@ -456,7 +456,8 @@ des options, qui ne l'ont pas été auparavant :</p>
 <li>Signatures, comme définis dans la configuration <strong>peuvent être ignorées</strong>.
 Soit une signature par défaut sera appliquée, si prévue, ou aucune.</li>
 <li>Entêtes supplémentaires, si définis, peuvent rester absentes de l'article.</li>
-<li>L'entête X-No-Archive, si prévu pour le newsgroup choisi, peut être ignoré.</li>
+<li>Les entêtes Archive et X-No-Archive, si prévus pour le newsgroup choisi,
+peuvent être ignorés.</li>
 <li>L'auto correction de URLs et références à d'autres articles peut être
 désactivé.</li>
 <li>L'écriture d'un protocole peut être arrêtée.</li>
@@ -550,9 +551,9 @@ l'entête.</p>
 <div class="line">- 'X-Another-Header: care not!'</div>
 </div>
 </dd>
-<dt><strong>XNAY_GROUPS</strong></dt>
-<dd><p class="first">Les newsgroups, où une entête X-No-Arcive: YES doit être présent.
-<strong>ATTN</strong> Depuis l'année 2024, cet entête n'a probablement plus de fonction.</p>
+<dt><strong>NO_ARCHIVE_GROUPS</strong></dt>
+<dd><p class="first">Les newsgroups, où les entêtes « Archive: no » et « X-No-Archive: yes »
+doivent être présents.</p>
 <p>CONTENU : Un trait d'union et un espace, puis une chaîne de caractères,
 contenant le nom du groupe ou une expression.</p>
 <p>PAR DÉFAUT : Vide</p>

data/doc/rst/flnews_post_proc.rst

@@ -60,14 +60,12 @@ some users may not always agree with the result and for arbitrary reasons:
   Custom-headers may be defined in the configuration file for the program
   and will then be added to each outgoing post.
 
-* The X-No-Archive header is sometimes set to avoid that an article be
-  saved and stays available to search-engines (Google, notably). Test-
-  postings, for example, do probably not justify at all that they would be
-  referenced in search-results.
-  The post-processor program can impose the X-No-Archive header for all
-  posts to certain newsgroups.
-
-  **ATTN** Since 2024, this header might no longer serve any purpose.
+* The Archive- and the X-No-Archive header are sometimes set to avoid that an
+  article be saved and stays available to search-engines (Google, notably).
+  Test- postings, for example, do probably not justify at all that they would
+  be referenced in search-results.
+  The post-processor program can impose both headers for all posts to certain
+  newsgroups.
 
 * If a news post contains many references to either other posts or Web
   pages, the text can be cluttered with URLs.
@@ -91,8 +89,8 @@ have not yet been set in the configuration.
 * Signatures, as set in the configuration **can be ignored**. Either
   a default signature will appear as set in flnews or none.
 * Custom Headers, if configured, can be **omitted**.
-* The X-No-Archive header, if set for the current newsgroup, **can be
-  ignored**.
+* The Archive- and X-No-Archive headers, if set for the current newsgroup,
+  **can be ignored**.
 * Logging can be **switched off**, if set.
 
 Pushing Esc or the cancle-button of the dialog interrupts the process, flnews
@@ -187,9 +185,9 @@ categories:
  | - 'X-My-Header: nothing fancy'
  | - 'X-Another-Header: care not!' 
 
-**XNAY_GROUPS**
- The newsgroups, where a header X-No-Archive: YES shall be set.
- **ATTN** Since 2024, this header might no longer serve any purpose.
+**NO_ARCHIVE_GROUPS** 
+ The newsgroups, where the headers “Archive: no” and “X-No-Archive: YES” shall
+ be set.
 
  CONTENT: a dash and space, then a String, containing the name of the group or a regexp.
 

data/doc/rst/flnews_post_proc_fr.rst

@@ -73,16 +73,15 @@ et ce pour des raisons arbitraires :
   Ces entêtes, – Custom-Headers – peuvent être définis dans la configuration
   du logiciel et vont être utilisées dans chaque article sortant.
 
-* L'entête « X-No-Archive » est parfois utilisé afin d'éviter l'archivage
-  d'un article. Il ne devrait par conséquence pas être trouvé par les moteurs
-  de recherche ( Google notamment ). Les articles dans les groupes de test, par
-  exemple, ne valent probablement pas qu'on les trouve parmi les résultats des
-  recherches.
+* Les entêtes « Archive » et « X-No-Archive » sont parfois utilisés afin
+  d'éviter l'archivage d'un article. Il ne devrait par conséquence pas être
+  trouvé par les moteurs de recherche ( Google notamment ). Les articles dans
+  les groupes de test, par exemple, ne valent probablement pas qu'on les trouve
+  parmi les résultats des recherches.
 
   Avec flnews_post_proc vous pouvez décider et imposer que vos articles dans
-  certains newsgroups contiendront d'office une entête **X-No-Archive: Yes**.
-
-  **ATTN** Depuis l'année 2024, cet entête n'a probablement plus de fonction.
+  certains newsgroups contiendront d'office les deux entêtes **Archive: no** et
+  **X-No-Archive: Yes**.
 
 * Certains messages mentionnent d'autres articles ou des URLs de pages Web.
   S'ils sont nombreux, ces références peuvent déranger la lecture à cause de
@@ -112,7 +111,8 @@ des options, qui ne l'ont pas été auparavant :
 
 * Entêtes supplémentaires, si définis, peuvent rester absentes de l'article.
 
-* L'entête X-No-Archive, si prévu pour le newsgroup choisi, peut être ignoré.
+* Les entêtes Archive et X-No-Archive, si prévus pour le newsgroup choisi,
+  peuvent être ignorés.
 
 * L'auto correction de URLs et références à d'autres articles peut être
   désactivé. 
@@ -218,9 +218,9 @@ variables définis dans ce fichier peuvent être classées en deux catégories :
  | - 'X-My-Header: nothing fancy'
  | - 'X-Another-Header: care not!' 
 
-**XNAY_GROUPS**
- Les newsgroups, où une entête X-No-Arcive: YES doit être présent.  
- **ATTN** Depuis l'année 2024, cet entête n'a probablement plus de fonction.
+**NO_ARCHIVE_GROUPS**
+ Les newsgroups, où les entêtes « Archive: no » et « X-No-Archive: yes »
+ doivent être présents.
 
  CONTENU : Un trait d'union et un espace, puis une chaîne de caractères,
  contenant le nom du groupe ou une expression.

data/lib/body.rb

@@ -203,19 +203,23 @@ class Body
   # handle <news:..@...>
   def handle_news(l)
     # ... “Do not trust nobody!”
-    if l.include?('@') && ! l.include?('http:') 
+    if l.include?('@') && ! l.include?('http:') && ! l.include?('https:') 
       # And I forgot how this works. It does.
       l.split.collect do |ele| 
         # angular brackets are there alright. Hurra. 
         url = ele.match(/\<(.*)\>/)
         unless !url
           debug(' with angular brackets: ' << url.inspect)
-          l = l.sub(url[1], 'news:' << url[1]) if !url[1].include?('mailto')
+          l = l.sub(url[1], 'news:' << url[1]) if !url[1].start_with?('mailto') && !url[1].start_with?('news')
         else
           url = ele.match(/\S+@(\.|[^\p{P}]+)\S+/)
           if url
             debug(' withOUT angular brackets: ' << url.inspect)
-            l = l.sub(url[0], '<news:' << url[0] << '>') if !url[0].include?('mailto')
+            if !url[0].start_with?('mailto') && !url[0].start_with?('news')
+              l.sub!(url[0], 'news:' << url[0] )          
+            end
+            l.sub!('news:', '<news:')
+            l.sub!(url[0], url[0] << '>')
           end
         end
       end # url_strs = collect
@@ -235,13 +239,13 @@ class Body
       debug( 'try to match http-link')
       begin
         # missing slashes ?
-        match = str.match(/(https?):(\/{2})/)
+        match = str.match(/(https?):(\/*)/)
         if (!match || match.length != 3 || match[2] != '//')
-          debug 'cannot find slashes in the URL'
+          debug 'cannot find (enough) slashes in the URL'
           if str.match(/https:/)
-            nstr = str.sub(/https:/, "https://")
+            nstr = str.sub(/https:\/*/, "https://")
           elsif str.match(/http:/)
-            nstr = str.sub(/http:/, "http://") 
+            nstr = str.sub(/http:\/*/, "http://") 
           end
           debug ' with slashes: ' << nstr
         end
@@ -252,8 +256,8 @@ class Body
         match = nstr.match(/\<?(https?:\/\/[^\>]*)\>?/)
         # get the darned URL already!
         url = match[1] if match
-       #  nstr = with_angular_brackets(nstr, url)
-        return l.sub(str, nstr)
+        #  nstr = with_angular_brackets(nstr, url)
+        l.sub!(str, nstr)
       rescue Exception => ex
         # this had looked intelligent, once.
         line = __LINE__
@@ -264,6 +268,7 @@ class Body
         exit false
       end
     end
+    return l
   end
 end
 # Ω

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.43"
 AUTHORS = "Michael Uplawski"
 EMAIL = "michael.uplawski@uplawski.eu"
 YEARS = "2023 - 2024"
-SUMMARY = "Moved the override-dialog scripts from the executables directory to lib"
+SUMMARY = "Bugfix: reduce number of slashes in http: urls to 2"

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.43'
 platform: ruby
 authors:
 - Michael Uplawski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-07 00:00:00.000000000 Z
+date: 2024-04-27 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: 'Bugfix: reduce number of slashes in http: urls to 2'
 test_files: []