PKDevTools 0.13.20250212.224__tar.gz → 0.13.20250212.226__tar.gz

{pkdevtools-0.13.20250212.224 → pkdevtools-0.13.20250212.226}/PKDevTools/classes/DBManager.py

@@ -72,23 +72,27 @@ class PKUser:
     lastotp=""
     balance = 0
     scannerJobs = []
+    customeField = None
 
     def userFromDBRecord(row):
         user = PKUser()
-        user.userid= row[0]
-        user.username= row[1]
-        user.name= row[2]
-        user.email= row[3]
-        user.mobile= row[4]
-        user.otpvaliduntil= row[5]
-        user.totptoken= row[6]
-        user.subscriptionmodel= row[7]
-        user.lastotp= row[8]
+        user.userid= row[0] if len(row) > 0 else None
+        if len(row) < 9:
+            user.customeField = row[0] if len(row) > 0 else None
+        user.username= row[1] if len(row) > 1 else None
+        user.name= row[2] if len(row) > 2 else None
+        user.email= row[3] if len(row) > 3 else None
+        user.mobile= row[4] if len(row) > 4 else None
+        user.otpvaliduntil= row[5] if len(row) > 5 else None
+        user.totptoken= row[6] if len(row) > 6 else None
+        user.subscriptionmodel= row[7] if len(row) > 7 else None
+        user.lastotp= row[8] if len(row) > 8 else None
         return user
     
-    def userFromAlertsRecord(row):
-        user = PKUser()
-        user.userid= row[0]
+    def userFromAlertsRecord(row,user=None):
+        if user is None:
+            user = PKUser()
+            user.userid= row[0]
         user.balance= row[1]
         user.scannerJobs = []
         for job in row[2].split(";"):
@@ -172,6 +176,7 @@ class DBManager:
     def getOTP(self,userID,username=None,name=None,retry=False,validityIntervalInSeconds=86400):
         try:
             otpValue = 0
+            user = None
             dbUsers = self.getUserByID(int(userID))
             if len(dbUsers) > 0:
                 dbUser = dbUsers[0]
@@ -211,7 +216,8 @@ class DBManager:
             print(f"Could not get/update (getOTP) OTP for user: {user.userid}\n{e}")
             default_logger().debug(e, exc_info=True)
             pass
-        return otpValue, subscriptionModel, subscriptionValidity
+        alertUser = self.alertsForUser(userID,user=user)
+        return otpValue, subscriptionModel, subscriptionValidity, alertUser
 
     def getUserByID(self,userID):
         try:
@@ -332,14 +338,15 @@ class DBManager:
                 self.conn.close()
                 self.conn = None
 
-    def getUsers(self):
+    def getUsers(self,fieldName=None):
         """
         Returns all active PKUser instances in the database or an empty list if none is found.
+        Returns only the fieldName if requested.
         """
         try:
             users = []
             cursor = self.connection() #.cursor()
-            records = cursor.execute(f"SELECT * FROM users") #.fetchall()
+            records = cursor.execute(f"SELECT {'*' if fieldName is None else fieldName} FROM users") #.fetchall()
             for row in records.rows:
                 users.append(PKUser.userFromDBRecord(row))
             # cursor.close()
@@ -356,7 +363,7 @@ class DBManager:
                 self.conn = None
         return users
 
-    def alertsForUser(self,userID:int):
+    def alertsForUser(self,userID:int,user:PKUser=None):
         """
         Returns a PKUser instance with user's updated balance for daily alerts 
         and relevant subscribed scannerJobs for a given userID or None.
@@ -364,9 +371,9 @@ class DBManager:
         try:
             users = []
             cursor = self.connection()
-            records = cursor.execute(f"SELECT * FROM alertsubscriptions where userId={self.sanitisedIntValue(userID)}")
+            records = cursor.execute(f"SELECT * FROM alertsubscriptions where userId={self.sanitisedIntValue(userID if user is None else user.userid)}")
             for row in records.rows:
-                users.append(PKUser.userFromAlertsRecord(row))
+                users.append(PKUser.userFromAlertsRecord(row,user=user))
             # cursor.close()
             if len(records.columns) > 0 and len(records.rows) <= 0:
                 default_logger().debug(f"Users not found!")
@@ -545,4 +552,4 @@ class DBManager:
             if self.conn is not None:
                 self.conn.close()
                 self.conn = None
-        return success1 and success2
+        return success1 and success2

pkdevtools-0.13.20250212.226/PKDevTools/classes/__init__.py

@@ -0,0 +1 @@
+VERSION='0.13.20250212.226'

{pkdevtools-0.13.20250212.224 → pkdevtools-0.13.20250212.226}/PKDevTools.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.2
 Name: PKDevTools
-Version: 0.13.20250212.224
+Version: 0.13.20250212.226
 Summary: A general day-to-day toolset for PKScreener repos
 Home-page: https://github.com/pkjmesra/PKDevTools
-Download-URL: https://github.com/pkjmesra/PKDevTools/archive/v0.13.20250212.224.zip
+Download-URL: https://github.com/pkjmesra/PKDevTools/archive/v0.13.20250212.226.zip
 Author: pkjmesra
 Author-email: pkjmesra@gmail.com
 License: OSI Approved (MIT)

{pkdevtools-0.13.20250212.224 → pkdevtools-0.13.20250212.226}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.2
 Name: PKDevTools
-Version: 0.13.20250212.224
+Version: 0.13.20250212.226
 Summary: A general day-to-day toolset for PKScreener repos
 Home-page: https://github.com/pkjmesra/PKDevTools
-Download-URL: https://github.com/pkjmesra/PKDevTools/archive/v0.13.20250212.224.zip
+Download-URL: https://github.com/pkjmesra/PKDevTools/archive/v0.13.20250212.226.zip
 Author: pkjmesra
 Author-email: pkjmesra@gmail.com
 License: OSI Approved (MIT)

pkdevtools-0.13.20250212.224/PKDevTools/classes/__init__.py

@@ -1 +0,0 @@
-VERSION='0.13.20250212.224'