add type dans historique

Author: Princeddn

Decoder.py

@@ -19330,6 +19330,21 @@ def decode_uplink(self, encoded_data, deveui=None):
                 if res and res.get('parsed'):
                     if len(res['parsed']) > 0:
                         res['parsed']['_driver'] = drv.name
+                        
+                        # Inject Manufacturer (Fabricant)
+                        if manuf:
+                            res['parsed']['Fabricant'] = manuf.capitalize()
+                        elif 'nexelec' in drv.name.lower():
+                            res['parsed']['Fabricant'] = 'Nexelec'
+                        elif 'watteco' in drv.name.lower():
+                            res['parsed']['Fabricant'] = 'Watteco'
+                        elif 'adeunis' in drv.name.lower():
+                            res['parsed']['Fabricant'] = 'Adeunis'
+                        elif 'dragino' in drv.name.lower():
+                            res['parsed']['Fabricant'] = 'Dragino'
+                        elif 'milesight' in drv.name.lower():
+                            res['parsed']['Fabricant'] = 'Milesight'
+                            
                         return res['parsed']
             except Exception: pass
 
@@ -19340,7 +19355,9 @@ def decode_uplink(self, encoded_data, deveui=None):
                  if 'nexelec' in d.name.lower() or 'atmo' in d.name.lower():
                       try:
                           res = d.parse({"payload": raw_payload}, None)
-                          if res and res.get('parsed'): return res['parsed']
+                          if res and res.get('parsed'): 
+                              res['parsed']['Fabricant'] = 'Nexelec'
+                              return res['parsed']
                       except: pass
 
         return {"error": "No driver found", "raw": raw_payload, "info": f"Manuf: {manuf}"}

app.py

@@ -25,7 +25,7 @@ def load_config():
 CHIRPSTACK_API_TOKEN = config.get("CHIRPSTACK_API_TOKEN", os.getenv("CHIRPSTACK_API_TOKEN", "your_token_here"))
 GITHUB_REPO = config.get("GITHUB_REPO", os.getenv("GITHUB_REPO", "Princeddn/chirp-api"))
 GITHUB_BRANCH = config.get("GITHUB_BRANCH", os.getenv("GITHUB_BRANCH", "data-backup"))
-GITHUB_PAT = config.get("GITHUB_PAT", os.getenv("GITHUB_PAT", ""))
+GITHUB_PAT = config.get("GITHUB_PAT", config.get("TOKEN_GITHUB", os.getenv("GITHUB_PAT", "")))
 
 
 def restore_database_from_github(force=False):

assets/js/dashboard.js

@@ -327,7 +327,7 @@ function renderTable(page) {
     tr.innerHTML = `
         <td>${d.received_at}</td>
         <td>${d.device_name}</td>
-        <td>${d.decoded.Product_type || '-'}</td>
+        <td>${d.decoded.Fabricant || d.decoded.product_type || d.decoded.Product_type || '-'}</td>
         <td><pre style="margin:0; font-size:0.8em">${d.raw_payload || ''}</pre></td>
         <td><pre style="margin:0; font-size:0.8em; color:var(--text-muted)">${JSON.stringify(d.decoded, null, 2)}</pre></td>
       `;