xync-client 0.0.57.dev2__tar.gz → 0.0.57.dev7__tar.gz

{xync_client-0.0.57.dev2/xync_client.egg-info → xync_client-0.0.57.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.57.dev2
+Version: 0.0.57.dev7
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client

{xync_client-0.0.57.dev2 → xync_client-0.0.57.dev7}/xync_client/Bybit/agent.py

@@ -641,9 +641,9 @@ class AgentClient(BaseAgentClient):  # Bybit client
         if ad_db := await models.Ad.get_or_none(exid=ad.id).prefetch_related("cond__ads__maker"):
             # у измененного условия этой объявы есть другие объявы?
             if rest_ads := set(ad_db.cond.ads) - {ad_db}:
-                if set(ra.maker.exid for ra in rest_ads) - {ad_db}:
+                if rest_uids := {ra.maker_id for ra in rest_ads} - {ad_db.maker_id}:
                     # todo: дописать проверку на измененность этого условия в других ads
-                    logging.exception("у измененного cond этой ad есть другие ads где оно не изменилось")
+                    logging.exception("у измененного cond этой ad есть другие ads где оно не изменилось", rest_uids)
             if cond := await Cond.get_or_none(raw_txt=cleaned):
                 if not rest_ads:
                     self.all_conds.pop(ad_db.cond_id)
@@ -651,9 +651,13 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 ad_db.cond_id = cond.id
                 await ad_db.save()
             else:
+                if rest_ads and rest_uids:
+                    logging.error(rest_uids)
+                # щас переписывается условие во всех объявах даже если они разных юзеров
                 ad_db.cond.last_ver = ad_db.cond.raw_txt
                 ad_db.cond.raw_txt = cleaned
-                self.all_conds[ad_db.cond_id] = cleaned
+                uids = {ra.maker.exid for ra in ad_db.cond.ads}
+                self.all_conds[ad_db.cond_id] = cleaned, uids
                 await ad_db.cond.save()
             return ad_db, False
 

{xync_client-0.0.57.dev2 → xync_client-0.0.57.dev7}/xync_client/Pms/Ozon/__init__.py

@@ -1,4 +1,3 @@
-import time
 from asyncio import run, sleep
 from x_model import init_db
 from xync_schema import models
@@ -6,6 +5,7 @@ from xync_client.loader import TORM
 import undetected_chromedriver as uc
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.action_chains import ActionChains
+from bs4 import BeautifulSoup
 
 
 async def login(driver, agent) -> None:
@@ -27,25 +27,25 @@ async def _input(driver, input):
     for it in input:
         actions.send_keys(it)
     actions.perform()
-    time.sleep(1)
+    await sleep(1)
 
 
 async def send_cred(driver, cred, payment, amount):
     driver.get("https://finance.ozon.ru/lk/payments/c2c-transfers?step=SELECT_CONTACT_AND_BANK")
-    time.sleep(3)
+    await sleep(3)
     await _input(driver, cred)
     driver.find_element(By.CLASS_NAME, "contact-item.svelte-1lvu9g8").click()
     # driver.find_element(By.CLASS_NAME, "contact-yourself.svelte-1phpki3").click()
-    time.sleep(1)
+    await sleep(1)
     driver.find_element(By.CLASS_NAME, "item.other-bank.svelte-97i23a.dark").click()
-    time.sleep(1)
+    await sleep(1)
     await _input(driver, payment)
     driver.find_element(By.CLASS_NAME, "item.svelte-97i23a").click()
-    time.sleep(1)
+    await sleep(1)
     driver.find_element(By.CLASS_NAME, "input.svelte-1k6phew").click()
     await _input(driver, amount)
     driver.find_element(By.CLASS_NAME, "submit.svelte-1gsi7c").click()
-    time.sleep(5)
+    await sleep(5)
     driver.find_element(By.CLASS_NAME, "submit.svelte-1gsi7c").click()
 
 
@@ -71,20 +71,28 @@ async def main():
 
     try:
         if not agent.state:
-            driver.get("https://www.ozon.ru/ozonid-lite")
+            driver.get("https://finance.ozon.ru")
+            await sleep(1)
+            driver.find_element(By.CLASS_NAME, "content.svelte-404phy").click()
+            await sleep(1)
+            soup = BeautifulSoup(driver.page_source, "html.parser")
+            url = soup.find(title="ozon id")["src"]
+            driver.get(url)
             driver.find_element(By.NAME, "autocomplete").send_keys(agent.auth.get("phone"))
-            driver.find_element(By.CLASS_NAME, "b201-a").click()
+            driver.find_element(By.CLASS_NAME, "b210-a").click()
+            await sleep(2)
             sms_code = input("Введите 6-ти значный код: ")
-            driver.find_element(By.CLASS_NAME, "d01-a.d01-a5").send_keys(sms_code)
+            driver.find_element(By.CLASS_NAME, "d10-a.d10-a5").send_keys(sms_code)
+            await sleep(5)
+            agent.state = driver.get_cookies()
+            await agent.save()
         await login(driver, agent)
         await sleep(2)
         # await send_cred(driver, "+7твой номер", "Сбербанк", "1")
-        await check_last_transaction(driver, "10", "нейм")
+        await check_last_transaction(driver, input("amount:"), input("name:"))
         await sleep(5)
 
     finally:
-        agent.state = driver.get_cookies()
-        await agent.save()
         driver.quit()
 
 

{xync_client-0.0.57.dev2 → xync_client-0.0.57.dev7/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.57.dev2
+Version: 0.0.57.dev7
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client