Jon Fawcett 6 éve
szülő
commit
f8e1b00c6a
1 módosított fájl, 6 hozzáadás és 30 törlés
  1. 6 30
      LoopFollow/Controllers/NightScout.swift

+ 6 - 30
LoopFollow/Controllers/NightScout.swift

@@ -104,16 +104,16 @@ extension MainViewController {
         request.cachePolicy = URLRequest.CachePolicy.reloadIgnoringLocalCacheData
         request.cachePolicy = URLRequest.CachePolicy.reloadIgnoringLocalCacheData
 
 
         // Downloader
         // Downloader
-        chartDispatch.enter()
+       
         let getBGTask = URLSession.shared.dataTask(with: request) { data, response, error in
         let getBGTask = URLSession.shared.dataTask(with: request) { data, response, error in
             if self.consoleLogging == true {print("start bg url")}
             if self.consoleLogging == true {print("start bg url")}
             guard error == nil else {
             guard error == nil else {
-                self.chartDispatch.leave()
+               
                 return
                 return
                 
                 
             }
             }
             guard let data = data else {
             guard let data = data else {
-                self.chartDispatch.leave()
+                
                 return
                 return
                 
                 
             }
             }
@@ -124,10 +124,10 @@ extension MainViewController {
                 DispatchQueue.main.async {
                 DispatchQueue.main.async {
                     // trigger the processor for the data after downloading.
                     // trigger the processor for the data after downloading.
                     self.ProcessNSBGData(data: entriesResponse, onlyPullLastRecord: onlyPullLastRecord)
                     self.ProcessNSBGData(data: entriesResponse, onlyPullLastRecord: onlyPullLastRecord)
-                    self.chartDispatch.leave()
+                   
                 }
                 }
             } else {
             } else {
-                self.chartDispatch.leave()
+                
                 return
                 return
                 
                 
             }
             }
@@ -238,15 +238,13 @@ extension MainViewController {
             var requestDeviceStatus = URLRequest(url: urlDeviceStatus)
             var requestDeviceStatus = URLRequest(url: urlDeviceStatus)
             requestDeviceStatus.cachePolicy = URLRequest.CachePolicy.reloadIgnoringLocalCacheData
             requestDeviceStatus.cachePolicy = URLRequest.CachePolicy.reloadIgnoringLocalCacheData
             
             
-            self.chartDispatch.enter()
+         
             let deviceStatusTask = URLSession.shared.dataTask(with: requestDeviceStatus) { data, response, error in
             let deviceStatusTask = URLSession.shared.dataTask(with: requestDeviceStatus) { data, response, error in
             if self.consoleLogging == true {print("in device status loop.")}
             if self.consoleLogging == true {print("in device status loop.")}
             guard error == nil else {
             guard error == nil else {
-                self.chartDispatch.leave()
                 return
                 return
             }
             }
             guard let data = data else {
             guard let data = data else {
-                self.chartDispatch.leave()
                 return
                 return
             }
             }
 
 
@@ -255,10 +253,8 @@ extension MainViewController {
             if let json = json {
             if let json = json {
                 DispatchQueue.main.async {
                 DispatchQueue.main.async {
                     self.updateDeviceStatusDisplay(jsonDeviceStatus: json)
                     self.updateDeviceStatusDisplay(jsonDeviceStatus: json)
-                    self.chartDispatch.leave()
                 }
                 }
             } else {
             } else {
-                self.chartDispatch.leave()
                 return
                 return
             }
             }
             if self.consoleLogging == true {print("finish pump update")}}
             if self.consoleLogging == true {print("finish pump update")}}
@@ -539,14 +535,11 @@ extension MainViewController {
           
           
           var request = URLRequest(url: url)
           var request = URLRequest(url: url)
           request.cachePolicy = URLRequest.CachePolicy.reloadIgnoringLocalCacheData
           request.cachePolicy = URLRequest.CachePolicy.reloadIgnoringLocalCacheData
-            self.chartDispatch.enter()
             let task = URLSession.shared.dataTask(with: request) { data, response, error in
             let task = URLSession.shared.dataTask(with: request) { data, response, error in
               guard error == nil else {
               guard error == nil else {
-                self.chartDispatch.leave()
                 return
                 return
               }
               }
               guard let data = data else {
               guard let data = data else {
-                self.chartDispatch.leave()
                 return
                 return
               }
               }
               
               
@@ -556,10 +549,8 @@ extension MainViewController {
               if let json = json {
               if let json = json {
                   DispatchQueue.main.async {
                   DispatchQueue.main.async {
                       self.updateProfile(jsonDeviceStatus: json)
                       self.updateProfile(jsonDeviceStatus: json)
-                    self.chartDispatch.leave()
                   }
                   }
               } else {
               } else {
-                self.chartDispatch.leave()
                 return
                 return
               }
               }
           }
           }
@@ -600,15 +591,12 @@ extension MainViewController {
           
           
             var request = URLRequest(url: urlData)
             var request = URLRequest(url: urlData)
             request.cachePolicy = URLRequest.CachePolicy.reloadIgnoringLocalCacheData
             request.cachePolicy = URLRequest.CachePolicy.reloadIgnoringLocalCacheData
-                self.chartDispatch.enter()
             let task = URLSession.shared.dataTask(with: request) { data, response, error in
             let task = URLSession.shared.dataTask(with: request) { data, response, error in
            
            
                 guard error == nil else {
                 guard error == nil else {
-                   self.chartDispatch.leave()
                     return
                     return
                 }
                 }
                 guard let data = data else {
                 guard let data = data else {
-                    self.chartDispatch.leave()
                     return
                     return
                 }
                 }
                     
                     
@@ -616,10 +604,8 @@ extension MainViewController {
                 if let json = json {
                 if let json = json {
                     DispatchQueue.main.async {
                     DispatchQueue.main.async {
                         self.updateBasals(entries: json)
                         self.updateBasals(entries: json)
-                        self.chartDispatch.leave()
                     }
                     }
                 } else {
                 } else {
-                   self.chartDispatch.leave()
                     return
                     return
                 }
                 }
             }
             }
@@ -768,15 +754,12 @@ extension MainViewController {
           }
           }
           var request = URLRequest(url: urlData)
           var request = URLRequest(url: urlData)
            request.cachePolicy = URLRequest.CachePolicy.reloadIgnoringLocalCacheData
            request.cachePolicy = URLRequest.CachePolicy.reloadIgnoringLocalCacheData
-        self.chartDispatch.enter()
         let task = URLSession.shared.dataTask(with: request) { data, response, error in
         let task = URLSession.shared.dataTask(with: request) { data, response, error in
           
           
                guard error == nil else {
                guard error == nil else {
-                self.chartDispatch.leave()
                 return
                 return
                }
                }
                guard let data = data else {
                guard let data = data else {
-                self.chartDispatch.leave()
                 return
                 return
                }
                }
                    
                    
@@ -784,10 +767,8 @@ extension MainViewController {
                if let json = json {
                if let json = json {
                    DispatchQueue.main.async {
                    DispatchQueue.main.async {
                        self.processNSBolus(entries: json)
                        self.processNSBolus(entries: json)
-                    self.chartDispatch.leave()
                    }
                    }
                } else {
                } else {
-                self.chartDispatch.leave()
                 return
                 return
                }
                }
            }
            }
@@ -848,15 +829,12 @@ extension MainViewController {
           }
           }
           var request = URLRequest(url: urlData)
           var request = URLRequest(url: urlData)
            request.cachePolicy = URLRequest.CachePolicy.reloadIgnoringLocalCacheData
            request.cachePolicy = URLRequest.CachePolicy.reloadIgnoringLocalCacheData
-        self.chartDispatch.enter()
            let task = URLSession.shared.dataTask(with: request) { data, response, error in
            let task = URLSession.shared.dataTask(with: request) { data, response, error in
           
           
                guard error == nil else {
                guard error == nil else {
-                self.chartDispatch.leave()
                 return
                 return
                }
                }
                guard let data = data else {
                guard let data = data else {
-                self.chartDispatch.leave()
                 return
                 return
                }
                }
                    
                    
@@ -864,10 +842,8 @@ extension MainViewController {
                if let json = json {
                if let json = json {
                    DispatchQueue.main.async {
                    DispatchQueue.main.async {
                        self.processNSCarbs(entries: json)
                        self.processNSCarbs(entries: json)
-                    self.chartDispatch.leave()
                    }
                    }
                } else {
                } else {
-                self.chartDispatch.leave()
                 return
                 return
                }
                }
            }
            }