From c4a8cee558846a2e0006f89bc6e40f5c9e0357eb Mon Sep 17 00:00:00 2001
From: Markus Zolliker <markus.zolliker@psi.ch>
Date: Tue, 20 May 2025 07:58:15 +0200
Subject: [PATCH] add 'version' to box info

version 0: git.psi.ch repo
version 1: gitea.psi.ch repo
---
 cfg/flamedil.cfg |  1 +
 cfg/flamemag.cfg |  1 +
 cfg/linse-fi.cfg |  1 +
 cfg/linse-fs.cfg |  1 +
 listboxes        | 16 +++++++++-------
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/cfg/flamedil.cfg b/cfg/flamedil.cfg
index 16056c9..b324401 100644
--- a/cfg/flamedil.cfg
+++ b/cfg/flamedil.cfg
@@ -1,6 +1,7 @@
 [BOX]
 type=dual-eth-rpi
 MAC=d8:3a:dd:51:2b:81
+version=1
 
 [NETWORK]
 eth0=wan
diff --git a/cfg/flamemag.cfg b/cfg/flamemag.cfg
index 69ac11f..813e11a 100644
--- a/cfg/flamemag.cfg
+++ b/cfg/flamemag.cfg
@@ -1,6 +1,7 @@
 [BOX]
 type=dual-eth-rpi
 MAC=d8:3a:dd:51:2a:e6
+version=1
 
 [NETWORK]
 eth0=wan
diff --git a/cfg/linse-fi.cfg b/cfg/linse-fi.cfg
index e3bdfbe..80524cb 100644
--- a/cfg/linse-fi.cfg
+++ b/cfg/linse-fi.cfg
@@ -1,6 +1,7 @@
 [BOX]
 type=ionopimax
 MAC=b8:27:eb:41:3f:b2
+version=1
 
 [FRAPPY]
 port=5000
diff --git a/cfg/linse-fs.cfg b/cfg/linse-fs.cfg
index 5dc3647..dc3a7a8 100644
--- a/cfg/linse-fs.cfg
+++ b/cfg/linse-fs.cfg
@@ -3,6 +3,7 @@
 [BOX]
 type=ionopimax
 MAC=b8:27:eb:33:2e:7a
+version=1
 
 [FRAPPY]
 port=5000
diff --git a/listboxes b/listboxes
index d2ff33c..28e5e40 100755
--- a/listboxes
+++ b/listboxes
@@ -28,11 +28,11 @@ def print_line(sizes):
     print(' '.join('-' * l for l in sizes))
 
 
-legend = ['', '', '* running', '* online']
+legend = ['', '', '', '* running', '* online']
 opt = sys.argv[-1]
 if opt.startswith('-'):
     opt = opt[1:]
-header = ['box name', 'box type', 'frappy']
+header = ['box name', 'box type', 'V', 'frappy']
 if opt == 's':
     header.append('')
     legend = []
@@ -42,7 +42,7 @@ else:
         header.extend(['router', 'MAC addr'])
     else:
         header.append('')
-        legend = legend[:4]
+        legend = legend[:5]
 table = [header]
 all_ports = {}
 
@@ -80,7 +80,7 @@ for file in sorted(cfgdir.glob('*.cfg')):
     if frappy:
         box_ports['frappy'] = int(frappy_info.get('port', 10767))
     box = info.get('BOX', {})
-    row = [name,  box.get('type', 'unknown'), frappy]
+    row = [name,  box.get('type', 'unknown'), box.get('version', '0'), frappy]
     if opt == 's':
         row.append(router)
     else:
@@ -92,8 +92,8 @@ for file in sorted(cfgdir.glob('*.cfg')):
 sizes = [max([len(row[i]) for row in table]) for i in range(len(header))]
 if opt != 's':
     # make space for '*'
-    sizes[2] += 1
     sizes[3] += 1
+    sizes[4] += 1
 
 firstrow = True
 print_line(sizes)
@@ -111,20 +111,22 @@ for row in table:
             addr += online
             if opt != 'a' and online != '*':
                 continue
-            row[3] = addr
+            row[4] = addr
         if opt != 's':
             port = all_ports[name].get('frappy')
             if port and online == '*':
                 flag = check_connection(name, port)[0]
             else:
                 flag = ' '
-            row[2] += flag
+            row[3] += flag
     print(' '.join(v.ljust(l) for v, l in zip(row, sizes)))
 print_line(sizes)
 
 if legend:
     print_row(legend, sizes)
 
+print('V 0: not yet migrated to gitea')
+print('V 1: 2025-05')
 
 USAGE = f"""
 Usage: