matplobbot-shared 0.1.30__py3-none-any.whl → 0.1.31__py3-none-any.whl

{matplobbot_shared-0.1.30.dist-info → matplobbot_shared-0.1.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matplobbot-shared
-Version: 0.1.30
+Version: 0.1.31
 Summary: Shared library for the Matplobbot ecosystem (database, services, i18n).
 Author: Ackrome
 Author-email: ivansergeyevich@gmail.com

{matplobbot_shared-0.1.30.dist-info → matplobbot_shared-0.1.31.dist-info}/RECORD

@@ -2,9 +2,9 @@ shared_lib/__init__.py,sha256=Wxuw1wbvCOsKqs6WfIQ05cx_vndhPs6rH2krMatFRqA,45
 shared_lib/database.py,sha256=vGiCxk1m_xZxaJQtjQPC_7G2Wxnu-ptWx5Z7q_XDIGs,20706
 shared_lib/i18n.py,sha256=VBWQWVF-k_HDiidYo_RUPyUCM7oL897z5hOw9jvOoYY,1762
 shared_lib/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shared_lib/services/schedule_service.py,sha256=l4kffo866Pzj-rVNqAL-vMVYhB-Arfgl_bzwnNIVA9M,2441
+shared_lib/services/schedule_service.py,sha256=UIyfNqXLJPsstGR8tGhbZ_hnK64QNxbaB-fUc7itX34,4355
 shared_lib/services/university_api.py,sha256=Ui-zjfKOHCCf2Imh8CNtVOWegwuep7IB8gO9IKNUrrE,1898
-matplobbot_shared-0.1.30.dist-info/METADATA,sha256=i0itMsVkSh3YoPt8uMPoifKOXd5DgXBTc9alPnT6ez0,395
-matplobbot_shared-0.1.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matplobbot_shared-0.1.30.dist-info/top_level.txt,sha256=L8mrC50YWCe19jmh_zrUZFvXSkhsnES5K6y027G1838,11
-matplobbot_shared-0.1.30.dist-info/RECORD,,
+matplobbot_shared-0.1.31.dist-info/METADATA,sha256=4b8ZQlFh79zZWjllQEuBRj2Vil3v0pPr4CUr6nMLg7o,395
+matplobbot_shared-0.1.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matplobbot_shared-0.1.31.dist-info/top_level.txt,sha256=L8mrC50YWCe19jmh_zrUZFvXSkhsnES5K6y027G1838,11
+matplobbot_shared-0.1.31.dist-info/RECORD,,

shared_lib/services/schedule_service.py

@@ -1,10 +1,14 @@
 # bot/services/schedule_service.py
 
 from typing import List, Dict, Any
-from datetime import datetime, date
+from datetime import datetime, date, time
 from collections import defaultdict
+from ics import Calendar, Event
+from zoneinfo import ZoneInfo
 
-names_shorter = defaultdict(lambda: 'Неизвестно')
+from shared_lib.i18n import translator
+
+names_shorter = defaultdict(lambda: 'Unknown')
 to_add = {
     'Практические (семинарские) занятия': 'Семинар',
     'Лекции': 'Лекция',
@@ -15,38 +19,79 @@ names_shorter.update(to_add)
 
     
 
-def format_schedule(schedule_data: List[Dict[str, Any]], lang: str, entity_name: str, start_date: date) -> str:
+def format_schedule(schedule_data: List[Dict[str, Any]], lang: str, entity_name: str, entity_type: str, start_date: date, is_week_view: bool = False) -> str:
     """Formats a list of lessons into a readable daily schedule."""
     if not schedule_data:
-        return f"🗓 *Расписание для \"{entity_name}\"*\n\nНа запрошенный день занятий нет."
+        # Different message for single day vs week
+        no_lessons_key = "schedule_no_lessons_week" if is_week_view else "schedule_no_lessons_day"
+        return f"🗓 *Расписание для \"{entity_name}\"*\n\n{translator.gettext(lang, no_lessons_key)}"
 
     # Group lessons by date
-    days = {}
+    days = defaultdict(list)
     for lesson in schedule_data:
-        date_str = lesson['date']
-        if date_str not in days:
-            days[date_str] = []
-        days[date_str].append(lesson)
+        days[lesson['date']].append(lesson)
 
-    # Find the first day with lessons that is on or after the start_date
+    formatted_days = []
+    # Iterate through sorted dates to build the full schedule string
     for date_str, lessons in sorted(days.items()):
         date_obj = datetime.strptime(date_str, "%Y-%m-%d").date()
-        if date_obj >= start_date:
-            # Found the first relevant day, format it and return immediately.
-            day_header = f"🗓 *Расписание на {date_obj.strftime('%d.%m.%Y')} для \"{entity_name}\"*"
-            
-            formatted_lessons = []
-            for lesson in sorted(lessons, key=lambda x: x['beginLesson']):
-                formatted_lessons.append(
-                    f"`{lesson['beginLesson']} - {lesson['endLesson']} | {lesson['auditorium']}`\n"
-                    f"{lesson['discipline']} | {names_shorter[lesson['kindOfWork']]}\n"
-                    # f"{lesson['kindOfWork']}\n"
-                    # f"{lesson['auditorium']} ({lesson['building']})\n"
-                    f"{lesson['lecturer_title'].replace('_',' ')}\n"
-                    f"{lesson['lecturerEmail']}\n"
-                )
+        
+        day_header = f"*{date_obj.strftime('%A, %d.%m.%Y')}*"
+        
+        formatted_lessons = []
+        for lesson in sorted(lessons, key=lambda x: x['beginLesson']):
+            lesson_details = [
+                f"`{lesson['beginLesson']} - {lesson['endLesson']}`",
+                f"{lesson['discipline']} | {names_shorter[lesson['kindOfWork']]}"
+            ]
+
+            if entity_type == 'group':
+                lesson_details.append(f"*{lesson['auditorium']}* | {lesson['lecturer_title'].replace('_',' ')}")
+            elif entity_type == 'person': # Lecturer
+                lesson_details.append(f"*{lesson['auditorium']}* | {lesson.get('group', 'Группа не указана')}")
+            elif entity_type == 'auditorium':
+                lesson_details.append(f"{lesson.get('group', 'Группа не указана')} | {lesson['lecturer_title'].replace('_',' ')}")
+            else: # Fallback to a generic format
+                lesson_details.append(f"*{lesson['auditorium']}* | {lesson['lecturer_title'].replace('_',' ')}")
+
+            formatted_lessons.append("\n".join(lesson_details))
+        
+        formatted_days.append(f"{day_header}\n" + "\n\n".join(formatted_lessons))
+
+    main_header = f"🗓 *Расписание для \"{entity_name}\"*"
+    return f"{main_header}\n\n" + "\n\n---\n\n".join(formatted_days)
+
+def generate_ical_from_schedule(schedule_data: List[Dict[str, Any]], entity_name: str) -> str:
+    """
+    Generates an iCalendar (.ics) file string from schedule data.
+    """
+    cal = Calendar()
+    moscow_tz = ZoneInfo("Europe/Moscow")
+
+    if not schedule_data:
+        return cal.serialize()
+
+    for lesson in schedule_data:
+        try:
+            event = Event()
+            event.name = f"{lesson['discipline']} ({names_shorter[lesson['kindOfWork']]})"
             
-            return f"{day_header}\n" + "\n\n".join(formatted_lessons)
+            lesson_date = datetime.strptime(lesson['date'], "%Y-%m-%d").date()
+            start_time = time.fromisoformat(lesson['beginLesson'])
+            end_time = time.fromisoformat(lesson['endLesson'])
+
+            event.begin = datetime.combine(lesson_date, start_time, tzinfo=moscow_tz)
+            event.end = datetime.combine(lesson_date, end_time, tzinfo=moscow_tz)
 
-    # If no lessons were found in the entire fetched range
-    return f"🗓 *Расписание для \"{entity_name}\"*\n\nВ ближайшую неделю занятий не найдено."
+            event.location = f"{lesson['auditorium']}, {lesson['building']}"
+            
+            description_parts = [f"Преподаватель: {lesson['lecturer_title'].replace('_',' ')}"]
+            if 'group' in lesson: description_parts.append(f"Группа: {lesson['group']}")
+            event.description = "\n".join(description_parts)
+            
+            cal.events.add(event)
+        except (ValueError, KeyError) as e:
+            logging.warning(f"Skipping lesson due to parsing error: {e}. Lesson data: {lesson}")
+            continue
+            
+    return cal.serialize()