From bfbb7c2843e4353c0342b0b7bb1a4bc40beda534 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Thu, 12 Oct 2023 16:09:40 -0400
Subject: [PATCH] Handle mid-range pad changing, and identical names with only
 pad difference

This would be painful to operate, but if done at least
reverse noderange will
faithfully honor it now.
---
 confluent_server/confluent/noderange.py | 26 +++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/confluent_server/confluent/noderange.py b/confluent_server/confluent/noderange.py
index 1c023707..e76391e8 100644
--- a/confluent_server/confluent/noderange.py
+++ b/confluent_server/confluent/noderange.py
@@ -86,7 +86,6 @@ class Bracketer(object):
             self.tokens = [nodename]
 
     def extend(self, nodeorseq):
-        # crap... failed to preserve 0 padding foro fixe width
         # can only differentiate a single number
         endname = None
         endnums = None
@@ -97,23 +96,26 @@ class Bracketer(object):
         txtnums = getnumbers_nodename(nodename)
         nums = [int(x) for x in txtnums]
         for n in range(self.count):
+            padto = len(txtnums[n])
+            needpad = (padto != len('{}'.format(nums[n])))
             if self.sequences[n] is None:
                 # We initialize to text pieces, 'currstart', and 'prev' number
                 self.sequences[n] = [[], nums[n], nums[n]]
                 self.numlens[n] = [len(txtnums[n]), len(txtnums[n])]
-            elif self.sequences[n][2] == nums[n]:
+            elif self.sequences[n][2] == nums[n] and self.numlens[n][1] == padto:
                 continue  # new nodename has no new number, keep going
-            elif self.sequences[n][2] != nums[n]:
-                if self.diffn is not None and n != self.diffn:
+            else: # if self.sequences[n][2] != nums[n] or :
+                if self.diffn is not None and (n != self.diffn or 
+                        (needpad and padto != self.numlens[n][1])):
                     self.flush_current()
                     self.sequences[n] = [[], nums[n], nums[n]]
-                    self.numlens[n] = [len(txtnums[n]), len(txtnums[n])]
+                    self.numlens[n] = [padto, padto]
                     self.diffn = None
                 else:
                     self.diffn = n
                 if self.sequences[n][2] == (nums[n] - 1):
                     self.sequences[n][2] = nums[n]
-                    self.numlens[n][1] = len(txtnums[n])
+                    self.numlens[n][1] = padto
                 elif self.sequences[n][2] < (nums[n] - 1):
                     if self.sequences[n][2] != self.sequences[n][1]:
                         fmtstr = '{{:0{}d}}:{{:0{}d}}'.format(*self.numlens[n])
@@ -122,20 +124,20 @@ class Bracketer(object):
                         fmtstr = '{{:0{}d}}'.format(self.numlens[n][0])
                         self.sequences[n][0].append(fmtstr.format(self.sequences[n][1]))
                     self.sequences[n][1] = nums[n]
-                    self.numlens[n][0] = len(txtnums[n])
+                    self.numlens[n][0] = padto
                 self.sequences[n][2] = nums[n]
-                self.numlens[n][1] = len(txtnums[n])
-            else:
-                raise Exception('Decreasing node in extend call, not supported')
+                self.numlens[n][1] = padto
 
     def flush_current(self):
         txtfields = []
         if self.sequences and self.sequences[0] is not None:
             for n in range(self.count):
                 if self.sequences[n][1] == self.sequences[n][2]:
-                    self.sequences[n][0].append('{}'.format(self.sequences[n][1]))
+                    fmtstr = '{{:0{}d}}'.format(self.numlens[n][0])
+                    self.sequences[n][0].append(fmtstr.format(self.sequences[n][1]))
                 else:
-                    self.sequences[n][0].append('{}:{}'.format(self.sequences[n][1], self.sequences[n][2]))
+                    fmtstr = '{{:0{}d}}:{{:0{}d}}'.format(*self.numlens[n])
+                    self.sequences[n][0].append(fmtstr.format(self.sequences[n][1], self.sequences[n][2]))
                 txtfield = ','.join(self.sequences[n][0])
                 if txtfield.isdigit():
                     txtfields.append(txtfield)