From f59470def3b0ec256db655a4d1046c3180b0f948 Mon Sep 17 00:00:00 2001
From: ada-dmitry <ada.dmitry@gmail.com>
Date: Sat, 22 Apr 2023 23:51:27 +0300
Subject: [PATCH] added function

---
 Python/TeleBot/FuncForBot.py                  |  14 ++++++
 .../__pycache__/FuncForBot.cpython-311.pyc    | Bin 0 -> 1400 bytes
 .../__pycache__/parser.cpython-311.pyc        | Bin 1315 -> 1315 bytes
 Python/TeleBot/parser.py                      |   2 -
 Python/TeleBot/tableCreator.py                |  11 ++---
 Python/TeleBot/test.py                        |  19 +++++---
 Python/TeleBot/tgBot.py                       |  45 ++++++++++--------
 7 files changed, 55 insertions(+), 36 deletions(-)
 create mode 100644 Python/TeleBot/FuncForBot.py
 create mode 100644 Python/TeleBot/__pycache__/FuncForBot.cpython-311.pyc

diff --git a/Python/TeleBot/FuncForBot.py b/Python/TeleBot/FuncForBot.py
new file mode 100644
index 0000000..12ad380
--- /dev/null
+++ b/Python/TeleBot/FuncForBot.py
@@ -0,0 +1,14 @@
+def sel(cursor, tabl):
+    query = f"""SELECT * FROM public.{tabl}"""
+    cursor.execute(query)
+    array = list(cursor.fetchall())
+    return array
+
+
+def upd(conn, cursor, tabl):
+    import parser
+    for i in range(15):
+        up_query = f"""UPDATE {tabl} SET page_name = '{parser.name[i].text}', price = '{parser.price[i].text}', priceDis = '{parser.priceDis[i].text}', mark = '{parser.mark[i].text}' WHERE id = {i+1}"""
+        cursor.execute(up_query)
+        conn.commit()
+
diff --git a/Python/TeleBot/__pycache__/FuncForBot.cpython-311.pyc b/Python/TeleBot/__pycache__/FuncForBot.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..749672e8518903fc76c3c6fbeda5c9f755c4359f
GIT binary patch
literal 1400
zcmah|&1(}u6rcS{w#_D*qC!FJ&>l)e3ko8N3ThII+O)J0t3=CYXPc&Ovg_=wG;t$E
z1zRatyeJf*r;2#-;2+?hkU|b+p(js08L1~vzS%T2tw`VQzOVVso1Ndh`529MBarNH
zlKkKh`p$y3Kpe<+514m|pqJ=AA{=Or@DnH@X#5U>84*4KzHJW_pgE6QK_B=U@1a%5
z{3{;61}l7SuYx$_u=zUzvpTD{(`XI6&wrym6>5Sfz<=?X>d}eR?bP)wK8e%gqa)aI
z^F~n{N(g>fpVKwh(S6Y<+Kw+z>y9>~8b(6&Lz+u%llr2g<_%wZ?CP}QODd&m#b%qs
zAipn=i@9O5q~}I-Yo?e}iJBX$j8U^N)pDH~vz*K7hJMX-a%s1$rA-R%kX7*oTQ_I~
z3b7sAmqE>=4P|JR)RiH4=TjSE_p8kF%<{Q)v9}@i*2UgU<?!;ccYSaB*5mz+c>lUG
z&`<^d7&$zDdm9QMt%ETXgG6uwXJG|)0t6YTCUmk&_Hmv>51!XVB6$1?BBCeE?sD#l
zy=;L%W_MQslmsY7M<D-2g#aZThzbKLbRbIhMAB6S81$1;lRR!U+@8~EJ!yYGK@Z8D
zh_=7Chd8wKf*|Od?#vcLY#jns4c{3{Ud^U(wFgh6ve;4!`czph>G(1ptSW=2utken
zD>~GUl0`chjzFTM(nmoM9mIEsQ{yRIBoJ@0!%uYiAxovUPJM~0<pOjgD-E5e&pEyn
zRQBb-KuKR@wJ19S=uxv&DmsafFKTAFOc{BUu|eZ(m@E3SYfS~MYqK%dvlvr$$9=)I
z2t5uS<HYWPAA$Z8<MSiz*^KrqpIyASbgzj7=~$o^xF(N|+!Ee9O~h<Ve|hrt>9;dq
zpEb_k>`d1uA2udQU7v1D78;XA=MebMxFr9JnGqhM3_se6##-hMOYSZJex9FUBYD2W
zM#{X|imaA#_rsGyiv3(#xFP&RC<&&s-h#X#$KJ$V$Cl^TW!#W)UB(--@+R^+vKU>8
zF2K_axA#mH;3kvcgL@i~^$7*JfWqJMrIJZpL%%{#04})4r@?6o90z2HT)c^PRZQZ5
J$A48&?hlo*D9r!>

literal 0
HcmV?d00001

diff --git a/Python/TeleBot/__pycache__/parser.cpython-311.pyc b/Python/TeleBot/__pycache__/parser.cpython-311.pyc
index 0e879ce4e060b5fb068851efda18f222c615d12b..e83e42fbae601569791fec52ebf3f3e2ea218047 100644
GIT binary patch
delta 22
ccmZ3?wU~={IWI340}zDSyQJLR$ScMQ06QZECIA2c

delta 22
ccmZ3?wU~={IWI340}$M~<&g4lBd-`M07R(<M*si-

diff --git a/Python/TeleBot/parser.py b/Python/TeleBot/parser.py
index b2bb715..5da6f9e 100644
--- a/Python/TeleBot/parser.py
+++ b/Python/TeleBot/parser.py
@@ -14,5 +14,3 @@ price = b_soup.find_all('span', class_="middle_price")
 priceDis = b_soup.find_all('span', class_="baseoldprice")
 mark = b_soup.find_all('span', class_="product-rating__rating")
 pictures = b_soup.find_all('div', class_="catalog-list-item__img-wrapper")
-
-
diff --git a/Python/TeleBot/tableCreator.py b/Python/TeleBot/tableCreator.py
index baf8903..b4f67df 100644
--- a/Python/TeleBot/tableCreator.py
+++ b/Python/TeleBot/tableCreator.py
@@ -4,12 +4,12 @@ import parser
 import config
 
 
-connection = psycopg2.connect(host=config.hostname, dbname=config.databname, user=config.username, password=config.passw)
+connection = psycopg2.connect(
+    host=config.hostname, dbname=config.databname, user=config.username, password=config.passw)
 cursor = connection.cursor()
 creat_qwery = """ create table Parser 
     (id serial primary key, page_name varchar(100), price varchar(10), priceDis varchar(30), mark varchar(10), scr varchar(100))"""
-# cursor.execute(creat_qwery)
-# connection.commit()
+
 try:
     cursor.execute(creat_qwery)
     connection.commit()
@@ -19,7 +19,8 @@ except psycopg2.errors.DuplicateTable:
 
 for i in range(15):
     print(i)
-    url = 'https://amwine.ru' + parser.pictures[i].find('a').find('img').attrs['data-src']
+    url = 'https://amwine.ru' + \
+        parser.pictures[i].find('a').find('img').attrs['data-src']
     filename = f"Python\\TeleBot\img\{i}.jpg"
     wget.download(url, filename)
     try:
@@ -29,6 +30,4 @@ for i in range(15):
     except:
         connection.rollback()
 
-cursor.close()
 
-connection.close()
\ No newline at end of file
diff --git a/Python/TeleBot/test.py b/Python/TeleBot/test.py
index 8d41f23..11d67b6 100644
--- a/Python/TeleBot/test.py
+++ b/Python/TeleBot/test.py
@@ -1,9 +1,14 @@
-def f():
-    a = [1,2,3]
-    b = [3,4,5]
-    c = ["1", "2", "3"]
-    return a,b,c
+import psycopg2
+import wget
+import config
 
-a,b,c = f()
 
-print(a, b, c)
\ No newline at end of file
+connection = psycopg2.connect(host=config.hostname, dbname=config.databname, user=config.username, password=config.passw)
+cursor = connection.cursor()
+
+def sel(a):
+    s_query = f"""SELECT * FROM public.parser WHERE id = {a}"""
+    print(cursor.execute(s_query))
+    return cursor.fetchone()
+
+print(sel(10))
\ No newline at end of file
diff --git a/Python/TeleBot/tgBot.py b/Python/TeleBot/tgBot.py
index 868766b..f36db68 100644
--- a/Python/TeleBot/tgBot.py
+++ b/Python/TeleBot/tgBot.py
@@ -3,42 +3,45 @@ import psycopg2
 import config
 from telebot import types
 import random
+import FuncForBot
 
-connection = psycopg2.connect(host=config.hostname, dbname=config.databname, user=config.username, password=config.passw)
+connection = psycopg2.connect(
+    host=config.hostname, dbname=config.databname, user=config.username, password=config.passw)
 cursor = connection.cursor()
 try:
-    sel_query = """SELECT * FROM public.parser"""
-    cursor.execute(sel_query)
+    array = FuncForBot.sel(cursor, 'parser')
 except psycopg2.errors.UndefinedTable:
     connection.rollback()
     import tableCreator
-    sel_query = """SELECT * FROM public.parser"""
-    cursor.execute(sel_query)
-     
-array = list(cursor.fetchall())
+    array = FuncForBot.sel(cursor, 'parser')
+finally:
+    FuncForBot.upd(connection, cursor, 'parser')
+    cursor.close()
+    connection.close()
 
 bot = telebot.TeleBot(config.api)
-@bot.message_handler(commands=["start"])
 
+
+@bot.message_handler(commands=["start"])
 def start(m, res=False):
-        markup=types.ReplyKeyboardMarkup(resize_keyboard=True)
-        item1=types.KeyboardButton("Рандомное вино!")
-        item2=types.KeyboardButton("Повтори!")
-        markup.add(item1)
-        markup.add(item2)
-        bot.send_message(m.chat.id, '"Рандомное вино!" - для получения карточки товара\n "Повтори!" - для повторения сообщений.',  reply_markup=markup)
+    markup = types.ReplyKeyboardMarkup(resize_keyboard=True)
+    item1 = types.KeyboardButton("Рандомное вино!")
+    item2 = types.KeyboardButton("Повтори!")
+    markup.add(item1)
+    markup.add(item2)
+    bot.send_message(
+        m.chat.id, '"Рандомное вино!" - для получения карточки товара\n "Повтори!" - для повторения сообщений.',  reply_markup=markup)
+
 
 @bot.message_handler(content_types=["text"])
 def handle_text(message):
-    if(message.text.strip() == 'Рандомное вино!'):
+    if (message.text.strip() == 'Рандомное вино!'):
         i = random.choice(array)
         ans = f'Название: {i[1]}\nЦена: {i[2]}\nЦена без скидки: {i[3]}\nОценка: {i[4]}\n'
         bot.send_message(message.chat.id, ans)
         bot.send_photo(message.chat.id, open(i[5], 'rb'))
-    elif(message.text.strip() == 'Повтори!'):
-          bot.send_message(message.chat.id, 'Ввод: '+ message.text)
-    
-    
+    elif (message.text.strip() == 'Повтори!'):
+        bot.send_message(message.chat.id, 'Ввод: ' + message.text)
+
+
 bot.polling(none_stop=True, interval=0)
-
-