Don't ignore cams without p2p_id #276 #677

mrlt8 · Jan 22, 2023 · 68047ea · 68047ea
1 parent 7b4a111
commit 68047ea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/app/wyze_bridge.py b/app/wyze_bridge.py
@@ -428,7 +428,7 @@ def get_filtered_cams(self, fresh_data: bool = False) -> None:
             os.remove(self.token_path + "cameras.pickle")
             cams: List[WyzeCamera] = self.get_wyze_data("cameras", fresh_data=True)
         for cam in cams:
-            if not cam.enr:
+            if not cam.enr or not cam.p2p_id:
                 log.warning(f"💔 {cam.nickname} is not supported [NO ENR]")
                 cams.remove(cam)
         total = len(cams)

diff --git a/app/wyzecam/api.py b/app/wyzecam/api.py
@@ -196,15 +196,8 @@ def get_camera_list(auth_info: WyzeCredential) -> List[WyzeCamera]:
             "thumbnails_url"
         )
 
-        if not p2p_id:
-            continue
-        if not p2p_type:
-            continue
         if not ip:
             continue
-        # Ignore missing ENR for gwell cameras
-        # if not enr:
-        #     continue
         if not mac:
             continue
         if not product_model:

diff --git a/app/wyzecam/api_models.py b/app/wyzecam/api_models.py
@@ -91,8 +91,8 @@ class WyzeCamera(BaseModel):
 
     """
 
-    p2p_id: str
-    p2p_type: int
+    p2p_id: Optional[str]
+    p2p_type: Optional[int]
     ip: str
     enr: Optional[str]
     mac: str