bugfix: check 0 sized file

opencv-motion-detect/evcloudsvc.cpp

@@ -100,10 +100,11 @@ private:
         ret = z_send_multiple(pRouter, v);
         if(ret <0) {
             spdlog::error("evcloudsvc failed to send config to {}", sn);
-        }else{
+        }
+        else {
             spdlog::info("evcloudsvc config sent to {}: {}", sn, cfg);
         }
-        
+
         //}
 
         return ret;
@@ -373,7 +374,7 @@ private:
             if(data["code"] != 0) {
                 json resp;
                 resp["target"] = selfId,
-                resp["metaType"] = EV_MSG_META_PONG;
+                                 resp["metaType"] = EV_MSG_META_PONG;
                 resp["data"] = data["msg"];
                 sendEdgeMsg(resp);
             }
@@ -482,7 +483,8 @@ private:
                                 spdlog::error("evcloudsvc {} failed to send multiple: {}", devSn, zmq_strerror(zmq_errno()));
                             }
                         }
-                    }else{
+                    }
+                    else {
                         json resp;
                         resp["metaType"] = EV_MSG_META_PONG;
                         resp["target"] = selfId;
@@ -561,12 +563,13 @@ private:
     // eventToSlicer["end"]
     // eventToSlicer["sender"] = selfId;
 
-    json sendEdgeMsg(json &body) {
+    json sendEdgeMsg(json &body)
+    {
         json ret;
         ret["code"] = 0;
         ret["msg"] = "ok";
         string msg;
-        try{
+        try {
             auto target = body["target"].get<string>();
             auto v = strutils::split(target, ':');
             if(v.size() == 1 || v.size() == 3) {
@@ -574,26 +577,30 @@ private:
                 meta["type"] = body["metaType"];
                 if(body.count("metaValue") == 0) {
                     // meta["value"] = "";
-                }else{
+                }
+                else {
                     meta["value"] = body["metaValue"];
                 }
-                
+
                 body["sender"] = devSn;
-                if(peerData["status"].count(v[0]) == 0 || peerData["status"][v[0]] == 0){
+                if(peerData["status"].count(v[0]) == 0 || peerData["status"][v[0]] == 0) {
                     spdlog::warn("evcloudsvc sent msg {} to {}, but it was offline", body.dump(), v[0]);
-                }else{
+                }
+                else {
                 }
                 int i= z_send(pRouter, v[0], devSn, meta, body.dump());
                 if(i < 0) {
-                    msg = fmt::format("evcloudsvc failed to z_zend msg: {} :{}",zmq_strerror(zmq_errno()) ,body.dump());
+                    msg = fmt::format("evcloudsvc failed to z_zend msg: {} :{}",zmq_strerror(zmq_errno()),body.dump());
                     throw StrException(msg);
                 }
-            }else{
+            }
+            else {
                 msg = fmt::format("evcloudsvc invliad target field({}) in body: {}", target, body.dump());
                 throw StrException(msg);
             }
 
-        }catch(exception &e) {
+        }
+        catch(exception &e) {
             ret["msg"] = e.what();
             spdlog::error(e.what());
             ret["code"] = -1;
@@ -602,26 +609,30 @@ private:
         return ret;
     }
 
-    json handleCmd(json &body){
+    json handleCmd(json &body)
+    {
         json ret;
         ret["code"] = -1;
         ret["msg"] = "unkown msg";
         spdlog::info("evcloudsvc handle cmd: {}", body.dump());
         if(body.count("target") != 0 && body["target"].is_string() && body.count("metaType") !=0  && body["metaType"].is_string() &&
-            body.count("data") != 0 && body["data"].is_object() && body.count("metaValue") !=0  && body["metaValue"].is_string()) {
+                body.count("data") != 0 && body["data"].is_object() && body.count("metaValue") !=0  && body["metaValue"].is_string()) {
             // it's msg to edge.
             return sendEdgeMsg(body);
-        }else{
+        }
+        else {
             return ret;
         }
     }
 
-    json getReleaseBundle(string bid) {
+    json getReleaseBundle(string bid)
+    {
         json ret;
         return ret;
     }
 
-    json addReleaseBundle(json &bundle) {
+    json addReleaseBundle(json &bundle)
+    {
         json ret;
         return ret;
     }
@@ -752,10 +763,11 @@ public:
             string msg;
             ret["code"] = 0;
             ret["msg"] = "ok";
-            try{
+            try {
                 auto body = json::parse(req.body);
                 ret = this->handleCmd(body);
-            }catch(exception &e) {
+            }
+            catch(exception &e) {
                 ret["code"] = -1;
                 msg = fmt::format("evcloudsvc Post /cmd Exception: {}", e.what());
                 spdlog::error(msg);
@@ -807,12 +819,13 @@ public:
                 }
 
                 if(this->configMap.count("mod2mgr") ==0 || this->configMap["mod2mgr"].size() ==0) {
-                }else{
+                }
+                else {
                     for(auto &k:mods) {
                         this->configMap["mod2mgr"].erase(k);
                     }
                 }
-                
+
                 this->configMap.erase(sn);
                 this->peerData.erase(sn);
                 spdlog::info("evcloudsvc removed sn: {}", sn);
@@ -827,11 +840,12 @@ public:
             string msg;
             ret["code"] = 0;
             ret["msg"] = "ok";
-            try{
+            try {
                 string bundleId = req.get_param_value("bId");
                 auto body = json::parse(req.body);
                 ret = this->getReleaseBundle(bundleId);
-            }catch(exception &e) {
+            }
+            catch(exception &e) {
                 ret["code"] = -1;
                 msg = fmt::format("evcloudsvc Get /release Exception: {}", e.what());
                 spdlog::error(msg);
@@ -846,10 +860,11 @@ public:
             string msg;
             ret["code"] = 0;
             ret["msg"] = "ok";
-            try{
+            try {
                 auto body = json::parse(req.body);
                 ret = this->addReleaseBundle(body);
-            }catch(exception &e) {
+            }
+            catch(exception &e) {
                 ret["code"] = -1;
                 msg = fmt::format("evcloudsvc Post /release Exception: {}", e.what());
                 spdlog::error(msg);
@@ -883,7 +898,7 @@ public:
             spdlog::error("evcloudsvc failed setup router: {}", addr);
             exit(1);
         }
-        
+
         // setup edge msg processor
         thMsgProcessor = thread([this]() {
             while(true) {

opencv-motion-detect/evdaemon.cpp

@@ -305,7 +305,8 @@ private:
                         // stop
                         this->peerData["status"][k] = 1; // disabled
                         sendCmd2Peer(k, EV_MSG_META_VALUE_CMD_STOP, "0");
-                    }else if(v == 1) { // perm stop
+                    }
+                    else if(v == 1) {  // perm stop
                         this->peerData["status"][k] = 2;
                         this->peerData["config"].erase(k);
                         sendCmd2Peer(k, EV_MSG_META_VALUE_CMD_STOP, "0");
@@ -330,7 +331,7 @@ private:
                         else {
                             if(int(v) == 3) {
                                 sendCmd2Peer(k, EV_MSG_META_VALUE_CMD_STOP, to_string(v));
-                            }            
+                            }
                         }
                     }
                     else {
@@ -382,18 +383,21 @@ private:
                 spdlog::info("evdaemon {} peer connected: {}", devSn, selfId);
                 if(this->peerData["tsLastConn"].count(selfId) == 0) {
                     this->peerData["tsLastConn"][selfId] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
-                }else{
+                }
+                else {
                     if(this->peerData["contConn"].count(selfId) == 0) {
                         this->peerData["contConn"][selfId] = 0;
-                    }else{
+                    }
+                    else {
 
                         auto delta = this->peerData["contConn"][selfId].get<long>() - chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
                         if(delta < 3) { // within 3s
                             this->peerData["contConn"][selfId] =  this->peerData["contConn"][selfId].get<int>() + 1;
-                        }else{
+                        }
+                        else {
                             this->peerData["contConn"][selfId] = 0;
                         }
-                        // refer to startSubsystems          
+                        // refer to startSubsystems
                     }
                     this->peerData["tsLastConn"][selfId] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
                 }
@@ -409,9 +413,10 @@ private:
                 spdlog::info("evdaemon {} peer {} config sent: {}", devSn,selfId, cfg);
             }
             else {
-                if(peerData["status"][selfId] == 1 || peerData["status"][selfId] == 2){
+                if(peerData["status"][selfId] == 1 || peerData["status"][selfId] == 2) {
                     spdlog::warn("evdaemon {} refuse to start {}: it was asked to be stopped, and is removed from cluster config", this->devSn, selfId);
-                }else{
+                }
+                else {
                     peerData["status"][selfId] = 0;
                     if(peerData["pids"].count(selfId) != 0) {
                         peerData["pids"].erase(selfId);
@@ -420,7 +425,8 @@ private:
                     if(this->bBootstrap) {
                         spdlog::warn("evdaemon {} peer {} disconnected. restarting it.", devSn, selfId);
                         startSubSystems({selfId});
-                    }else{
+                    }
+                    else {
                         spdlog::warn("evdaemon {} peer {} disconnected. won't restart it since BOOTSTRAP=false", devSn, selfId);
                     }
                 }
@@ -538,7 +544,7 @@ private:
         }
 
         spdlog::info("evdaemon {} received msg from cloud: {}", devSn, msg);
-    
+
         if(v.size() != 3) {
             spdlog::error("evdaemon {} received invalid msg from evcloudsvc {}", devSn, msg);
         }
@@ -584,46 +590,55 @@ private:
                                 spdlog::info("evdaemon {} skip startup subsystems since BOOTSTRAP is set to false", devSn);
                             }
                         }
-                    }else if(meta == EV_MSG_META_TYPE_CMD){
+                    }
+                    else if(meta == EV_MSG_META_TYPE_CMD) {
                         spdlog::info("evdaemon {} received cmd from cloud: {}", devSn, msg);
                         if(data.count("target") != 0 && data["target"].is_string() && data.count("metaType") !=0  && data["metaType"].is_string() &&
-                            data.count("data") != 0 && data["data"].is_object() && data.count("metaValue") !=0  && data["metaValue"].is_string()) {
+                                data.count("data") != 0 && data["data"].is_object() && data.count("metaValue") !=0  && data["metaValue"].is_string()) {
                             string target = data["target"];
                             auto v = strutils::split(target, ':');
                             if(v.size() == 1) {
                                 spdlog::info("evdaemon {} received msg {} from cloud to itself. TODO: functionality extending points such as debug tunnel", devSn, data.dump());
-                            }else if(v.size() == 3){
+                            }
+                            else if(v.size() == 3) {
                                 if(this->peerData["status"].count(target) == 0 || this->peerData["status"][target] == 0 || this->peerData["status"] == -1) {
                                     spdlog::error("evdaemon {} received {} msg from cloud to {}: {}, but its offline", devSn, meta, target, data.dump());
-                                }else{
+                                }
+                                else {
                                     ret = sendCmd2Peer(target, data["metaValue"], data.dump());
                                     if(ret < 0) {
                                         spdlog::error("evdaemon {} failed to send msg to peer {}: {}", devSn, data.dump(), zmq_strerror(zmq_errno()));
-                                    }else{
+                                    }
+                                    else {
                                         spdlog::info("evdaemon {} successfully relayed {} msg from cloud to {}: {}", devSn, meta, target, data.dump());
                                     }
                                 }
-                            }else{
+                            }
+                            else {
                                 spdlog::info("well");
                             }
-                            
-                        }else{
+
+                        }
+                        else {
                             spdlog::info("done");
                         }
-                    }else if(meta == EV_MSG_META_PONG) {
+                    }
+                    else if(meta == EV_MSG_META_PONG) {
                         string info;
                         if(data.count("data") != 0 ) {
                             if(data["data"].is_string()) {
                                 info = fmt::format("evdaemon {} received pong msg from evcloudsvc: {}", devSn, data["data"].get<string>());
-                            }else if (data["data"].is_object()) {
+                            }
+                            else if (data["data"].is_object()) {
                                 info = fmt::format("evdaemon {} received pong msg from evcloudsvc: {}", devSn, data["data"].dump());
                             }
-                        }else{
+                        }
+                        else {
                             info = fmt::format("evdaemon {} received pong msg from evcloudsvc.", devSn);
                         }
                         spdlog::info(info);
                     }
-                    else{
+                    else {
                         spdlog::info("evdaemon {} received msg from cloud that having no handler implemented: {}", devSn, msg);
                     }
                 }
@@ -718,7 +733,7 @@ public:
     {
 
         // killall subsystems
-        
+
         /// peerId -> value
         peerData["status"] = json();
         peerData["pids"] = json();
@@ -822,8 +837,8 @@ public:
                     handleCloudMsg(v);
                     spdlog::info("evdaemon {} successfully handled msg from evcloudsvc", this->devSn);
                 }
-                
-                
+
+
             }
         });
 

opencv-motion-detect/evmgr.cpp

@@ -155,7 +155,7 @@ error_exit:
                 this->handleCloudMsg(body);
             }
         });
-        thCloudMsgHandler.detach();   
+        thCloudMsgHandler.detach();
 
         spdlog::info("evmgr {} successfuly inited", devSn);
     }
@@ -273,7 +273,8 @@ error_exit:
                 }
 
                 bProcessed = true;
-            } catch(exception &e) {
+            }
+            catch(exception &e) {
                 bProcessed = false;
                 spdlog::error("evmgr {} exception parse event msg from {} to {}: ", devSn, selfId, peerId, e.what());
             }
@@ -300,7 +301,7 @@ error_exit:
                 bProcessed = true;
             }
             else {
-                try{
+                try {
                     json jmeta = json::parse(meta);
                     if(jmeta["type"] == EV_MSG_META_TYPE_BROADCAST) {
                         if(jmeta.count("value") != 0) {
@@ -313,20 +314,23 @@ error_exit:
                                     ret = z_send_multiple(pRouter, broadCastMsg);
                                     if(ret < 0) {
                                         spdlog::error("evmgr {} failed to broadcast msg from {} because {}. msg meta: {}", devSn, selfId, zmq_strerror(zmq_errno()), meta);
-                                    }else{
+                                    }
+                                    else {
                                         spdlog::info("evmgr {} successfully broadcast msg from {} to {}. msg meta: {}", devSn, selfId, k, meta);
                                     }
                                 }
                             }
                         }
                         bProcessed = true;
-                    }else if(jmeta["type"] == EV_MSG_META_AVFORMATCTX) {
+                    }
+                    else if(jmeta["type"] == EV_MSG_META_AVFORMATCTX) {
                         bProcessed = true;
                         // ignore;
                     }
-                }catch(exception &e) {
+                }
+                catch(exception &e) {
                     bProcessed = false;
-                    spdlog::error("evmgr {} exception process msg from {} with meta {}: {}", devSn, selfId, meta, e.what());      
+                    spdlog::error("evmgr {} exception process msg from {} with meta {}: {}", devSn, selfId, meta, e.what());
                 }
             }
         }
@@ -349,12 +353,12 @@ protected:
                 bStopSig = true;
                 break;
             }
-            
+
             // if(1 == getppid()) {
             //     spdlog::error("evmgr {} exit since evdaemon is dead", devSn);
             //     exit(1);
             // }
-            
+
             auto body = z_recv_multiple(pRouter,false);
             if(body.size() == 0) {
                 spdlog::error("evmgr {} failed to receive multiple msg: {}", devSn, zmq_strerror(zmq_errno()));

opencv-motion-detect/evmlmotion.cpp

@@ -159,7 +159,8 @@ private:
                             AVFormatCtxSerializer::decode((char *)(v[2].data()), v[2].size(), pAVFormatInput);
                             gotFormat = true;
                             cvMsg.notify_one();
-                        }else{
+                        }
+                        else {
                             spdlog::warn("evmlmotion {} received avformatctx msg from {}, but already proceessed before, ignored. TODO: reinit", selfId, peerId);
                         }
                         bProcessed = true;
@@ -223,14 +224,16 @@ private:
             int portPub = 5556;
             if(evpuller.count("portPub") != 0 && evpuller["portPub"].is_number_integer()) {
                 portPub = evpuller["portPub"];
-            }else if(evpuller.count("port-pub") != 0 && evpuller["port-pub"].is_number_integer()){
+            }
+            else if(evpuller.count("port-pub") != 0 && evpuller["port-pub"].is_number_integer()) {
                 portPub = evpuller["port-pub"];
             }
 
             int portRouter = 5550;
             if(evmgr.count("portRouter") != 0 && evmgr["portRouter"].is_number_integer()) {
                 portRouter = evmgr["portRouter"];
-            }else if(evmgr.count("port-router") != 0 && evmgr["port-router"].is_number_integer()) {
+            }
+            else if(evmgr.count("port-router") != 0 && evmgr["port-router"].is_number_integer()) {
                 portRouter = evmgr["port-router"];
             }
 
@@ -646,7 +649,7 @@ protected:
         zmq_msg_t msg;
         AVPacket packet;
         json eventToSlicer;
-        
+
         // eventToSlicer["type"] = "event";
         // eventTOSlicer["extraInfo"] = json(); //array
         // eventToSlicer["start"]

opencv-motion-detect/evpuller.cpp

@@ -91,17 +91,19 @@ private:
         return ret;
     }
 
-    void sendAVInputCtxMsg(string peerId){
+    void sendAVInputCtxMsg(string peerId)
+    {
         json meta;
         auto msgBody = data2body(const_cast<char*>(pAVFmtCtxBytes), lenAVFmtCtxBytes);
-        if(peerId.empty()){
+        if(peerId.empty()) {
             meta["type"] = EV_MSG_META_TYPE_BROADCAST;
             meta["value"] = EV_MSG_META_AVFORMATCTX;
             peerId = this->mgrSn + ":evmgr:0";
-        }else{
+        }
+        else {
             meta["type"] = EV_MSG_META_AVFORMATCTX;
         }
-        
+
         vector<vector<uint8_t> > rep = {str2body(peerId), str2body(meta.dump()), msgBody};
         int ret = z_send_multiple(pDealer, rep);
         if(ret < 0) {
@@ -236,14 +238,16 @@ private:
             int portPub = 5556;
             if(evpuller.count("portPub") != 0 && evpuller["portPub"].is_number_integer()) {
                 portPub = evpuller["portPub"];
-            }else if(evpuller.count("port-pub") != 0 && evpuller["port-pub"].is_number_integer()){
+            }
+            else if(evpuller.count("port-pub") != 0 && evpuller["port-pub"].is_number_integer()) {
                 portPub = evpuller["port-pub"];
             }
 
             int portRouter = 5550;
             if(evmgr.count("portRouter") != 0 && evmgr["portRouter"].is_number_integer()) {
                 portRouter = evmgr["portRouter"];
-            }else if(evmgr.count("port-router") != 0 && evmgr["port-router"].is_number_integer()) {
+            }
+            else if(evmgr.count("port-router") != 0 && evmgr["port-router"].is_number_integer()) {
                 portRouter = evmgr["port-router"];
             }
 

opencv-motion-detect/evpusher.cpp

@@ -94,14 +94,16 @@ private:
             int portPub = 5556;
             if(evpuller.count("portPub") != 0 && evpuller["portPub"].is_number_integer()) {
                 portPub = evpuller["portPub"];
-            }else if(evpuller.count("port-pub") != 0 && evpuller["port-pub"].is_number_integer()){
+            }
+            else if(evpuller.count("port-pub") != 0 && evpuller["port-pub"].is_number_integer()) {
                 portPub = evpuller["port-pub"];
             }
 
             int portRouter = 5550;
             if(evmgr.count("portRouter") != 0 && evmgr["portRouter"].is_number_integer()) {
                 portRouter = evmgr["portRouter"];
-            }else if(evmgr.count("port-router") != 0 && evmgr["port-router"].is_number_integer()) {
+            }
+            else if(evmgr.count("port-router") != 0 && evmgr["port-router"].is_number_integer()) {
                 portRouter = evmgr["port-router"];
             }
 
@@ -260,7 +262,8 @@ private:
                             AVFormatCtxSerializer::decode((char *)(v[2].data()), v[2].size(), pAVFormatInput);
                             gotFormat = true;
                             cvMsg.notify_one();
-                        }else{
+                        }
+                        else {
                             spdlog::warn("evpusher {} received avformatctx msg from {}, but already proceessed before, ignored. TODO: reinit", selfId, peerId);
                         }
                         bProcessed = true;