rhul-attendance-bot 0.1.48__py3-none-any.whl → 0.1.49__py3-none-any.whl

RHUL_attendance_bot.py

@@ -19,6 +19,9 @@ from app_paths import (
     get_ics_dir,
     get_chrome_user_data_dir,
     prompt_select_profile,
+    delete_app_data,
+    profile_exists,
+    list_profiles,
 )
 
 # Create a logger
@@ -85,9 +88,25 @@ def main():
     import argparse
 
     parser = argparse.ArgumentParser(description="RHUL attendance bot")
-    parser.add_argument("-user", "--user", dest="profile", default=None, help="Profile name")
+    parser.add_argument("-user", "--user", dest="profile", default=None, help="Start with profile name")
+    parser.add_argument("-clean", action="store_true", help="Delete all local app data")
     args = parser.parse_args()
-    profile_name = args.profile if args.profile else prompt_select_profile()
+    if args.clean:
+        deleted = delete_app_data()
+        if deleted:
+            print("Local app data removed: ~/.rhul_attendance_bot")
+        else:
+            print("No local app data found to remove.")
+        return
+    profiles_before = list_profiles()
+
+    if args.profile:
+        if not profile_exists(args.profile):
+            print("Profile not exist.")
+            return
+        profile_name = args.profile
+    else:
+        profile_name = prompt_select_profile()
 
     script_dir = os.path.dirname(os.path.abspath(__file__))
     os.chdir(script_dir)
@@ -123,10 +142,22 @@ def main():
     if first_run:
         print('First run detected: running onboarding steps...')
         # Run auto_login.py for first-time login
-        subprocess.run([sys.executable, os.path.join(script_dir, 'auto_login.py'), '--user', profile_name])
+        if profiles_before:
+            subprocess.run([sys.executable, os.path.join(script_dir, 'auto_login.py'), '--user', profile_name])
+        else:
+            subprocess.run([sys.executable, os.path.join(script_dir, 'auto_login.py')])
+            profiles_after = list_profiles()
+            if len(profiles_after) == 1:
+                profile_name = profiles_after[0]
         # Run fetch_ics.py to get timetable
         subprocess.run([sys.executable, os.path.join(script_dir, 'fetch_ics.py'), '--user', profile_name])
 
+        # Recompute profile paths if profile_name changed during onboarding
+        profile_dir = get_profile_dir(profile_name)
+        credentials_path = get_credentials_path(profile_name)
+        ics_folder = get_ics_dir(profile_name)
+        ics_file = os.path.join(ics_folder, 'student_timetable.ics')
+
     # Now proceed to import the rest of the modules
     import threading
     import time
@@ -148,6 +179,7 @@ def main():
     import ntplib  # Used to check system time synchronization
     from auto_login import attempt_login
     from update import check_for_updates
+    from fetch_ics import fetch_ics_url, refresh_calendar, renew_calendar
     from discord_broadcast import DiscordBroadcaster
     from display_manager import DisplayManager
     # Reuse helpers but add custom MFA fallback below
@@ -377,6 +409,7 @@ def main():
             if exit_event.wait(timeout=min(sleep_duration, 60)):
                 break
 
+
     def listen_for_keypress(upcoming_events, exit_event):
         ctrl_pressed = [False]  # Use a mutable object to share state
 
@@ -396,6 +429,21 @@ def main():
                                 threading.Thread(target=automated_function, args=(next_event_time, next_event_name, upcoming_events), daemon=True).start()
                             else:
                                 logger.warning("No upcoming events to process.")
+                elif key.char == 'c':
+                    if ctrl_pressed[0]:
+                        logger.info("Refreshing calendar (fetching ICS)...", extra={"gray": True})
+                        threading.Thread(
+                            target=renew_calendar,
+                            args=(
+                                upcoming_events,
+                                events_lock,
+                                profile_name,
+                                load_calendar,
+                                get_upcoming_events,
+                                logger,
+                            ),
+                            daemon=True,
+                        ).start()
                 elif key.char == 'q':
                     if ctrl_pressed[0]:
                         logger.info("Exit shortcut pressed. Terminating the script.")

app_paths.py

@@ -26,6 +26,32 @@ def get_profile_dir(profile_name=None):
     return profile_dir
 
 
+def profile_exists(profile_name):
+    base = os.path.join(get_app_dir(), PROFILES_DIR_NAME)
+    name = _normalize_profile(profile_name)
+    return os.path.isdir(os.path.join(base, name))
+
+
+def rename_profile(old_name, new_name):
+    old_norm = _normalize_profile(old_name)
+    new_norm = _normalize_profile(new_name)
+    if old_norm == new_norm:
+        return True
+    base = os.path.join(get_app_dir(), PROFILES_DIR_NAME)
+    old_path = os.path.join(base, old_norm)
+    new_path = os.path.join(base, new_norm)
+    if not os.path.isdir(old_path):
+        return False
+    if os.path.exists(new_path):
+        return False
+    os.makedirs(base, exist_ok=True)
+    try:
+        os.rename(old_path, new_path)
+        return True
+    except Exception:
+        return False
+
+
 def list_profiles():
     base = os.path.join(get_app_dir(), PROFILES_DIR_NAME)
     if not os.path.isdir(base):
@@ -72,3 +98,25 @@ def get_chrome_user_data_dir(profile_name=None):
     user_dir = os.path.join(get_profile_dir(profile_name), "chrome_user_data")
     os.makedirs(user_dir, exist_ok=True)
     return user_dir
+
+
+def delete_app_data():
+    app_dir = get_app_dir()
+    if not os.path.isdir(app_dir):
+        return False
+    for root, dirs, files in os.walk(app_dir, topdown=False):
+        for name in files:
+            try:
+                os.remove(os.path.join(root, name))
+            except Exception:
+                pass
+        for name in dirs:
+            try:
+                os.rmdir(os.path.join(root, name))
+            except Exception:
+                pass
+    try:
+        os.rmdir(app_dir)
+    except Exception:
+        pass
+    return True

auto_login.py

@@ -12,7 +12,13 @@ from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.chrome.options import Options
 from webdriver_manager.chrome import ChromeDriverManager
 from local_2fa import bind, get_otp
-from app_paths import get_2fa_config_path, get_credentials_path, prompt_select_profile
+from app_paths import (
+    get_2fa_config_path,
+    get_credentials_path,
+    prompt_select_profile,
+    profile_exists,
+    rename_profile,
+)
 SECURITY_INFO_URL = 'https://mysignins.microsoft.com/security-info'
 LOGIN_URL = 'https://mysignins.microsoft.com/security-info'
 
@@ -157,6 +163,11 @@ def first_time_setup(profile_name=None):
         payload['discord_webhook_url'] = discord_webhook_url
         payload['enable_discord_webhook'] = bool(discord_webhook_url) if enable_discord_webhook is None else bool(enable_discord_webhook)
 
+    # Align profile folder name to profile nickname if needed
+    if profile_name and profile_nickname and profile_name != profile_nickname:
+        rename_profile(profile_name, profile_nickname)
+        profile_name = profile_nickname
+
     credentials_path = get_credentials_path(profile_name)
     with open(credentials_path, 'w') as f:
         json.dump(payload, f)
@@ -654,7 +665,7 @@ def renew_login(driver, expected_url=None, logger=None, profile_name=None):
         current_url = driver.current_url
         page_src = driver.page_source
         if ('login.microsoftonline.com' in current_url) or ('mysignins.microsoft.com' in current_url) or ('loginfmt' in page_src):
-            _log(logger, logging.INFO, "Detected Microsoft login page; attempting auto login...")
+            _log(logger, logging.INFO, "Detected Microsoft login page; attempting auto login...", gray=True)
             fill_ms_login(driver, username, password)
             handle_mfa_code(driver)
             handle_kmsi(driver)
@@ -665,7 +676,7 @@ def renew_login(driver, expected_url=None, logger=None, profile_name=None):
         if expected_url:
             try:
                 WebDriverWait(driver, 60).until(EC.url_contains(expected_url))
-                _log(logger, logging.INFO, "Login detected via URL match.")
+                _log(logger, logging.INFO, "Login detected via URL match.", gray=True)
                 return True
             except Exception:
                 _log(logger, logging.ERROR if logger else logging.INFO, "Login not detected within timeout.")
@@ -686,7 +697,7 @@ def verify_login(driver, expected_url, max_wait_minutes=30, logger=None):
     current_url = driver.current_url
 
     if current_url == expected_url:
-        _log(logger, logging.INFO, "Already logged in.")
+        _log(logger, logging.INFO, "Already logged in.", gray=True)
         return True
     else:
         _log(logger, logging.INFO, "Need to login.")
@@ -713,7 +724,7 @@ def attempt_login(driver, expected_url, broadcaster=None, logger=None, profile_n
             _log(logger, logging.INFO, "Existing session is valid; skipping renew_login.", gray=True)
             return True
         except Exception:
-            _log(logger, logging.INFO, "Session check did not confirm login; attempting renew_login.")
+            _log(logger, logging.INFO, "Session check did not confirm login; attempting renew_login.", gray=True)
 
         result = renew_login(driver, expected_url, logger=logger, profile_name=profile_name)
         if result:
@@ -733,7 +744,14 @@ if __name__ == '__main__':
     import argparse
 
     parser = argparse.ArgumentParser(description="RHUL auto login setup")
+    parser.add_argument("-help", action="help", help="Show this help message and exit")
     parser.add_argument("-user", "--user", dest="profile", default=None, help="Profile name")
     args = parser.parse_args()
-    profile_name = args.profile if args.profile else prompt_select_profile()
+    if args.profile:
+        if not profile_exists(args.profile):
+            print("Profile not exist.")
+            raise SystemExit(1)
+        profile_name = args.profile
+    else:
+        profile_name = prompt_select_profile()
     first_time_setup(profile_name=profile_name)

display_manager.py

@@ -229,6 +229,7 @@ class DisplayManager:
 
                     instructions = Text.from_markup(
                         "Press [yellow][[/yellow] then [yellow]][/yellow] to manually trigger the next event\n"
+                        "Press [yellow][[/yellow] then [yellow]c[/yellow] to refresh the calendar\n"
                         "Press [yellow][[/yellow] then [yellow]q[/yellow] to exit the script",
                         justify="center",
                     )

fetch_ics.py

@@ -8,7 +8,7 @@ from selenium.webdriver.support.ui import WebDriverWait, Select
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.chrome.options import Options
 from webdriver_manager.chrome import ChromeDriverManager
-from app_paths import get_credentials_path, get_ics_dir, prompt_select_profile
+from app_paths import get_credentials_path, get_ics_dir, prompt_select_profile, profile_exists
 TIMETABLE_URL = 'https://webtimetables.royalholloway.ac.uk/'
 
 
@@ -93,11 +93,84 @@ def fetch_ics_url(profile_name=None):
         time.sleep(5)
         driver.quit()
 
+
+def refresh_calendar(profile_name=None, load_calendar_fn=None, get_upcoming_events_fn=None, logger=None):
+    def _log(msg, level="info"):
+        if logger:
+            try:
+                getattr(logger, level)(msg)
+                return
+            except Exception:
+                pass
+        print(msg)
+
+    ics_path = os.path.join(get_ics_dir(profile_name), 'student_timetable.ics')
+    try:
+        if os.path.exists(ics_path):
+            os.remove(ics_path)
+        fetch_ics_url(profile_name=profile_name)
+
+        if load_calendar_fn and get_upcoming_events_fn:
+            calendar = load_calendar_fn(ics_path)
+            if not calendar:
+                _log("Failed to reload calendar after refresh.", level="error")
+                return None, ics_path
+            new_events = get_upcoming_events_fn(calendar)
+            return new_events, ics_path
+        return None, ics_path
+    except Exception as e:
+        _log(f"Failed to refresh calendar: {e}", level="error")
+        return None, ics_path
+
+
+def renew_calendar(upcoming_events, events_lock, profile_name=None, load_calendar_fn=None, get_upcoming_events_fn=None, logger=None):
+    new_events, _ = refresh_calendar(
+        profile_name=profile_name,
+        load_calendar_fn=load_calendar_fn,
+        get_upcoming_events_fn=get_upcoming_events_fn,
+        logger=logger,
+    )
+    if new_events is None:
+        return
+    with events_lock:
+        upcoming_events.clear()
+        upcoming_events.extend(new_events)
+    if new_events:
+        next_event_start, next_event_name, _, next_event_end = new_events[0]
+        local_next_event_start = next_event_start.astimezone()
+        duration = next_event_end - next_event_start
+        msg = (
+            f"Waiting for next event: [bold magenta]{next_event_name}[/bold magenta] at "
+            f"[bold cyan]{local_next_event_start.strftime('%Y-%m-%d %H:%M:%S')}[/bold cyan] "
+            f"(duration: [bold green]{str(duration).split('.')[0]}[/bold green])"
+        )
+        if logger:
+            logger.info(msg)
+        else:
+            print(msg)
+    else:
+        if logger:
+            logger.info("No upcoming events after refresh.")
+        else:
+            print("No upcoming events after refresh.")
+
+    if logger:
+        logger.info("Calendar refreshed successfully.", extra={"gray": True})
+    else:
+        print("Calendar refreshed successfully.")
+
 if __name__ == '__main__':
     import argparse
 
     parser = argparse.ArgumentParser(description="RHUL timetable ICS fetcher")
+    parser.add_argument("-help", action="help", help="Show this help message and exit")
     parser.add_argument("-user", "--user", dest="profile", default=None, help="Profile name")
     args = parser.parse_args()
-    profile_name = args.profile if args.profile else prompt_select_profile()
+    if args.profile:
+        if not profile_exists(args.profile):
+            print("Profile not exist.")
+            raise SystemExit(1)
+        profile_name = args.profile
+    else:
+        profile_name = prompt_select_profile()
     fetch_ics_url(profile_name=profile_name)

{rhul_attendance_bot-0.1.48.dist-info → rhul_attendance_bot-0.1.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rhul-attendance-bot
-Version: 0.1.48
+Version: 0.1.49
 Summary: RHUL attendance automation bot
 Author: PandaQuQ
 License: 
@@ -77,13 +77,26 @@ The RHUL Attendance Bot automates attendance marking for Royal Holloway students
 
 Install Google Chrome if you don't have it yet: [download page](https://www.google.com/chrome/) (macOS users can also `brew install --cask google-chrome`).
 
+Choose one of the two modes below:
+
+1) **Recommended: Install via pip**
+2) **Run from source**
+
+### Mode 1: Install via pip (recommended)
+
+```bash
+pip install rhul-attendance-bot
+```
+
+### Mode 2: Run from source
+
 ### Step 1: Clone the Repository
 
 ```bash
 git clone https://github.com/PandaQuQ/RHUL_attendance_bot.git
 ```
 
-### Step 2: Navigate to the Project Directory
+### Step 2: Navigate to the Project Directory (source install only)
 
 ```bash
 cd RHUL_attendance_bot
@@ -103,15 +116,7 @@ python3 -m venv venv
 source venv/bin/activate
 ```
 
-### Step 4: Install Dependencies
-
-#### Option A: Install from PyPI (recommended)
-
-```bash
-pip install rhul-attendance-bot
-```
-
-#### Option B: Install from source
+### Step 4: Install dependencies
 
 ```bash
 pip install -r requirements.txt
@@ -167,11 +172,20 @@ The bot now auto-downloads your timetable on first run and stores it in `ics/`.
        ```bash
        rhul-attendance-bot -user Alice
        ```
-    - If `-user` is not provided, the app will list existing profiles and ask you to choose (or create a new one).
+      - If `-user` is not provided and profiles exist, the app will list them and ask you to choose.
+      - If no profiles exist, it starts onboarding automatically and then renames the profile folder to your Profile Nickname.
+
+5. **Cleanup (delete local data)**:
+
+    - Use `-clean` to remove all local app data under `~/.rhul_attendance_bot`:
+       ```bash
+       rhul-attendance-bot -clean
+       ```
 
-5. **Keyboard Shortcuts**:
+6. **Keyboard Shortcuts**:
 
    - **Manually Trigger the Next Event**: Press `[`, then `]`
+   - **Refresh Calendar (re-fetch ICS)**: Press `[`, then `c`
    - **Exit the Script**: Press `[`, then `q`
 
 ## Important Notes
@@ -220,10 +234,11 @@ Current focus / future ideas:
 - ✅ **Automatic Login**: Stored credentials + TOTP drive a fully automatic login flow.
 - ✅ **2FA Code Reading**: OTP is generated locally from your saved secret.
 - ✅ **Discord Webhook Bot**: Discord webhook notifications for attendance status, login, and lifecycle (optional; disable by leaving webhook URL empty)
+- ✅ **PyPI Release**: Package published and installable via `pip install rhul-attendance-bot`
 
 ## License
 
-This project is licensed under the MIT License with an additional clause. See the [LICENSE](LICENSE) file for details.
+This project is licensed under the MIT License. See the [LICENSE](LICENSE) file for details.
 
 ## Acknowledgments
 

rhul_attendance_bot-0.1.49.dist-info/RECORD

@@ -0,0 +1,14 @@
+RHUL_attendance_bot.py,sha256=j6zr2yQHvzSmzO-7b66WVhEA-vL9RTVsDi7YooEEkfI,26103
+app_paths.py,sha256=xMpjXSCiMkLIvpsCfoRj61rHMLnWnkGzFOQ4JV8_J5A,3482
+auto_login.py,sha256=IfNu7WA-i75oLbJ5dQSWCZUAyloS86cKwhHue5wpoao,35234
+discord_broadcast.py,sha256=0hRJ_vronQK_TvRgC06NNWxaj8892h-Q7Hzmrp3-lB4,2615
+display_manager.py,sha256=-hW4YocMrdhj_6AcGD-XU9WDIy9BFIym5mRqVH--iLc,11180
+fetch_ics.py,sha256=DkfH-XfdTeD-b9ZQvuLmfRE4R_wPwL0VjJaQwSP7LBM,7277
+local_2fa.py,sha256=2PY6XtczgIxjKqWls9DeN27MWLIiNKbQdk9E3GZVJxU,729
+update.py,sha256=kw_KWBJLu20JpMMmJQAAxu2ZZIlcUeRxppaVGr3S1r8,2354
+rhul_attendance_bot-0.1.49.dist-info/licenses/LICENSE,sha256=iBk7hceb7NgwcLnsFlT_v2SE2-m9i8CzsjlvBw8xmPg,1075
+rhul_attendance_bot-0.1.49.dist-info/METADATA,sha256=4ywwXdXS-uZm9cK8GvOYgZAD-eIhvbayhuFCEL_BVcY,10250
+rhul_attendance_bot-0.1.49.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+rhul_attendance_bot-0.1.49.dist-info/entry_points.txt,sha256=TH2lA3ukDDxlnFr2CIy0xd1ZbsaO6FMjuUTDUIbkShs,65
+rhul_attendance_bot-0.1.49.dist-info/top_level.txt,sha256=TABKd3ZTI6hvA899O5XSRt0lk58h9dxrv6QHChtJqmU,102
+rhul_attendance_bot-0.1.49.dist-info/RECORD,,

rhul_attendance_bot-0.1.48.dist-info/RECORD

@@ -1,14 +0,0 @@
-RHUL_attendance_bot.py,sha256=J-5aSVrfGL1gjlGgsBcb_QYW4OEXL81mFVL0kLgqE-I,24193
-app_paths.py,sha256=1VnUSQBaXCbAzDjivhCHyRTZJ3aHKMj6ewkcaMVDuHg,2161
-auto_login.py,sha256=CfSr2kiUz7SyfEAHDaZmisiSXO3RXuSUIm_QU087iEE,34654
-discord_broadcast.py,sha256=0hRJ_vronQK_TvRgC06NNWxaj8892h-Q7Hzmrp3-lB4,2615
-display_manager.py,sha256=iRPWxwFiQWSvWl-QazKsiaLbvX2T7LPPFItfMZ52-Yg,11079
-fetch_ics.py,sha256=5G2SYuYALqRxmT8TqUMTvNBvMHeoXuJueI9agyyApKs,4617
-local_2fa.py,sha256=2PY6XtczgIxjKqWls9DeN27MWLIiNKbQdk9E3GZVJxU,729
-update.py,sha256=kw_KWBJLu20JpMMmJQAAxu2ZZIlcUeRxppaVGr3S1r8,2354
-rhul_attendance_bot-0.1.48.dist-info/licenses/LICENSE,sha256=iBk7hceb7NgwcLnsFlT_v2SE2-m9i8CzsjlvBw8xmPg,1075
-rhul_attendance_bot-0.1.48.dist-info/METADATA,sha256=gx0sOQD_9mo0QzcFONZZHET94OD9-NFQPvIi7fzNze0,9721
-rhul_attendance_bot-0.1.48.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-rhul_attendance_bot-0.1.48.dist-info/entry_points.txt,sha256=TH2lA3ukDDxlnFr2CIy0xd1ZbsaO6FMjuUTDUIbkShs,65
-rhul_attendance_bot-0.1.48.dist-info/top_level.txt,sha256=TABKd3ZTI6hvA899O5XSRt0lk58h9dxrv6QHChtJqmU,102
-rhul_attendance_bot-0.1.48.dist-info/RECORD,,