HackaProfile 1.1.0__tar.gz → 1.2.0__tar.gz

{hackaprofile-1.1.0 → hackaprofile-1.2.0}/HackaProfile.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: HackaProfile
-Version: 1.1.0
+Version: 1.2.0
 Summary: A simple tool to automatically update Slack user profile based on their Hackatime/Wakatime heartbeat!
 Project-URL: Repository, https://github.com/zibuyin/HackaProfile
 Project-URL: Issues, https://github.com/zibuyin/HackaProfile/issues

{hackaprofile-1.1.0 → hackaprofile-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: HackaProfile
-Version: 1.1.0
+Version: 1.2.0
 Summary: A simple tool to automatically update Slack user profile based on their Hackatime/Wakatime heartbeat!
 Project-URL: Repository, https://github.com/zibuyin/HackaProfile
 Project-URL: Issues, https://github.com/zibuyin/HackaProfile/issues

{hackaprofile-1.1.0 → hackaprofile-1.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "HackaProfile"
-version = "1.1.0"
+version = "1.2.0"
 description = "A simple tool to automatically update Slack user profile based on their Hackatime/Wakatime heartbeat!"
 readme = "README.md"
 requires-python = ">=3.10"

{hackaprofile-1.1.0 → hackaprofile-1.2.0}/src/agent.py

@@ -8,14 +8,20 @@ import os
 from pathlib import Path
 import platformdirs
 from jinja2 import Template
+import logging
 
-print("***** WORKER AGENT STARTER *****")
+logging.basicConfig(
+    format='[%(asctime)s] (Line: %(lineno)d) %(message)s',
+    level=logging.INFO
+)
+
+print("***** WORKER AGENT STARTED *****")
 hackatime = backend.hackatime()
 slack = backend.slack()
 
 
 active_services = ["slack"]
-interval = 20
+interval = 10
 HOME = Path.home()
 CONFIG_DIR = Path(platformdirs.user_config_dir("hackaprofile"))
 LOG_DIR = Path(platformdirs.user_log_dir("hackaprofile"))
@@ -48,9 +54,9 @@ def parse_config(config: dict, map):
         parsed_config[key] = result
 
         # print(parsed)
-    print("===")
-    print(parsed_config)  
-    print("===")      
+    print("---Parsed Config---")
+    logging.info(parsed_config)
+    print("---EO Parsed Config---\n")      
     return parsed_config
 
 
@@ -81,14 +87,14 @@ while True:
     
     print(f'Language: {map["language"]}')
     print("---HT HB---")
-    print(json)
-    print("---EO HT HB---")
+    logging.info(json)
+    print("---EO HT HB---\n")
     if "slack" in active_services:
         print(slack.fetch_config())
         config = parse_config(slack.fetch_config(), map)
         print(config)
         
         res = slack.set_profile(config)
-        print(res)
-    print("---")
+        logging.info(res)
+    print("==============================================================")
     time.sleep(interval)

{hackaprofile-1.1.0 → hackaprofile-1.2.0}/src/frontend.py

@@ -33,6 +33,7 @@ import sys
 import psutil
 import signal
 import platformdirs
+import shlex
 
 console = Console()
 
@@ -136,82 +137,86 @@ def setup(force: Annotated[bool, typer.Option("--force")] = False):
     """
     Guided setup of HackaProfile
     """
-    console.clear()
-    # console.rule("HackaProfile")
-    rprint(Panel(Text("Welcome to HackaProfile\nyou will be guided on an easy setup of the tool!", justify="center")))
-    console.rule()
-    # rprint(force)
-    
-    # Copy log files
-    try:
-        # Allow overwrite if set to force
-        shutil.copytree(Path(__file__).resolve().parent / "logTemplate", LOG_DIR, dirs_exist_ok=force)
-        rprint("[bold green]✓[/bold green] Log file setup done!")
-    except FileExistsError:
-        rprint("[bold green]✓[/bold green] Log file already exists!")
-    except Exception as e:
-        rprint(f"❌ Failed to setup log files: {e}")
-        
-    # Copy config files
-    try:
-        # Allow overwrite if set to force
-        shutil.copytree(Path(__file__).resolve().parent / "configTemplate", CONFIG_DIR, dirs_exist_ok=force)
-        rprint("[bold green]✓[/bold green] Config file setup done!")
-    except FileExistsError:
-        rprint("[bold green]✓[/bold green] Config file already exists!")
-    except Exception as e:
-        rprint(f"❌ Failed to setup config files: {e}")
-        
-    
-    # If no token stored
-    if force or not hackatime.status()["ok"]:
-        # hackatimeConfirm = Confirm.ask("[bold cyan]Do you want to authorize Hackatime (This will redirect you to OAuth page)", default=True)
-        hackatimeConfirm  = questionary.confirm("Do you want to authorize Hackatime (This will redirect you to OAuth page)").ask()
-        if hackatimeConfirm:
-            with console.status("Authorizing Hackatime", spinner="dots"):
-                ok, hackatime_token = hackatime.authorize()
+    if force:
+        conf = Confirm.ask("[bold red]Setting --force will CLEAR ALL EXISTING CONFIG AND LOGS. Do you wish to continue?", default=False)
+        if conf:
+            console.clear()
+            # console.rule("HackaProfile")
+            rprint(Panel(Text("Welcome to HackaProfile\nyou will be guided on an easy setup of the tool!", justify="center")))
+            console.rule()
+            # rprint(force)
+            
+            # Copy log files
+            try:
+                # Allow overwrite if set to force
+                shutil.copytree(Path(__file__).resolve().parent / "logTemplate", LOG_DIR, dirs_exist_ok=force)
+                rprint("[bold green]✓[/bold green] Log file setup done!")
+            except FileExistsError:
+                rprint("[bold green]✓[/bold green] Log file already exists!")
+            except Exception as e:
+                rprint(f"❌ Failed to setup log files: {e}")
                 
-            if ok:
-                rprint("[bold green]✓[/bold green] Hackatime authorized!")
-                
-            else :
-                rprint(f"[bold red]err: {str(hackatime_token)}")    
-        else:
-            rprint("[bold red]err: HackaProfile could not function without Hackatime.")
-            typer.Abort()
-    # If already stored
-    else:
-        rprint("[bold green]✓[/bold green] Hackatime already authorized!\n")
-        
-    platforms = questionary.checkbox(
-        message="Please choose the platforms you want to link to",
-        choices=[
-            "Slack",
-            "Github"
-        ]
-    ).ask()
-    
-    # Authorize the platforms
-    
-    for platform in platforms:
-        # print("test")
-        cls = backend.platfroms.get(platform.lower())
-        if cls:
-            instance = cls()
-            with console.status(f"Authorizing {platform}", spinner="dots"):
-                ok, platform_token = instance.authorize()
-            if ok:
-                rprint(f"[bold green]✓[/bold green] {platform} authorized!")
+            # Copy config files
+            try:
+                # Allow overwrite if set to force
+                shutil.copytree(Path(__file__).resolve().parent / "configTemplate", CONFIG_DIR, dirs_exist_ok=force)
+                rprint("[bold green]✓[/bold green] Config file setup done!")
+            except FileExistsError:
+                rprint("[bold green]✓[/bold green] Config file already exists!")
+            except Exception as e:
+                rprint(f"❌ Failed to setup config files: {e}")
                 
+            
+            # If no token stored
+            if force or not hackatime.status()["ok"]:
+                # hackatimeConfirm = Confirm.ask("[bold cyan]Do you want to authorize Hackatime (This will redirect you to OAuth page)", default=True)
+                hackatimeConfirm  = questionary.confirm("Do you want to authorize Hackatime (This will redirect you to OAuth page)").ask()
+                if hackatimeConfirm:
+                    with console.status("Authorizing Hackatime", spinner="dots"):
+                        ok, hackatime_token = hackatime.authorize()
+                        
+                    if ok:
+                        rprint("[bold green]✓[/bold green] Hackatime authorized!")
+                        
+                    else :
+                        rprint(f"[bold red]err: {str(hackatime_token)}")    
+                else:
+                    rprint("[bold red]err: HackaProfile could not function without Hackatime.")
+                    typer.Abort()
+            # If already stored
             else:
-                rprint(f"[bold red]err: {str(platform_token)}")
+                rprint("[bold green]✓[/bold green] Hackatime already authorized!\n")
+                
+            platforms = questionary.checkbox(
+                message="Please choose the platforms you want to link to",
+                choices=[
+                    "Slack"
+                ]
+            ).ask()
+            
+            # Authorize the platforms
             
+            for platform in platforms:
+                # print("test")
+                cls = backend.platfroms.get(platform.lower())
+                if cls:
+                    instance = cls()
+                    with console.status(f"Authorizing {platform}", spinner="dots"):
+                        ok, platform_token = instance.authorize()
+                    if ok:
+                        rprint(f"[bold green]✓[/bold green] {platform} authorized!")
+                        
+                    else:
+                        rprint(f"[bold red]err: {str(platform_token)}")
+                    
+                else:
+                    rprint("[bold red]err: Platform unsupported")
+                
+                
+            rprint("[bold green]✓[/bold green] Setup complete!\n\n1.Run [bold green]hackaprofile config \\[platform name(e.g. slack)][/bold green] to configure\n2.Run [bold green]hackaprofile start[/bold green] to start updating your profile automatically!")
         else:
-            rprint("[bold red]err: Platform unsupported")
-        
-        
-    rprint("[bold green]✓[/bold green] Setup complete!\n\n1.Run [bold green]hackaprofile config \\[platform name][/bold green] to configure\n2.Run [bold green]hackaprofile start[/bold green] to start updating your profile automatically!")
-        
+            rprint("[bold red]Aborted.")
+
 class placeholderHighlighter(Highlighter):
     def highlight(self, text) -> None:
         text.highlight_regex(r"\{\{.*?\}\}", "bold yellow")
@@ -221,7 +226,7 @@ def config(platform: Annotated[str, typer.Argument]):
     """
     Shows a structured preview of the config files for each of the platforms
     """
-    
+    rprint("[bold red]Check README.md on how to configure HackaProfile!\n")
     table = Table(
         "Field",
         "Value",
@@ -254,16 +259,16 @@ def config(platform: Annotated[str, typer.Argument]):
     if option == "Exit":
         typer.Exit()
     elif option == "Edit":
-        path = str(CONFIG_DIR/ f"{platform}.hackaprofile.conf")
-        rprint(f"\n[bold green]Open[/bold green] {path} [bold green]in your preferred editor!")
+        path = shlex.quote(str(CONFIG_DIR/ f"{platform}.hackaprofile.conf"))
+        rprint(f"\n[bold cyan]Open[/bold cyan] {path} [bold cyan]in your preferred editor!")
     
-        cbConfirm = questionary.confirm(
-            "Do you want to copy path to clipboard?",
-            default=False
-        ).ask()
-        if cbConfirm:
-            pyperclip.copy(path)
-            rprint("[bold green]✓[/bold green] Copied!")
+            # cbConfirm = questionary.confirm(
+            #     "Do you want to copy path to clipboard?",
+            #     default=False
+            # ).ask()
+            # if cbConfirm:
+            #     pyperclip.copy(path)
+            #     rprint("[bold green]✓[/bold green] Copied!")
     
     # with Live(table, refresh_per_second=4):
     #     console.clear()Path(__file__).resolve().parent.parent / "config" / f"{platform}.hackaprofile.conf"