Browse Source

Better Error messaging on HTML errors.

KeyMasterOfGozer 4 months ago
parent
commit
5993f0aacf
3 changed files with 39 additions and 33 deletions
  1. 4 4
      gatherMarket.py
  2. 18 15
      market.py
  3. 17 14
      player.py

+ 4 - 4
gatherMarket.py

@@ -15,8 +15,8 @@ def jobM():
         m.fetchData()
         m.commit()
         logger.info("Complete.")
-    except:
-        logger.error("Failed Market Gather.")
+    except Exception as e:
+        logger.error(f"{e}")
 
 def jobP():
     logger.info("Gathering Player Data.")
@@ -24,8 +24,8 @@ def jobP():
         p.fetchData()
         p.commit()
         logger.info("Complete.")
-    except:
-        logger.error("Failed Player Gather.")
+    except Exception as e:
+        logger.error(f"{e}")
 
 schedule.every(15).minutes.do(jobM)
 schedule.every(15).minutes.do(jobP)

+ 18 - 15
market.py

@@ -31,21 +31,24 @@ class Market():
         cards=self.driver.find_elements(By.CLASS_NAME, 'wrapper-market-card')
         for card in cards:
             Card={}
-            IDs=card.find_element(By.CLASS_NAME,'titre-card').text.split('\n')
-            Card['card-num']=int(IDs[1])
-            Card['name']=IDs[0]
-            link=card.find_element(By.TAG_NAME,'a')
-            Card['card-id'] = int(link.get_attribute('card-id'))
-            Card['phid'] = link.get_attribute('phid')
-            Card['level'] = link.get_attribute('level')
-            Card['link'] = link.get_attribute('href')
-            tierCard = card.find_element(By.CLASS_NAME,'tier-card')
-            tierLink = tierCard.get_attribute('src')
-            Card['tier'] = tierLink[:-4][-1].upper() 
-            Card['val']= int(card.find_element(By.CLASS_NAME,'score-card').text)
-            Card['qty']= int(card.find_element(By.CLASS_NAME,'qty').text)
-            Card['cost']= int(card.find_element(By.CLASS_NAME,'cost').text)
-            self.Cards.append(Card)
+            try:
+                IDs=card.find_element(By.CLASS_NAME,'titre-card').text.split('\n')
+                Card['card-num']=int(IDs[1])
+                Card['name']=IDs[0]
+                link=card.find_element(By.TAG_NAME,'a')
+                Card['card-id'] = int(link.get_attribute('card-id'))
+                Card['phid'] = link.get_attribute('phid')
+                Card['level'] = link.get_attribute('level')
+                Card['link'] = link.get_attribute('href')
+                tierCard = card.find_element(By.CLASS_NAME,'tier-card')
+                tierLink = tierCard.get_attribute('src')
+                Card['tier'] = tierLink[:-4][-1].upper() 
+                Card['val']= int(card.find_element(By.CLASS_NAME,'score-card').text)
+                Card['qty']= int(card.find_element(By.CLASS_NAME,'qty').text)
+                Card['cost']= int(card.find_element(By.CLASS_NAME,'cost').text)
+                self.Cards.append(Card)
+            except Exception as e:
+                logger.error(f"{e}\n{card.text}")
         self.loadDF()
 
     def initPage(self):

+ 17 - 14
player.py

@@ -35,21 +35,24 @@ class Player():
         self.Cards=[]
         cards=collection.find_elements(By.CLASS_NAME, 'wrapper-card')
         for card in cards:
-            Card={}
-            Card['card-num']=int(card.find_element(By.CLASS_NAME,'pornstar-number').text)
-            Card['name']=card.find_element(By.TAG_NAME,'h2').text
-            Card['card-id'] = int(card.get_attribute('card-id'))
-            Card['phid'] = card.get_attribute('phid')
-            Card['level'] = card.get_attribute('level')
-            tierCard = card.find_element(By.CLASS_NAME,'tier-card')
-            tierLink = tierCard.get_attribute('src')
-            Card['tier'] = tierLink[:-4][-1].upper() 
-            Card['link'] = card.get_attribute('href')
             try:
-                Card['stock']=card.find_element(By.CLASS_NAME,'card-nb').text
-            except:
-                Card['stock']="0"
-            self.Cards.append(Card)
+                Card={}
+                Card['card-num']=int(card.find_element(By.CLASS_NAME,'pornstar-number').text)
+                Card['name']=card.find_element(By.TAG_NAME,'h2').text
+                Card['card-id'] = int(card.get_attribute('card-id'))
+                Card['phid'] = card.get_attribute('phid')
+                Card['level'] = card.get_attribute('level')
+                tierCard = card.find_element(By.CLASS_NAME,'tier-card')
+                tierLink = tierCard.get_attribute('src')
+                Card['tier'] = tierLink[:-4][-1].upper() 
+                Card['link'] = card.get_attribute('href')
+                try:
+                    Card['stock']=card.find_element(By.CLASS_NAME,'card-nb').text
+                except:
+                    Card['stock']="0"
+                self.Cards.append(Card)
+            except Exception as e:
+                logger.error(f"{e}\n{card.text}")
         self.loadDF()
 
     def initPage(self):