Browse Source

Added some parameters to the show functions

Mike Greene 5 months ago
parent
commit
41b4da17fd
3 changed files with 14 additions and 9 deletions
  1. 1 1
      README.md
  2. 6 3
      market.py
  3. 7 5
      player.py

+ 1 - 1
README.md

@@ -62,5 +62,5 @@ Get a List of non-crystal remaining Cards to collect
 from player import Player
 p=Player()
 p.fetchData()
- print(p.df[['name','stock','level']].query('stock != "CRYSTAL"').to_string(index=False))
+p.show(fields=['name','level','stock'],filter='stock != "CRYSTAL"')
 ```

+ 6 - 3
market.py

@@ -102,10 +102,13 @@ class Market():
         self.df=pd.DataFrame(self.Cards)
         self.df.sort_values(by='card-num', ascending=True, inplace=True)
 
-    def show(self):
+    def show(self,fields=['card-num','name','level','qty','cost'],filter=''):
         logger.debug("Market Show Data.")
-        pdf=self.df.drop(['link','card-id','phid'], axis=1)
-        print(pdf.to_string(index=False))
+        if filter != '':
+            pdf=self.df.query(filter)
+        else:
+            pdf=self.df
+        print(pdf[fields].to_string(index=False))
 
     def commit(self):
         logger.debug("Market Commit.")

+ 7 - 5
player.py

@@ -37,7 +37,6 @@ class Player():
             Card['phid'] = card.get_attribute('phid')
             Card['level'] = card.get_attribute('level')
             Card['link'] = card.get_attribute('href')
-            Card['level']=card.find_element(By.CLASS_NAME,'pornstar-status').text
             try:
                 Card['stock']=card.find_element(By.CLASS_NAME,'card-nb').text
             except:
@@ -62,8 +61,11 @@ class Player():
         self.df=pd.DataFrame(self.Cards)
         self.df.sort_values(by='card-num', ascending=True, inplace=True)
 
-    def show(self):
-       print("Rank: {Rank}\tScore: {Score}\n".format(Rank=self.rank,Score=self.score))
-       pdf=self.df.drop(['link','card-id','phid'], axis=1)
-       print(pdf.to_string(index=False))
+    def show(self,fields=['card-num','name','level','stock'],filter=''):
+        print("Rank: {Rank}\tScore: {Score}\n".format(Rank=self.rank,Score=self.score))
+        if filter != '':
+            pdf=self.df.query(filter)
+        else:
+            pdf=self.df
+        print(pdf[fields].to_string(index=False))