matplobbot-shared 0.1.38__py3-none-any.whl → 0.1.41__py3-none-any.whl

{matplobbot_shared-0.1.38.dist-info → matplobbot_shared-0.1.41.dist-info}/METADATA

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

{matplobbot_shared-0.1.38.dist-info → matplobbot_shared-0.1.41.dist-info}/RECORD

@@ -3,9 +3,9 @@ shared_lib/database.py,sha256=lEIqM8e68RH8BCGVKk8dbZ-8JYIVB7c6l8AfhNPbYfg,21877
 shared_lib/i18n.py,sha256=VBWQWVF-k_HDiidYo_RUPyUCM7oL897z5hOw9jvOoYY,1762
 shared_lib/redis_client.py,sha256=j7AKwrSWhtEHeV25Sy0JiWLIx2EI3hFEx7suoOwxRU8,2234
 shared_lib/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shared_lib/services/schedule_service.py,sha256=jDbanvTdHgtKI2vR7HXLQ73Rk8gu3bPHdazHhfRSpho,4545
+shared_lib/services/schedule_service.py,sha256=WYBHnBsxdE5zR6ajhatKnqYM9icUYA9_s6PpjCZtBpU,7173
 shared_lib/services/university_api.py,sha256=Ui-zjfKOHCCf2Imh8CNtVOWegwuep7IB8gO9IKNUrrE,1898
-matplobbot_shared-0.1.38.dist-info/METADATA,sha256=9jAVxzDnfo5k_j3Sc-bTgslKyVEOKxkoTo0Cpk7xvU0,416
-matplobbot_shared-0.1.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matplobbot_shared-0.1.38.dist-info/top_level.txt,sha256=L8mrC50YWCe19jmh_zrUZFvXSkhsnES5K6y027G1838,11
-matplobbot_shared-0.1.38.dist-info/RECORD,,
+matplobbot_shared-0.1.41.dist-info/METADATA,sha256=20GzrBiTw-okL15hogJl7JPXXTGTB1L12Ze_hA1WXn0,416
+matplobbot_shared-0.1.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matplobbot_shared-0.1.41.dist-info/top_level.txt,sha256=L8mrC50YWCe19jmh_zrUZFvXSkhsnES5K6y027G1838,11
+matplobbot_shared-0.1.41.dist-info/RECORD,,

shared_lib/services/schedule_service.py

@@ -1,7 +1,7 @@
 # bot/services/schedule_service.py
 
 from typing import List, Dict, Any
-from datetime import datetime, date, time
+from datetime import datetime, date
 from collections import defaultdict
 from ics import Calendar, Event
 from zoneinfo import ZoneInfo
@@ -18,6 +18,53 @@ to_add = {
     }
 names_shorter.update(to_add)
 
+def _format_lesson_for_diff(lesson: Dict[str, Any], lang: str) -> str:
+    """Formats a single lesson for display in a diff message."""
+    date_obj = datetime.strptime(lesson['date'], "%Y-%m-%d").date()
+    day_header = f"<b>{date_obj.strftime('%A, %d.%m.%Y')}</b>"
+    details = [
+        hcode(f"{lesson['beginLesson']} - {lesson['endLesson']} | {lesson['auditorium']}"),
+        f"{lesson['discipline']} ({names_shorter[lesson['kindOfWork']]})",
+        f"<i>{translator.gettext(lang, 'lecturer_prefix')}: {lesson.get('lecturer_title', 'N/A').replace('_', ' ')}</i>"
+    ]
+    return f"{day_header}\n" + "\n".join(details)
+
+def diff_schedules(old_data: List[Dict[str, Any]], new_data: List[Dict[str, Any]], lang: str) -> str | None:
+    """Compares two schedule datasets and returns a human-readable diff."""
+    old_lessons = {lesson['lessonOid']: lesson for lesson in old_data}
+    new_lessons = {lesson['lessonOid']: lesson for lesson in new_data}
+
+    added = [lesson for oid, lesson in new_lessons.items() if oid not in old_lessons]
+    removed = [lesson for oid, lesson in old_lessons.items() if oid not in new_lessons]
+    modified = []
+
+    # Fields to check for modifications
+    fields_to_check = ['beginLesson', 'endLesson', 'auditorium', 'lecturer_title']
+
+    for oid, old_lesson in old_lessons.items():
+        if oid in new_lessons:
+            new_lesson = new_lessons[oid]
+            changes = {}
+            for field in fields_to_check:
+                if old_lesson.get(field) != new_lesson.get(field):
+                    changes[field] = (old_lesson.get(field), new_lesson.get(field))
+            if changes:
+                modified.append({'new': new_lesson, 'changes': changes})
+
+    if not added and not removed and not modified:
+        return None
+
+    diff_parts = []
+    if added: diff_parts.append(f"<b>{translator.gettext(lang, 'schedule_change_added')}:</b>\n" + "\n\n".join([_format_lesson_for_diff(l, lang) for l in added]))
+    if removed: diff_parts.append(f"<b>{translator.gettext(lang, 'schedule_change_removed')}:</b>\n" + "\n\n".join([_format_lesson_for_diff(l, lang) for l in removed]))
+    if modified:
+        modified_texts = []
+        for mod in modified:
+            change_descs = [f"<i>{translator.gettext(lang, f'field_{f}')}: {hcode(v[0])} → {hcode(v[1])}</i>" for f, v in mod['changes'].items()]
+            modified_texts.append(f"{_format_lesson_for_diff(mod['new'], lang)}\n" + "\n".join(change_descs))
+        diff_parts.append(f"<b>{translator.gettext(lang, 'schedule_change_modified')}:</b>\n" + "\n\n".join(modified_texts))
+
+    return "\n\n---\n\n".join(diff_parts)
     
 
 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: