From bffe213041308604a45536c428509c2d24883dc7 Mon Sep 17 00:00:00 2001
From: lulzette <ivan@lulzette.ru>
Date: Sat, 13 May 2023 15:43:57 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B0=D1=80=D1=81=D0=B8=D0=BD=D0=B3=20?=
 =?UTF-8?q?=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/main.py b/main.py
index c44d8aa..0f0018c 100644
--- a/main.py
+++ b/main.py
@@ -1643,6 +1643,7 @@ if __name__ == '__main__':
     cur_day = ""
     cur_lesson = ""
     day_iterator = 0
+    groups = list()
     for cur_sibl in rasp_html_inside.find_next_siblings():
         tag_type = cur_sibl.name
         # print(tag_type, cur_sibl.text)
@@ -1667,31 +1668,38 @@ if __name__ == '__main__':
             case 'div':
                 # Что за пара, препод, место, аудитория
 
-                up_or_down = ""
-                get_b = cur_sibl.find('b')
-                # Верхняя/Нижняя пара
-                if get_b is None:
-                        # Пара бывает всегда
-                        pass
-                else:
-                    if get_b.get('class') == 'up':
-                        up_or_down = 'up'
-                    else:
-                        up_or_down = 'down'
-
-                # Что за пара
+                # Верхняя или нижняя?
+                up_or_down = 'none'
+                if cur_sibl.find('b', {'class':'up'}):
+                    up_or_down = 'up'
+                if cur_sibl.find('b', {'class':'dn'}):
+                    up_or_down = 'down'
 
                 # Тип пары (лекция)
+                lesson_type = cur_sibl.find('b', {'class': ''})
 
-
+                # Что за пара
+                lesson_name = lesson_type.next_sibling
 
                 # Препод
+                preps = list()
+                preps_block = cur_sibl.find('span', {'class': 'preps'})
+                for prep in preps_block.findAll('a'):
+                    preps.append(prep.text)
+
+
+                # Группы
+                groups = list()
+                group_block = cur_sibl.find('span', {'class': 'groups'})
+                for group in group_block.findAll('a'):
+                    groups.append(group.text)
+
 
                 # место, аудитория
-
+                place = cur_sibl.find('em')
 
                 # Итого, пишем в rasp_summary
-                print('sdfsdf ', day_iterator, cur_day, cur_lesson, up_or_down, cur_sibl.text)
+                print('sdfsdf ', day_iterator, cur_day, cur_lesson, up_or_down, lesson_type.text, place.text, groups, preps)
                 # rasp_summary[cur_day][cur_lesson] = cur_sibl
                 # print(cur_sibl.text)
             case _: