harden: gate CalorieDB behind flag, remove unreachable preload, refine .gitignore (narrow sensitive patterns, add caloriedb data)

Author: CalorieApp Maintainer

.gitignore

@@ -132,13 +132,19 @@ dmypy.json
 .buildozer/
 bin/
 
-# Wallet data files (sensitive)
+# Wallet data files (sensitive, restrict to wallet_data only)
 wallet_data.dat
 wallet_data.bak
 wallet_data.dir
-*.dat
-*.bak
-*.dir
+
+# CalorieDB (deferred feature) runtime data stores
+data/calorie_links.json
+data/caloriedb_private/
+data/caloriedb_public/
+data/caloriedb_sync/
+data/*.enc
+
+# Avoid blanket ignoring all .dat/.bak/.dir (removed) to allow legitimate data assets
 
 # Temporary files
 *.tmp
@@ -298,10 +304,12 @@ src/utils/wallet_connect/
 src/utils/pro_*.py
 src/utils/xrpl_caloriedb_sync.py
 src/utils/calorie_linking.py
+# Deferred experimental screens (keep Web3 browser ignored to prevent accidental reintroduction)
 src/screens/Web3BrowserScreen.py
-src/screens/WebViewScreen.py
-src/screens/BarcodeScanScreen.py
-src/screens/CameraScanScreen.py
+# Active screens needed for app runtime (stop ignoring)
+!src/screens/WebViewScreen.py
+!src/screens/BarcodeScanScreen.py
+!src/screens/CameraScanScreen.py
 
 # Progress docs & internal summaries (not for public)
 docs/archive/

src/core/app.py

@@ -580,20 +580,5 @@ def on_stop(self):
 
 
 if __name__ == "__main__":
+    # Direct run path for standalone execution
     CalorieAppTestnet().run()
-
-    def on_start(self):
-        try:
-            from kivy.clock import Clock
-            Clock.schedule_once(self._preload_screens, 0.8)
-        except Exception:
-            pass
-
-    def _preload_screens(self, *_):
-        try:
-            _ = self.manager.get_screen('wallet_screen')
-            _ = self.manager.get_screen('settings_screen')
-            _ = self.manager.get_screen('send_xrp_screen')
-            print('✅ Screens pre-loaded')
-        except Exception:
-            pass

src/screens/FoodTrackScreen.py

@@ -3,7 +3,16 @@
 from kivy.clock import Clock
 
 from src.utils.foodrepo_client import FoodRepoClient
-from src.utils.caloriedb import record_scan
+
+# CalorieDB prototype deferred behind feature flag
+from src.core.feature_flags import ENABLE_CALORIE_DB
+try:  # Safe guarded import of deferred module
+    if ENABLE_CALORIE_DB:
+        from src._deferred.caloriedb import record_scan  # type: ignore
+    else:
+        record_scan = None  # type: ignore
+except Exception:
+    record_scan = None  # type: ignore
 
 try:
     from kivy_garden.zbarcam import ZBarCam
@@ -150,13 +159,15 @@ def _format_nutrition(self, product: dict) -> str:
         return "\n".join(lines) if lines else "Nutrition info not available"
 
     def record_to_caloriedb(self):
-        """Record food scan to CalorieDB (IPFS/BigchainDB pilot)"""
+        """Attempt to record food scan to CalorieDB if feature enabled."""
+        if not ENABLE_CALORIE_DB or record_scan is None:
+            self.result_text = "CalorieDB feature deferred (disabled)."
+            return
         if not self.product or not self.last_barcode:
             self.result_text = "Lookup a product first"
             return
-            
         try:
-            entry = record_scan(self.product, self.last_barcode)
+            entry = record_scan(self.product, self.last_barcode)  # type: ignore[arg-type]
             cid = entry.get("ipfs_cid")
             tx = entry.get("bigchaindb_tx_id")
             self.result_text = f"✓ Recorded to CalorieDB\nCID: {cid or 'n/a'}\nTX: {tx or 'n/a'}"