eping 3.85__tar.gz → 3.86__tar.gz

{eping-3.85 → eping-3.86}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eping
-Version: 3.85
+Version: 3.86
 Summary: Continuous ICMP reachability monitor built on fping, with a CSV logfile analyser (epinga)
 Author-email: Ewald Jeitler <ewald@jeitler.cc>
 License: GPL-3.0-or-later
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
 
-# eping.py 3.85
+# eping.py 3.86
 
 Continuous ICMP reachability monitor built on `fping`. Scans a host list in a loop,
 reports each host UP/DOWN/NO-DNS, counts state changes. CLI (curses) or web GUI.
@@ -254,7 +254,7 @@ Single self-contained page, no external resources.
   | Entry | Does |
   |---|---|
   | ADD HOSTS FILE FROM SERVER | picks one or more `.txt` files or inventory `.csv` files already on the server, adds their hosts; a `.csv` without the inventory header, e.g. an eping log, is refused |
-  | ADD HOSTS FILE FROM CLIENT | local file picker (`.txt`/`.csv`), adds the hosts; a file can also be dropped anywhere on the page |
+  | ADD HOSTS FILE FROM CLIENT | dialog with a file picker (`.txt`/`.csv`; works in Safari), adds the hosts; a file can also be dropped anywhere on the page |
   | SAVE HOSTS FILE ON SERVER | confirmation, then saves the currently displayed hosts; blank name overwrites the active `-f` hostfile (first one, if eping.py was started with one) or, with none active, the default `eping-hosts.txt`; a typed name always saves as that new file instead, `.txt` appended once, active hostfile left untouched. If the displayed hosts carry inventory values (CSV import) an inventory `.csv` is written instead (`;` delimited, columns as in *Inventory CSV import*); a `.txt` name or hostfile then becomes `.csv`, the default is `eping-hosts.csv`. The options that differ from the default are written first as `opt:` lines (see *Host file format*); for a `.csv` the checkboxes `include options (opt: lines)` (default on) and `save as .txt (hosts only, no inventory)` (default off) are offered |
   | UPLOAD FILE TO SERVER | picks a local `.txt`/`.csv`, saves as-is server-side, no host parsing; never overwrites, appends `-1`/`-2`/... |
   | DOWNLOAD ALL HOSTS | full reference list: inventory `.csv` if the hosts carry inventory values, else `.txt`; non-default options first as `opt:` lines (`.csv`: checkboxes `include options`, default on, and `save as .txt`, default off) |

{eping-3.85 → eping-3.86}/README.md

@@ -1,4 +1,4 @@
-# eping.py 3.85
+# eping.py 3.86
 
 Continuous ICMP reachability monitor built on `fping`. Scans a host list in a loop,
 reports each host UP/DOWN/NO-DNS, counts state changes. CLI (curses) or web GUI.
@@ -235,7 +235,7 @@ Single self-contained page, no external resources.
   | Entry | Does |
   |---|---|
   | ADD HOSTS FILE FROM SERVER | picks one or more `.txt` files or inventory `.csv` files already on the server, adds their hosts; a `.csv` without the inventory header, e.g. an eping log, is refused |
-  | ADD HOSTS FILE FROM CLIENT | local file picker (`.txt`/`.csv`), adds the hosts; a file can also be dropped anywhere on the page |
+  | ADD HOSTS FILE FROM CLIENT | dialog with a file picker (`.txt`/`.csv`; works in Safari), adds the hosts; a file can also be dropped anywhere on the page |
   | SAVE HOSTS FILE ON SERVER | confirmation, then saves the currently displayed hosts; blank name overwrites the active `-f` hostfile (first one, if eping.py was started with one) or, with none active, the default `eping-hosts.txt`; a typed name always saves as that new file instead, `.txt` appended once, active hostfile left untouched. If the displayed hosts carry inventory values (CSV import) an inventory `.csv` is written instead (`;` delimited, columns as in *Inventory CSV import*); a `.txt` name or hostfile then becomes `.csv`, the default is `eping-hosts.csv`. The options that differ from the default are written first as `opt:` lines (see *Host file format*); for a `.csv` the checkboxes `include options (opt: lines)` (default on) and `save as .txt (hosts only, no inventory)` (default off) are offered |
   | UPLOAD FILE TO SERVER | picks a local `.txt`/`.csv`, saves as-is server-side, no host parsing; never overwrites, appends `-1`/`-2`/... |
   | DOWNLOAD ALL HOSTS | full reference list: inventory `.csv` if the hosts carry inventory values, else `.txt`; non-default options first as `opt:` lines (`.csv`: checkboxes `include options`, default on, and `save as .txt`, default off) |

{eping-3.85 → eping-3.86}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "eping"
-version = "3.85"
+version = "3.86"
 description = "Continuous ICMP reachability monitor built on fping, with a CSV logfile analyser (epinga)"
 readme = "README.md"
 license = { text = "GPL-3.0-or-later" }

{eping-3.85 → eping-3.86}/src/eping/eping.py

@@ -7,7 +7,7 @@
 # I knew how it worked.
 # Now, only god knows it!
 # - - - - - - - - - - - - - - - - - - - - - - - -
-VERSION = '3.85'
+VERSION = '3.86'
 version = VERSION  # legacy alias (kept for existing references)
 
 # --- scaling limits ---
@@ -2848,6 +2848,16 @@ WEB_INDEX_HTML = r"""<!DOCTYPE html>
       </div>
     </div>
   </div>
+  <div id="addFromClientModal" class="modal-overlay" style="display:none">
+    <div class="modal-box">
+      <h3>ADD FROM CLIENT</h3>
+      <p>Choose a `.txt` or `.csv` hosts file from this computer to add its hosts.</p>
+      <input type="file" id="fileInputVis" accept=".txt,.csv,.list,text/plain" style="margin-bottom:14px;color:var(--fg)">
+      <div class="modal-buttons">
+        <button id="modalBtnAddFromClientCancel">CANCEL</button>
+      </div>
+    </div>
+  </div>
   <div id="chooseReportModal" class="modal-overlay" style="display:none">
     <div class="modal-box wide xwide">
       <h3>CHOOSE LOGFILE</h3>
@@ -4087,9 +4097,21 @@ document.getElementById('btnClear').onclick  = function(){
 
 /* ---- host file upload ---- */
 var fileInput = document.getElementById('fileInput');
+var fileInputVis = document.getElementById('fileInputVis');
+var addFromClientModal = document.getElementById('addFromClientModal');
+function closeAddFromClient(){ addFromClientModal.style.display = 'none'; fileInputVis.value = ''; }
+function addFromClientOpen(){ return addFromClientModal.style.display === 'flex'; }
+document.getElementById('modalBtnAddFromClientCancel').onclick = closeAddFromClient;
+fileInputVis.addEventListener('change', function(){
+  var f = fileInputVis.files && fileInputVis.files[0];
+  closeAddFromClient();
+  if(f) uploadHostsFile(f, null);
+});
 fileInput.addEventListener('change', function(){
   var f = fileInput.files && fileInput.files[0];
-  if(!f) return;
+  if(f) uploadHostsFile(f, fileInput);
+});
+function uploadHostsFile(f, inp){
   var rd = new FileReader();
   rd.onload = function(){
     note('uploading ' + f.name + ' ...', true);
@@ -4097,10 +4119,10 @@ fileInput.addEventListener('change', function(){
       body: rd.result}).then(function(r){ return r.json(); }).then(function(j){
         if(!j.ok){ note('upload failed: ' + (j.error||''), false); }
       }).catch(function(){ note('upload failed', false); });
-    fileInput.value = '';
+    if(inp) inp.value = '';
   };
   rd.readAsText(f);
-});
+}
 
 var uploadServerFileInput = document.getElementById('uploadServerFileInput');
 uploadServerFileInput.addEventListener('change', function(){
@@ -4367,7 +4389,7 @@ document.getElementById('selDownload').onchange = function(){
   this.value = '';                              // reset - a select, not a toggle
   if(!what) return;
   if(what === 'add_from_server'){ openAddFromServer(); return; }
-  if(what === 'add_from_client'){ fileInput.click(); return; }
+  if(what === 'add_from_client'){ addFromClientModal.style.display = 'flex'; return; }   // visible input: Safari blocks click() from select change
   if(what === 'choose_logfile'){ openChooseLog(); return; }
   if(what === 'delete_files'){ openDeleteFiles(); return; }
   if(what === 'view_file'){ openViewFile(); return; }
@@ -4489,6 +4511,10 @@ document.addEventListener('keydown', function(e){
     if(sk === 'y' || e.key === 'Enter'){ runSaveHostsFile(); e.preventDefault(); }
     return;
   }
+  if(addFromClientOpen()){
+    if(e.key === 'Escape'){ closeAddFromClient(); e.preventDefault(); }
+    return;
+  }
   if(chooseLogOpen()){
     if(e.key === 'Escape'){ closeChooseLog(); e.preventDefault(); }
     return;

{eping-3.85 → eping-3.86}/src/eping.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eping
-Version: 3.85
+Version: 3.86
 Summary: Continuous ICMP reachability monitor built on fping, with a CSV logfile analyser (epinga)
 Author-email: Ewald Jeitler <ewald@jeitler.cc>
 License: GPL-3.0-or-later
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
 
-# eping.py 3.85
+# eping.py 3.86
 
 Continuous ICMP reachability monitor built on `fping`. Scans a host list in a loop,
 reports each host UP/DOWN/NO-DNS, counts state changes. CLI (curses) or web GUI.
@@ -254,7 +254,7 @@ Single self-contained page, no external resources.
   | Entry | Does |
   |---|---|
   | ADD HOSTS FILE FROM SERVER | picks one or more `.txt` files or inventory `.csv` files already on the server, adds their hosts; a `.csv` without the inventory header, e.g. an eping log, is refused |
-  | ADD HOSTS FILE FROM CLIENT | local file picker (`.txt`/`.csv`), adds the hosts; a file can also be dropped anywhere on the page |
+  | ADD HOSTS FILE FROM CLIENT | dialog with a file picker (`.txt`/`.csv`; works in Safari), adds the hosts; a file can also be dropped anywhere on the page |
   | SAVE HOSTS FILE ON SERVER | confirmation, then saves the currently displayed hosts; blank name overwrites the active `-f` hostfile (first one, if eping.py was started with one) or, with none active, the default `eping-hosts.txt`; a typed name always saves as that new file instead, `.txt` appended once, active hostfile left untouched. If the displayed hosts carry inventory values (CSV import) an inventory `.csv` is written instead (`;` delimited, columns as in *Inventory CSV import*); a `.txt` name or hostfile then becomes `.csv`, the default is `eping-hosts.csv`. The options that differ from the default are written first as `opt:` lines (see *Host file format*); for a `.csv` the checkboxes `include options (opt: lines)` (default on) and `save as .txt (hosts only, no inventory)` (default off) are offered |
   | UPLOAD FILE TO SERVER | picks a local `.txt`/`.csv`, saves as-is server-side, no host parsing; never overwrites, appends `-1`/`-2`/... |
   | DOWNLOAD ALL HOSTS | full reference list: inventory `.csv` if the hosts carry inventory values, else `.txt`; non-default options first as `opt:` lines (`.csv`: checkboxes `include options`, default on, and `save as .txt`, default off) |