prefect/ezdata: Add get_update_time and has_new_data methods

Signed-off-by: lbuque <[email protected]>

Author: lbuque

m5stack/libs/ezdata/__init__.py

@@ -38,6 +38,8 @@ def __init__(self, token, key, public=False) -> None:
         self._data_token = None
         self._date_type = None
         self._public = public
+        self._data_status = False
+        self._update_time = 0
 
     def set(self, value, is_file=False):
         if self._public:
@@ -63,12 +65,15 @@ def _set(self, value):
             rsp = urequests.post(url, json=payload, headers={})
             if rsp.status_code == 200:
                 rsp_data = json.loads(rsp.text)
+                rsp.close()
                 if rsp_data["code"] == 200:
                     self._value = value
                     return self._value
                 return None
             else:
                 return None
+        except:
+            return None
         finally:
             del url, payload
 
@@ -96,16 +101,32 @@ def _set_file(self, path: str):
             rsp = urequests.post(url, headers=headers, data=form.content())
             if rsp.status_code == 200:
                 rsp_data = json.loads(rsp.text)
+                rsp.close()
                 if rsp_data["code"] == 200:
                     self._value = path.split("/")[-1]
                     return self._value
                 return None
             else:
                 return None
+        except:
+            return None
         finally:
             del url
 
+    def get_update_time(self):
+        if self._update_time == 0:
+            self.get()
+        return self._update_time
+
+    def has_new_data(self):
+        last_time = self._update_time
+        self.get()
+        self._data_status = True if self._update_time > last_time else False
+        return self._data_status
+
     def get(self):
+        if self._data_status:
+            return self._value
         url = None
         if self._public:
             url = "{0}/{1}/data".format(_server, self._device_token)
@@ -116,13 +137,17 @@ def get(self):
             rsp = urequests.get(url, headers={})
             if rsp.status_code == 200:
                 rsp_data = json.loads(rsp.text)
+                rsp.close()
                 if rsp_data["code"] == 200:
                     self._value = rsp_data["data"]["value"]
                     self._date_type = rsp_data["data"]["dataType"]
+                    self._update_time = int(rsp_data["data"]["updateTime"])
                     return self._value
                 return None
             else:
                 return None
+        except:
+            return None
         finally:
             del url
 
@@ -134,6 +159,8 @@ def get_file(self, path):
                 f = open(path, "wb")
                 f.write(rsp.content)
                 f.close()
+            except:
+                return None
             finally:
                 pass
 
@@ -149,11 +176,13 @@ def history(self) -> list:
             rsp = urequests.get(url, headers={})
             if rsp.status_code == 200:
                 rsp_data = json.loads(rsp.text)
+                rsp.close()
                 if rsp_data["code"] == 200:
                     for i in rsp_data["data"]["rows"]:
                         res.append(i["value"])
-                    rsp.close()
             return res
+        except:
+            return None
         finally:
             del url, res
 
@@ -168,8 +197,10 @@ def delete(self):
             )
             if rsp.status_code == 200:
                 rsp_data = json.loads(rsp.text)
-                if rsp_data["code"] == 200:
-                    rsp.close()
+                rsp.close()
+                return True if rsp_data["code"] == 200 else False
+        except:
+            return False
         finally:
             del url
 
@@ -184,6 +215,7 @@ def get_key_list(device_token=None):
         rsp = urequests.get(url, headers={})
         if rsp.status_code == 200:
             rsp_data = json.loads(rsp.text)
+            rsp.close()
             if rsp_data["code"] == 200:
                 for iterm in rsp_data["data"]["rows"]:
                     DEBUG and print("key:", iterm["name"])
@@ -193,5 +225,7 @@ def get_key_list(device_token=None):
             return None
         else:
             return None
+    except:
+        return None
     finally:
         del url