comparing b35aaa796b981216348033f86ae6962f5e026f77 and main on dunkirk.sh/akami

.github/images/out.gif

This is a binary file and will not be displayed.

+7 -1

cassette.tape

···

       1
       1
        
       Output .github/images/out.gif

     

       2
       2
        
       Set Shell zsh

     

       3
       3
       -
       Set Width 1200

     

       3
       3
       +
       Set Width 1400

     

       4
       4
        
       Set Height 1200

     

       5
       5
        
       Require akami-dev

     

       6
       6
        
       Sleep 1s

     
···

       10
       10
        
       Type "akami-dev doc"

     

       11
       11
        
       Enter

     

       12
       12
        
       Sleep 4s

     

       13
       13
       +
       Type "akami-dev test"

     

       14
       14
       +
       Enter

     

       15
       15
       +
       Sleep 3.5s

     

       16
       16
       +
       Type "akami-dev status"

     

       17
       17
       +
       Enter

     

       18
       18
       +
       Sleep 5s

+118 -44

flake.nix

···

       5
       5
        
           nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

     

       6
       6
        
         };

     

       7
       7
        
       

     

       8
       8
       -
         outputs = { self, nixpkgs }:

     

       8
       8
       +
         outputs =

     

       9
       9
       +
           { self, nixpkgs }:

     

       9
       10
        
           let

     

       10
       11
        
             allSystems = [

     

       11
       12
        
               "x86_64-linux" # 64-bit Intel/AMD Linux

     
···

       13
       14
        
               "x86_64-darwin" # 64-bit Intel macOS

     

       14
       15
        
               "aarch64-darwin" # 64-bit ARM macOS

     

       15
       16
        
             ];

     

       16
       16
       -
             forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f {

     

       17
       17
       -
               pkgs = import nixpkgs { inherit system; };

     

       18
       18
       -
             });

     

       17
       17
       +
             forAllSystems =

     

       18
       18
       +
               f:

     

       19
       19
       +
               nixpkgs.lib.genAttrs allSystems (

     

       20
       20
       +
                 system:

     

       21
       21
       +
                 f {

     

       22
       22
       +
                   pkgs = import nixpkgs { inherit system; };

     

       23
       23
       +
                 }

     

       24
       24
       +
               );

     

       19
       25
        
           in

     

       20
       26
        
           {

     

       21
       21
       -
             packages = forAllSystems ({ pkgs }: {

     

       22
       22
       -
               default = pkgs.buildGoModule {

     

       23
       23
       -
                 pname = "akami";

     

       24
       24
       -
                 version = "0.0.1";

     

       25
       25
       -
                 subPackages = [ "." ];  # Build from root directory

     

       26
       26
       -
                 src = ./.;

     

       27
       27
       -
                 vendorHash = "sha256-9gO00c3D846SJl5dbtfj0qasmONLNxU/7V1TG6QEaxM=";

     

       28
       28
       -
               };

     

       29
       29
       -
             });

     

       27
       27
       +
             packages = forAllSystems (

     

       28
       28
       +
               { pkgs }:

     

       29
       29
       +
               let

     

       30
       30
       +
                 akami = pkgs.buildGoModule {

     

       31
       31
       +
                   pname = "akami";

     

       32
       32
       +
                   version = "0.0.1";

     

       33
       33
       +
                   subPackages = [ "." ]; # Build from root directory

     

       34
       34
       +
                   src = self;

     

       35
       35
       +
                   vendorHash = "sha256-9gO00c3D846SJl5dbtfj0qasmONLNxU/7V1TG6QEaxM=";

     

       36
       36
       +
       

     

       37
       37
       +
                   nativeBuildInputs = [ pkgs.installShellFiles ];

     

       30
       38
        
       

     

       31
       31
       -
             devShells = forAllSystems ({ pkgs }: {

     

       32
       32
       -
               default = pkgs.mkShell {

     

       33
       33
       -
                 buildInputs = with pkgs; [

     

       34
       34
       -
                   go

     

       35
       35
       -
                   gopls

     

       36
       36
       -
                   gotools

     

       37
       37
       -
                   go-tools

     

       38
       38
       -
                   (pkgs.writeShellScriptBin "akami-dev" ''

     

       39
       39
       -
                     go build -o ./bin/akami ./main.go

     

       40
       40
       -
                     ./bin/akami "$@" || true

     

       41
       41
       -
                   '')

     

       42
       42
       -
                 ];

     

       39
       39
       +
                   postInstall = ''

     

       40
       40
       +
                     installShellCompletion --cmd crush \

     

       41
       41
       +
                       --bash <($out/bin/crush completion bash) \

     

       42
       42
       +
                       --fish <($out/bin/crush completion fish) \

     

       43
       43
       +
                       --zsh <($out/bin/crush completion zsh)

     

       43
       44
        
       

     

       44
       44
       -
                 shellHook = ''

     

       45
       45
       -
                   export PATH=$PATH:$PWD/bin

     

       46
       46
       -
                   mkdir -p $PWD/bin

     

       47
       47
       -
                 '';

     

       48
       48
       -
               };

     

       49
       49
       -
             });

     

       45
       45
       +
                     # Generate and install man page

     

       46
       46
       +
                     $out/bin/crush man > crush.1

     

       47
       47
       +
                     installManPage crush.1

     

       48
       48
       +
                   '';

     

       50
       49
        
       

     

       51
       51
       -
             apps = forAllSystems ({ pkgs }: {

     

       52
       52
       -
               default = {

     

       53
       53
       -
                 type = "app";

     

       54
       54
       -
                 program = "${self.packages.${pkgs.system}.default}/bin/akami";

     

       55
       55
       -
               };

     

       56
       56
       -
               akami-dev = {

     

       57
       57
       -
                 type = "app";

     

       58
       58
       -
                 program = toString (pkgs.writeShellScript "akami-dev" ''

     

       59
       59
       -
                   go build -o ./bin/akami ./main.go

     

       60
       60
       -
                   ./bin/akami $* || true

     

       61
       61
       -
                 '');

     

       62
       62
       -
               };

     

       63
       63
       -
             });

     

       50
       50
       +
                   meta = with pkgs.lib; {

     

       51
       51
       +
                     description = "🌷 the cutsie hackatime helper";

     

       52
       52
       +
                     homepage = "https://github.com/taciturnaxolotl/akami";

     

       53
       53
       +
                     license = licenses.mit;

     

       54
       54
       +
                     maintainers = with maintainers; [ taciturnaxolotl ];

     

       55
       55
       +
                     platforms = platforms.linux ++ platforms.darwin;

     

       56
       56
       +
                   };

     

       57
       57
       +
                 };

     

       58
       58
       +
               in

     

       59
       59
       +
               {

     

       60
       60
       +
                 default = akami;

     

       61
       61
       +
               }

     

       62
       62
       +
             );

     

       63
       63
       +
       

     

       64
       64
       +
             devShells = forAllSystems (

     

       65
       65
       +
               { pkgs }:

     

       66
       66
       +
               {

     

       67
       67
       +
                 default = pkgs.mkShell {

     

       68
       68
       +
                   buildInputs = with pkgs; [

     

       69
       69
       +
                     go

     

       70
       70
       +
                     gopls

     

       71
       71
       +
                     gotools

     

       72
       72
       +
                     go-tools

     

       73
       73
       +
                     (pkgs.writeShellScriptBin "akami-dev" ''

     

       74
       74
       +
                       go build -o ./bin/akami ./main.go

     

       75
       75
       +
                       ./bin/akami "$@" || true

     

       76
       76
       +
                     '')

     

       77
       77
       +
                     (pkgs.writeShellScriptBin "akami-build" ''

     

       78
       78
       +
                       echo "Building akami binaries for all platforms..."

     

       79
       79
       +
                       mkdir -p $PWD/bin

     

       80
       80
       +
       

     

       81
       81
       +
                       # Build for Linux (64-bit)

     

       82
       82
       +
                       echo "Building for Linux (x86_64)..."

     

       83
       83
       +
                       GOOS=linux GOARCH=amd64 go build -o $PWD/bin/akami-linux-amd64 ./main.go

     

       84
       84
       +
       

     

       85
       85
       +
                       # Build for Linux ARM (64-bit)

     

       86
       86
       +
                       echo "Building for Linux (aarch64)..."

     

       87
       87
       +
                       GOOS=linux GOARCH=arm64 go build -o $PWD/bin/akami-linux-arm64 ./main.go

     

       88
       88
       +
       

     

       89
       89
       +
                       # Build for macOS (64-bit Intel)

     

       90
       90
       +
                       echo "Building for macOS (x86_64)..."

     

       91
       91
       +
                       GOOS=darwin GOARCH=amd64 go build -o $PWD/bin/akami-darwin-amd64 ./main.go

     

       92
       92
       +
       

     

       93
       93
       +
                       # Build for macOS ARM (64-bit)

     

       94
       94
       +
                       echo "Building for macOS (aarch64)..."

     

       95
       95
       +
                       GOOS=darwin GOARCH=arm64 go build -o $PWD/bin/akami-darwin-arm64 ./main.go

     

       96
       96
       +
       

     

       97
       97
       +
                       # Build for Windows (64-bit)

     

       98
       98
       +
                       echo "Building for Windows (x86_64)..."

     

       99
       99
       +
                       GOOS=windows GOARCH=amd64 go build -o $PWD/bin/akami-windows-amd64.exe ./main.go

     

       100
       100
       +
       

     

       101
       101
       +
                       echo "All binaries built successfully in $PWD/bin/"

     

       102
       102
       +
                       ls -la $PWD/bin/

     

       103
       103
       +
                     '')

     

       104
       104
       +
                   ];

     

       105
       105
       +
       

     

       106
       106
       +
                   shellHook = ''

     

       107
       107
       +
                     export PATH=$PATH:$PWD/bin

     

       108
       108
       +
                     mkdir -p $PWD/bin

     

       109
       109
       +
                   '';

     

       110
       110
       +
                 };

     

       111
       111
       +
               }

     

       112
       112
       +
             );

     

       113
       113
       +
       

     

       114
       114
       +
             apps = forAllSystems (

     

       115
       115
       +
               { pkgs }:

     

       116
       116
       +
               {

     

       117
       117
       +
                 default = {

     

       118
       118
       +
                   type = "app";

     

       119
       119
       +
                   program = "${self.packages.${pkgs.system}.default}/bin/akami";

     

       120
       120
       +
                 };

     

       121
       121
       +
                 akami-dev = {

     

       122
       122
       +
                   type = "app";

     

       123
       123
       +
                   program = toString (

     

       124
       124
       +
                     pkgs.writeShellScript "akami-dev" ''

     

       125
       125
       +
                       go build -o ./bin/akami ./main.go

     

       126
       126
       +
                       ./bin/akami $* || true

     

       127
       127
       +
                     ''

     

       128
       128
       +
                   );

     

       129
       129
       +
                 };

     

       130
       130
       +
                 akami-build = {

     

       131
       131
       +
                   type = "app";

     

       132
       132
       +
                   program = "${self.devShells.${pkgs.system}.default.inputDerivation}/bin/akami-build";

     

       133
       133
       +
                 };

     

       134
       134
       +
               }

     

       135
       135
       +
             );

     

       136
       136
       +
       

     

       137
       137
       +
             formatter = forAllSystems ({ pkgs }: pkgs.nixfmt-tree);

     

       64
       138
        
           };

     

       65
       139
        
       }

+427 -82

handler/main.go

···

       1
       1
        
       package handler

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"context"

     

       4
       5
        
       	"errors"

     

       5
       6
        
       	"fmt"

     

       7
       7
       +
       	"math/rand"

     

       6
       8
        
       	"os"

     

       7
       9
        
       	"path/filepath"

     

       8
       10
        
       	"runtime"

     
···

       11
       13
        
       

     

       12
       14
        
       	"github.com/spf13/cobra"

     

       13
       15
        
       	"github.com/taciturnaxolotl/akami/styles"

     

       16
       16
       +
       	"github.com/taciturnaxolotl/akami/utils"

     

       14
       17
        
       	"github.com/taciturnaxolotl/akami/wakatime"

     

       15
       18
        
       	"gopkg.in/ini.v1"

     

       16
       19
        
       )

     

       17
       20
        
       

     

       18
       18
       -
       func Doctor() *cobra.Command {

     

       19
       19
       -
       	return &cobra.Command{

     

       20
       20
       -
       		Use:   "doc",

     

       21
       21
       -
       		Short: "diagnose potential hackatime issues",

     

       22
       22
       -
       		RunE: func(c *cobra.Command, _ []string) error {

     

       23
       23
       -
       			// check our os

     

       24
       24
       -
       			os_name := runtime.GOOS

     

       21
       21
       +
       // Task status indicators

     

       22
       22
       +
       var spinnerChars = []string{"[|]", "[/]", "[-]", "[\\]"}

     

       23
       23
       +
       var TaskCompleted = "[*]"

     

       25
       24
        
       

     

       26
       26
       -
       			user_dir, err := os.UserHomeDir()

     

       27
       27
       -
       			if err != nil {

     

       28
       28
       -
       				return errors.New("somehow your user doesn't exist? fairly sure this should never happen; plz report this to @krn on slack or via email at me@dunkirk.sh")

     

       25
       25
       +
       // taskState holds shared state for the currently running task

     

       26
       26
       +
       type taskState struct {

     

       27
       27
       +
       	cancel  context.CancelFunc

     

       28
       28
       +
       	message string

     

       29
       29
       +
       }

     

       30
       30
       +
       

     

       31
       31
       +
       // printTask prints a task with a spinning animation

     

       32
       32
       +
       func printTask(c *cobra.Command, message string) {

     

       33
       33
       +
       	// Create a cancellable context for this spinner

     

       34
       34
       +
       	ctx, cancel := context.WithCancel(c.Context())

     

       35
       35
       +
       

     

       36
       36
       +
       	// Store cancel function so we can stop the spinner later

     

       37
       37
       +
       	if taskCtx, ok := c.Context().Value("taskState").(*taskState); ok {

     

       38
       38
       +
       		// Cancel any previously running spinner first

     

       39
       39
       +
       		if taskCtx.cancel != nil {

     

       40
       40
       +
       			taskCtx.cancel()

     

       41
       41
       +
       			// Small delay to ensure previous spinner is stopped

     

       42
       42
       +
       			time.Sleep(10 * time.Millisecond)

     

       43
       43
       +
       		}

     

       44
       44
       +
       		taskCtx.message = message

     

       45
       45
       +
       		taskCtx.cancel = cancel

     

       46
       46
       +
       	} else {

     

       47
       47
       +
       		// First task, create the state and store it

     

       48
       48
       +
       		state := &taskState{

     

       49
       49
       +
       			message: message,

     

       50
       50
       +
       			cancel:  cancel,

     

       51
       51
       +
       		}

     

       52
       52
       +
       		c.SetContext(context.WithValue(c.Context(), "taskState", state))

     

       53
       53
       +
       	}

     

       54
       54
       +
       

     

       55
       55
       +
       	// Start spinner in background

     

       56
       56
       +
       	go func() {

     

       57
       57
       +
       		ticker := time.NewTicker(100 * time.Millisecond)

     

       58
       58
       +
       		defer ticker.Stop()

     

       59
       59
       +
       		i := 0

     

       60
       60
       +
       		for {

     

       61
       61
       +
       			select {

     

       62
       62
       +
       			case <-ctx.Done():

     

       63
       63
       +
       				return

     

       64
       64
       +
       			case <-ticker.C:

     

       65
       65
       +
       				// Clear line and print spinner with current character

     

       66
       66
       +
       				spinner := styles.Muted.Render(spinnerChars[i%len(spinnerChars)])

     

       67
       67
       +
       				c.Printf("\r\033[K%s %s", spinner, message)

     

       68
       68
       +
       				i++

     

       29
       69
        
       			}

     

       30
       30
       -
       			hackatime_path := filepath.Join(user_dir, ".wakatime.cfg")

     

       70
       70
       +
       		}

     

       71
       71
       +
       	}()

     

       72
       72
       +
       

     

       73
       73
       +
       	// Add a small random delay between 200-400ms to make spinner animation visible

     

       74
       74
       +
       	randomDelay := 200 + time.Duration(rand.Intn(201)) // 300-500ms

     

       75
       75
       +
       	time.Sleep(randomDelay * time.Millisecond)

     

       76
       76
       +
       }

     

       77
       77
       +
       

     

       78
       78
       +
       // completeTask marks a task as completed

     

       79
       79
       +
       func completeTask(c *cobra.Command, message string) {

     

       80
       80
       +
       	// Cancel spinner

     

       81
       81
       +
       	if state, ok := c.Context().Value("taskState").(*taskState); ok && state.cancel != nil {

     

       82
       82
       +
       		state.cancel()

     

       83
       83
       +
       		// Small delay to ensure spinner is stopped

     

       84
       84
       +
       		time.Sleep(10 * time.Millisecond)

     

       85
       85
       +
       	}

     

       86
       86
       +
       

     

       87
       87
       +
       	// Clear line and display success message

     

       88
       88
       +
       	c.Printf("\r\033[K%s %s\n", styles.Success.Render(TaskCompleted), message)

     

       89
       89
       +
       }

     

       90
       90
       +
       

     

       91
       91
       +
       // errorTask marks a task as failed

     

       92
       92
       +
       func errorTask(c *cobra.Command, message string) {

     

       93
       93
       +
       	// Cancel spinner

     

       94
       94
       +
       	if state, ok := c.Context().Value("taskState").(*taskState); ok && state.cancel != nil {

     

       95
       95
       +
       		state.cancel()

     

       96
       96
       +
       		// Small delay to ensure spinner is stopped

     

       97
       97
       +
       		time.Sleep(10 * time.Millisecond)

     

       98
       98
       +
       	}

     

       99
       99
       +
       

     

       100
       100
       +
       	// Clear line and display error message

     

       101
       101
       +
       	c.Printf("\r\033[K%s %s\n", styles.Bad.Render("[ ! ]"), message)

     

       102
       102
       +
       }

     

       103
       103
       +
       

     

       104
       104
       +
       // warnTask marks a task as a warning

     

       105
       105
       +
       func warnTask(c *cobra.Command, message string) {

     

       106
       106
       +
       	// Cancel spinner

     

       107
       107
       +
       	if state, ok := c.Context().Value("taskState").(*taskState); ok && state.cancel != nil {

     

       108
       108
       +
       		state.cancel()

     

       109
       109
       +
       		// Small delay to ensure spinner is stopped

     

       110
       110
       +
       		time.Sleep(10 * time.Millisecond)

     

       111
       111
       +
       	}

     

       112
       112
       +
       

     

       113
       113
       +
       	// Clear line and display warning message

     

       114
       114
       +
       	c.Printf("\r\033[K%s %s\n", styles.Warn.Render("[?]"), message)

     

       115
       115
       +
       }

     

       116
       116
       +
       

     

       117
       117
       +
       var user_dir, err = os.UserHomeDir()

     

       118
       118
       +
       

     

       119
       119
       +
       var testHeartbeat = wakatime.Heartbeat{

     

       120
       120
       +
       	Branch:           "main",

     

       121
       121
       +
       	Category:         "coding",

     

       122
       122
       +
       	CursorPos:        1,

     

       123
       123
       +
       	Entity:           filepath.Join(user_dir, "akami.txt"),

     

       124
       124
       +
       	Type:             "file",

     

       125
       125
       +
       	IsWrite:          true,

     

       126
       126
       +
       	Language:         "Go",

     

       127
       127
       +
       	LineNo:           1,

     

       128
       128
       +
       	LineCount:        4,

     

       129
       129
       +
       	Project:          "example",

     

       130
       130
       +
       	ProjectRootCount: 3,

     

       131
       131
       +
       	Time:             float64(time.Now().Unix()),

     

       132
       132
       +
       }

     

       133
       133
       +
       

     

       134
       134
       +
       func getClientStuff(c *cobra.Command) (key string, url string, err error) {

     

       135
       135
       +
       	configApiKey, _ := c.Flags().GetString("key")

     

       136
       136
       +
       	configApiURL, _ := c.Flags().GetString("url")

     

       137
       137
       +
       

     

       138
       138
       +
       	// If either value is missing, try to load from config file

     

       139
       139
       +
       	if configApiKey == "" || configApiURL == "" {

     

       140
       140
       +
       		userDir, err := os.UserHomeDir()

     

       141
       141
       +
       		if err != nil {

     

       142
       142
       +
       			errorTask(c, "Validating arguments")

     

       143
       143
       +
       			return configApiKey, configApiURL, err

     

       144
       144
       +
       		}

     

       145
       145
       +
       		wakatimePath := filepath.Join(userDir, ".wakatime.cfg")

     

       31
       146
        
       

     

       32
       32
       -
       			if os_name != "linux" && os_name != "darwin" && os_name != "windows" {

     

       33
       33
       -
       				return errors.New("hmm you don't seem to be running a recognized os? you are listed as running " + styles.Fancy.Render(os_name) + "; can you plz report this to @krn on slack or via email at me@dunkirk.sh?")

     

       34
       34
       -
       			}

     

       147
       147
       +
       		cfg, err := ini.Load(wakatimePath)

     

       148
       148
       +
       		if err != nil {

     

       149
       149
       +
       			errorTask(c, "Validating arguments")

     

       150
       150
       +
       			return configApiKey, configApiURL, errors.New("config file not found and you haven't passed all arguments")

     

       151
       151
       +
       		}

     

       35
       152
        
       

     

       36
       36
       -
       			c.Println("Looks like you are running", styles.Fancy.Render(os_name), "so lets take a look at", styles.Muted.Render(hackatime_path), "for your config")

     

       153
       153
       +
       		settings, err := cfg.GetSection("settings")

     

       154
       154
       +
       		if err != nil {

     

       155
       155
       +
       			errorTask(c, "Validating arguments")

     

       156
       156
       +
       			return configApiKey, configApiURL, errors.New("no settings section in your config")

     

       157
       157
       +
       		}

     

       37
       158
        
       

     

       38
       38
       -
       			rawCfg, err := os.ReadFile(hackatime_path)

     

       39
       39
       -
       			if errors.Is(err, os.ErrNotExist) {

     

       40
       40
       -
       				return errors.New("you don't have a wakatime config file! go check " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + " for the instructions and then try this again")

     

       159
       159
       +
       		// Only load from config if not provided as parameter

     

       160
       160
       +
       		if configApiKey == "" {

     

       161
       161
       +
       			configApiKey = settings.Key("api_key").String()

     

       162
       162
       +
       			if configApiKey == "" {

     

       163
       163
       +
       				errorTask(c, "Validating arguments")

     

       164
       164
       +
       				return configApiKey, configApiURL, errors.New("couldn't find an api_key in your config")

     

       41
       165
        
       			}

     

       166
       166
       +
       		}

     

       42
       167
        
       

     

       43
       43
       -
       			cfg, err := ini.Load(rawCfg)

     

       44
       44
       -
       			if err != nil {

     

       45
       45
       -
       				return errors.New(err.Error())

     

       168
       168
       +
       		if configApiURL == "" {

     

       169
       169
       +
       			configApiURL = settings.Key("api_url").String()

     

       170
       170
       +
       			if configApiURL == "" {

     

       171
       171
       +
       				errorTask(c, "Validating arguments")

     

       172
       172
       +
       				return configApiKey, configApiURL, errors.New("couldn't find an api_url in your config")

     

       46
       173
        
       			}

     

       174
       174
       +
       		}

     

       175
       175
       +
       	}

     

       47
       176
        
       

     

       48
       48
       -
       			settings, err := cfg.GetSection("settings")

     

       49
       49
       -
       			if err != nil {

     

       50
       50
       -
       				return errors.New("wow! your config file seems to be messed up and doesn't have a settings heading; can you follow the instructions at " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + " to regenerate it?\n\nThe raw error we got was: " + err.Error())

     

       177
       177
       +
       	return configApiKey, configApiURL, nil

     

       178
       178
       +
       }

     

       179
       179
       +
       

     

       180
       180
       +
       func Doctor(c *cobra.Command, _ []string) error {

     

       181
       181
       +
       	// Initialize a new context with task state

     

       182
       182
       +
       	c.SetContext(context.WithValue(context.Background(), "taskState", &taskState{}))

     

       183
       183
       +
       

     

       184
       184
       +
       	// check our os

     

       185
       185
       +
       	printTask(c, "Checking operating system")

     

       186
       186
       +
       

     

       187
       187
       +
       	os_name := runtime.GOOS

     

       188
       188
       +
       

     

       189
       189
       +
       	user_dir, err := os.UserHomeDir()

     

       190
       190
       +
       	if err != nil {

     

       191
       191
       +
       		errorTask(c, "Checking operating system")

     

       192
       192
       +
       		return errors.New("somehow your user doesn't exist? fairly sure this should never happen; plz report this to @krn on slack or via email at me@dunkirk.sh")

     

       193
       193
       +
       	}

     

       194
       194
       +
       	hackatime_path := filepath.Join(user_dir, ".wakatime.cfg")

     

       195
       195
       +
       

     

       196
       196
       +
       	if os_name != "linux" && os_name != "darwin" && os_name != "windows" {

     

       197
       197
       +
       		errorTask(c, "Checking operating system")

     

       198
       198
       +
       		return errors.New("hmm you don't seem to be running a recognized os? you are listed as running " + styles.Fancy.Render(os_name) + "; can you plz report this to @krn on slack or via email at me@dunkirk.sh?")

     

       199
       199
       +
       	}

     

       200
       200
       +
       	completeTask(c, "Checking operating system")

     

       201
       201
       +
       

     

       202
       202
       +
       	c.Printf("Looks like you are running %s so lets take a look at %s for your config\n\n", styles.Fancy.Render(os_name), styles.Muted.Render(hackatime_path))

     

       203
       203
       +
       

     

       204
       204
       +
       	printTask(c, "Checking wakatime config file")

     

       205
       205
       +
       

     

       206
       206
       +
       	rawCfg, err := os.ReadFile(hackatime_path)

     

       207
       207
       +
       	if errors.Is(err, os.ErrNotExist) {

     

       208
       208
       +
       		errorTask(c, "Checking wakatime config file")

     

       209
       209
       +
       		return errors.New("you don't have a wakatime config file! go check " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + " for the instructions and then try this again")

     

       210
       210
       +
       	}

     

       211
       211
       +
       

     

       212
       212
       +
       	cfg, err := ini.Load(rawCfg)

     

       213
       213
       +
       	if err != nil {

     

       214
       214
       +
       		errorTask(c, "Checking wakatime config file")

     

       215
       215
       +
       		return errors.New(err.Error())

     

       216
       216
       +
       	}

     

       217
       217
       +
       

     

       218
       218
       +
       	settings, err := cfg.GetSection("settings")

     

       219
       219
       +
       	if err != nil {

     

       220
       220
       +
       		errorTask(c, "Checking wakatime config file")

     

       221
       221
       +
       		return errors.New("wow! your config file seems to be messed up and doesn't have a settings heading; can you follow the instructions at " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + " to regenerate it?\n\nThe raw error we got was: " + err.Error())

     

       222
       222
       +
       	}

     

       223
       223
       +
       	completeTask(c, "Checking wakatime config file")

     

       224
       224
       +
       

     

       225
       225
       +
       	printTask(c, "Verifying API credentials")

     

       226
       226
       +
       

     

       227
       227
       +
       	api_key := settings.Key("api_key").String()

     

       228
       228
       +
       	api_url := settings.Key("api_url").String()

     

       229
       229
       +
       	if api_key == "" {

     

       230
       230
       +
       		errorTask(c, "Verifying API credentials")

     

       231
       231
       +
       		return errors.New("hmm 🤔 looks like you don't have an api_key in your config file? are you sure you have followed the setup instructions at " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + " correctly?")

     

       232
       232
       +
       	}

     

       233
       233
       +
       	if api_url == "" {

     

       234
       234
       +
       		errorTask(c, "Verifying API credentials")

     

       235
       235
       +
       		return errors.New("hmm 🤔 looks like you don't have an api_url in your config file? are you sure you have followed the setup instructions at " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + " correctly?")

     

       236
       236
       +
       	}

     

       237
       237
       +
       	completeTask(c, "Verifying API credentials")

     

       238
       238
       +
       

     

       239
       239
       +
       	printTask(c, "Validating API URL")

     

       240
       240
       +
       

     

       241
       241
       +
       	correctApiUrl := "https://hackatime.hackclub.com/api/hackatime/v1"

     

       242
       242
       +
       	if api_url != correctApiUrl {

     

       243
       243
       +
       		if api_url == "https://api.wakatime.com/api/v1" {

     

       244
       244
       +
       			client := wakatime.NewClient(api_key)

     

       245
       245
       +
       			_, err := client.GetStatusBar()

     

       246
       246
       +
       

     

       247
       247
       +
       			if !errors.Is(err, wakatime.ErrUnauthorized) {

     

       248
       248
       +
       				errorTask(c, "Validating API URL")

     

       249
       249
       +
       				return errors.New("turns out you were connected to wakatime.com instead of hackatime; since your key seems to work if you would like to keep syncing data to wakatime.com as well as to hackatime you can either setup a realy serve like " + styles.Muted.Render("https://github.com/JasonLovesDoggo/multitime") + " or you can wait for " + styles.Muted.Render("https://github.com/hackclub/hackatime/issues/85") + " to get merged in hackatime and have it synced there :)\n\nIf you want to import your wakatime.com data into hackatime then you can use hackatime v1 temporarily to connect your wakatime account and import (in settings under integrations at " + styles.Muted.Render("https://waka.hackclub.com") + ") and then click the import from hackatime v1 button at " + styles.Muted.Render("https://hackatime.hackclub.com/my/settings") + ".\n\n If you have more questions feel free to reach out to me (hackatime v1 creator) on slack (at @krn) or via email at me@dunkirk.sh")

     

       250
       250
       +
       			} else {

     

       251
       251
       +
       				errorTask(c, "Validating API URL")

     

       252
       252
       +
       				return errors.New("turns out your config is connected to the wrong api url and is trying to use wakatime.com to sync time but you don't have a working api key from them. Go to " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + " to run the setup script and fix your config file")

     

       51
       253
        
       			}

     

       254
       254
       +
       		}

     

       255
       255
       +
       		warnTask(c, "Validating API URL")

     

       256
       256
       +
       		c.Printf("\nYour api url %s doesn't match the expected url of %s however if you are using a custom forwarder or are sure you know what you are doing then you are probably fine\n\n", styles.Muted.Render(api_url), styles.Muted.Render(correctApiUrl))

     

       257
       257
       +
       	} else {

     

       258
       258
       +
       		completeTask(c, "Validating API URL")

     

       259
       259
       +
       	}

     

       52
       260
        
       

     

       53
       53
       -
       			api_key := settings.Key("api_key").String()

     

       54
       54
       -
       			api_url := settings.Key("api_url").String()

     

       55
       55
       -
       			if api_key == "" {

     

       56
       56
       -
       				return errors.New("hmm 🤔 looks like you don't have an api_key in your config file? are you sure you have followed the setup instructions at " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + " correctly?")

     

       261
       261
       +
       	client := wakatime.NewClientWithOptions(api_key, api_url)

     

       262
       262
       +
       	printTask(c, "Checking your coding stats for today")

     

       263
       263
       +
       

     

       264
       264
       +
       	duration, err := client.GetStatusBar()

     

       265
       265
       +
       	if err != nil {

     

       266
       266
       +
       		errorTask(c, "Checking your coding stats for today")

     

       267
       267
       +
       		if errors.Is(err, wakatime.ErrUnauthorized) {

     

       268
       268
       +
       			return errors.New("Your config file looks mostly correct and you have the correct api url but when we tested your api_key it looks like it is invalid? Can you double check if the key in your config file is the same as at " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + "?")

     

       269
       269
       +
       		}

     

       270
       270
       +
       

     

       271
       271
       +
       		return errors.New("Something weird happened with the hackatime api; if the error doesn't make sense then please contact @krn on slack or via email at me@dunkirk.sh\n\n" + styles.Bad.Render("Full error: "+err.Error()))

     

       272
       272
       +
       	}

     

       273
       273
       +
       	completeTask(c, "Checking your coding stats for today")

     

       274
       274
       +
       

     

       275
       275
       +
       	c.Printf("Sweet!!! Looks like your hackatime is configured properly! Looks like you have coded today for %s\n\n", styles.Fancy.Render(utils.PrettyPrintTime(duration.Data.GrandTotal.TotalSeconds)))

     

       276
       276
       +
       

     

       277
       277
       +
       	printTask(c, "Sending test heartbeat")

     

       278
       278
       +
       

     

       279
       279
       +
       	err = client.SendHeartbeat(testHeartbeat)

     

       280
       280
       +
       	if err != nil {

     

       281
       281
       +
       		errorTask(c, "Sending test heartbeat")

     

       282
       282
       +
       		return errors.New("oh dear; looks like something went wrong when sending that heartbeat. " + styles.Bad.Render("Full error: \""+strings.TrimSpace(err.Error())+"\""))

     

       283
       283
       +
       	}

     

       284
       284
       +
       	completeTask(c, "Sending test heartbeat")

     

       285
       285
       +
       

     

       286
       286
       +
       	c.Println("🥳 it worked! you are good to go! Happy coding 👋")

     

       287
       287
       +
       

     

       288
       288
       +
       	return nil

     

       289
       289
       +
       }

     

       290
       290
       +
       

     

       291
       291
       +
       func TestHeartbeat(c *cobra.Command, args []string) error {

     

       292
       292
       +
       	// Initialize a new context with task state

     

       293
       293
       +
       	c.SetContext(context.WithValue(context.Background(), "taskState", &taskState{}))

     

       294
       294
       +
       

     

       295
       295
       +
       	printTask(c, "Validating arguments")

     

       296
       296
       +
       

     

       297
       297
       +
       	api_key, api_url, err := getClientStuff(c)

     

       298
       298
       +
       

     

       299
       299
       +
       	completeTask(c, "Arguments look fine!")

     

       300
       300
       +
       

     

       301
       301
       +
       	printTask(c, "Loading api client")

     

       302
       302
       +
       

     

       303
       303
       +
       	client := wakatime.NewClientWithOptions(api_key, api_url)

     

       304
       304
       +
       	_, err = client.GetStatusBar()

     

       305
       305
       +
       	if err != nil {

     

       306
       306
       +
       		errorTask(c, "Loading api client")

     

       307
       307
       +
       		return err

     

       308
       308
       +
       	}

     

       309
       309
       +
       

     

       310
       310
       +
       	completeTask(c, "Loading api client")

     

       311
       311
       +
       

     

       312
       312
       +
       	c.Println("Sending a test heartbeat to", styles.Muted.Render(api_url))

     

       313
       313
       +
       

     

       314
       314
       +
       	printTask(c, "Sending test heartbeat")

     

       315
       315
       +
       

     

       316
       316
       +
       	err = client.SendHeartbeat(testHeartbeat)

     

       317
       317
       +
       

     

       318
       318
       +
       	if err != nil {

     

       319
       319
       +
       		errorTask(c, "Sending test heartbeat")

     

       320
       320
       +
       		return err

     

       321
       321
       +
       	}

     

       322
       322
       +
       

     

       323
       323
       +
       	completeTask(c, "Sending test heartbeat")

     

       324
       324
       +
       

     

       325
       325
       +
       	c.Println("❇️ test heartbeat sent!")

     

       326
       326
       +
       

     

       327
       327
       +
       	return nil

     

       328
       328
       +
       }

     

       329
       329
       +
       

     

       330
       330
       +
       func Status(c *cobra.Command, args []string) error {

     

       331
       331
       +
       	// Initialize a new context with task state

     

       332
       332
       +
       	c.SetContext(context.WithValue(context.Background(), "taskState", &taskState{}))

     

       333
       333
       +
       

     

       334
       334
       +
       	printTask(c, "Validating arguments")

     

       335
       335
       +
       

     

       336
       336
       +
       	api_key, api_url, err := getClientStuff(c)

     

       337
       337
       +
       

     

       338
       338
       +
       	completeTask(c, "Arguments look fine!")

     

       339
       339
       +
       

     

       340
       340
       +
       	printTask(c, "Loading api client")

     

       341
       341
       +
       

     

       342
       342
       +
       	client := wakatime.NewClientWithOptions(api_key, api_url)

     

       343
       343
       +
       	status, err := client.GetStatusBar()

     

       344
       344
       +
       	if err != nil {

     

       345
       345
       +
       		errorTask(c, "Loading api client")

     

       346
       346
       +
       		return err

     

       347
       347
       +
       	}

     

       348
       348
       +
       

     

       349
       349
       +
       	completeTask(c, "Loading api client")

     

       350
       350
       +
       

     

       351
       351
       +
       	c.Printf("\nLooks like you have coded today for %s today!\n", styles.Fancy.Render(utils.PrettyPrintTime(status.Data.GrandTotal.TotalSeconds)))

     

       352
       352
       +
       

     

       353
       353
       +
       	summary, err := client.GetLast7Days()

     

       354
       354
       +
       	if err != nil {

     

       355
       355
       +
       		return err

     

       356
       356
       +
       	}

     

       357
       357
       +
       

     

       358
       358
       +
       	c.Printf("You have averaged %s over the last 7 days\n\n", styles.Fancy.Render(utils.PrettyPrintTime(int(summary.Data.DailyAverage))))

     

       359
       359
       +
       

     

       360
       360
       +
       	// Display top 5 projects with progress bars

     

       361
       361
       +
       	if len(summary.Data.Projects) > 0 {

     

       362
       362
       +
       		c.Println(styles.Fancy.Render("Top Projects:"))

     

       363
       363
       +
       

     

       364
       364
       +
       		// Determine how many projects to show (up to 5)

     

       365
       365
       +
       		count := min(5, len(summary.Data.Projects))

     

       366
       366
       +
       

     

       367
       367
       +
       		// Find the longest project name for formatting

     

       368
       368
       +
       		longestName := 0

     

       369
       369
       +
       		longestTime := 0

     

       370
       370
       +
       

     

       371
       371
       +
       		for i := range count {

     

       372
       372
       +
       			project := summary.Data.Projects[i]

     

       373
       373
       +
       			if len(project.Name) > longestName {

     

       374
       374
       +
       				longestName = len(project.Name)

     

       57
       375
        
       			}

     

       58
       58
       -
       			if api_url == "" {

     

       59
       59
       -
       				return errors.New("hmm 🤔 looks like you don't have an api_url in your config file? are you sure you have followed the setup instructions at " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + " correctly?")

     

       376
       376
       +
       

     

       377
       377
       +
       			timeStr := utils.PrettyPrintTime(int(project.TotalSeconds))

     

       378
       378
       +
       			if len(timeStr) > longestTime {

     

       379
       379
       +
       				longestTime = len(timeStr)

     

       60
       380
        
       			}

     

       381
       381
       +
       		}

     

       61
       382
        
       

     

       62
       62
       -
       			correctApiUrl := "https://hackatime.hackclub.com/api/hackatime/v1"

     

       63
       63
       -
       			if api_url != correctApiUrl {

     

       64
       64
       -
       				if api_url == "https://api.wakatime.com/api/v1" {

     

       65
       65
       -
       					client := wakatime.NewClient(api_key)

     

       66
       66
       -
       					_, err := client.GetStatusBar()

     

       383
       383
       +
       		// Display each project with a bar

     

       384
       384
       +
       		for i := range count {

     

       385
       385
       +
       			project := summary.Data.Projects[i]

     

       67
       386
        
       

     

       68
       68
       -
       					if !errors.Is(err, wakatime.ErrUnauthorized) {

     

       69
       69
       -
       						return errors.New("turns out you were connected to wakatime.com instead of hackatime; since your key seems to work if you would like to keep syncing data to wakatime.com as well as to hackatime you can either setup a realy serve like " + styles.Muted.Render("https://github.com/JasonLovesDoggo/multitime") + " or you can wait for " + styles.Muted.Render("https://github.com/hackclub/hackatime/issues/85") + " to get merged in hackatime and have it synced there :)\n\nIf you want to import your wakatime.com data into hackatime then you can use hackatime v1 temporarily to connect your wakatime account and import (in settings under integrations at " + styles.Muted.Render("https://waka.hackclub.com") + ") and then click the import from hackatime v1 button at " + styles.Muted.Render("https://hackatime.hackclub.com/my/settings") + ".\n\n If you have more questions feel free to reach out to me (hackatime v1 creator) on slack (at @krn) or via email at me@dunkirk.sh")

     

       70
       70
       -
       					} else {

     

       71
       71
       -
       						return errors.New("turns out your config is connected to the wrong api url and is trying to use wakatime.com to sync time but you don't have a working api key from them. Go to " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + " to run the setup script and fix your config file")

     

       72
       72
       -
       					}

     

       387
       387
       +
       			// Format the project name and time with padding

     

       388
       388
       +
       			paddedName := fmt.Sprintf("%-*s", longestName+2, project.Name)

     

       389
       389
       +
       			timeStr := utils.PrettyPrintTime(int(project.TotalSeconds))

     

       390
       390
       +
       			paddedTime := fmt.Sprintf("%-*s", longestTime+2, timeStr)

     

       391
       391
       +
       

     

       392
       392
       +
       			// Create the progress bar

     

       393
       393
       +
       			barWidth := 25

     

       394
       394
       +
       			bar := ""

     

       395
       395
       +
       			percentage := project.Percent

     

       396
       396
       +
       			for j := range barWidth {

     

       397
       397
       +
       				if float64(j) < percentage/(100/float64(barWidth)) {

     

       398
       398
       +
       					bar += "█"

     

       399
       399
       +
       				} else {

     

       400
       400
       +
       					bar += "░"

     

       73
       401
        
       				}

     

       74
       74
       -
       				c.Println("\nYour api url", styles.Muted.Render(api_url), "doesn't match the expected url of", styles.Muted.Render(correctApiUrl), "however if you are using a custom forwarder or are sure you know what you are doing then you are probably fine")

     

       75
       402
        
       			}

     

       76
       403
        
       

     

       77
       77
       -
       			client := wakatime.NewClientWithOptions(api_key, api_url)

     

       78
       78
       -
       			c.Println("\nChecking your coding stats for today...")

     

       79
       79
       -
       			duration, err := client.GetStatusBar()

     

       80
       80
       -
       			if err != nil {

     

       81
       81
       -
       				if errors.Is(err, wakatime.ErrUnauthorized) {

     

       82
       82
       -
       					return errors.New("Your config file looks mostly correct and you have the correct api url but when we tested your api_key it looks like it is invalid? Can you double check if the key in your config file is the same as at " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + "?")

     

       83
       83
       -
       				}

     

       404
       404
       +
       			// Use different styles for different components

     

       405
       405
       +
       			styledName := styles.Fancy.Render(paddedName)

     

       406
       406
       +
       			styledTime := styles.Muted.Render(paddedTime)

     

       407
       407
       +
       			styledBar := styles.Success.Render(bar)

     

       408
       408
       +
       			styledPercent := styles.Warn.Render(fmt.Sprintf("%.2f%%", percentage))

     

       84
       409
        
       

     

       85
       85
       -
       				return errors.New("Something weird happened with the hackatime api; if the error doesn't make sense then please contact @krn on slack or via email at me@dunkirk.sh\n\n" + styles.Bad.Render("Full error: "+err.Error()))

     

       86
       86
       -
       			}

     

       410
       410
       +
       			// Print the formatted line

     

       411
       411
       +
       			c.Printf("  %s %s %s  %s\n", styledName, styledTime, styledBar, styledPercent)

     

       412
       412
       +
       		}

     

       87
       413
        
       

     

       88
       88
       -
       			// Convert seconds to a formatted time string (hours, minutes, seconds)

     

       89
       89
       -
       			totalSeconds := duration.Data.GrandTotal.TotalSeconds

     

       90
       90
       -
       			hours := totalSeconds / 3600

     

       91
       91
       -
       			minutes := (totalSeconds % 3600) / 60

     

       92
       92
       -
       			seconds := totalSeconds % 60

     

       414
       414
       +
       		c.Println()

     

       415
       415
       +
       	}

     

       93
       416
        
       

     

       94
       94
       -
       			formattedTime := ""

     

       95
       95
       -
       			if hours > 0 {

     

       96
       96
       -
       				formattedTime += fmt.Sprintf("%d hours, ", hours)

     

       417
       417
       +
       	// Display top 5 languages with progress bars

     

       418
       418
       +
       	if len(summary.Data.Languages) > 0 {

     

       419
       419
       +
       		c.Println(styles.Fancy.Render("Top Languages:"))

     

       420
       420
       +
       

     

       421
       421
       +
       		// Determine how many languages to show (up to 5)

     

       422
       422
       +
       		count := min(5, len(summary.Data.Languages))

     

       423
       423
       +
       

     

       424
       424
       +
       		// Find the longest language name for formatting

     

       425
       425
       +
       		longestName := 0

     

       426
       426
       +
       		longestTime := 0

     

       427
       427
       +
       

     

       428
       428
       +
       		for i := range count {

     

       429
       429
       +
       			language := summary.Data.Languages[i]

     

       430
       430
       +
       			if len(language.Name) > longestName {

     

       431
       431
       +
       				longestName = len(language.Name)

     

       97
       432
        
       			}

     

       98
       98
       -
       			if minutes > 0 || hours > 0 {

     

       99
       99
       -
       				formattedTime += fmt.Sprintf("%d minutes, ", minutes)

     

       433
       433
       +
       

     

       434
       434
       +
       			timeStr := utils.PrettyPrintTime(int(language.TotalSeconds))

     

       435
       435
       +
       			if len(timeStr) > longestTime {

     

       436
       436
       +
       				longestTime = len(timeStr)

     

       100
       437
        
       			}

     

       101
       101
       -
       			formattedTime += fmt.Sprintf("%d seconds", seconds)

     

       438
       438
       +
       		}

     

       102
       439
        
       

     

       103
       103
       -
       			c.Println("\nSweet!!! Looks like your hackatime is configured properly! Looks like you have coded today for", styles.Fancy.Render(formattedTime))

     

       440
       440
       +
       		// Display each language with a bar

     

       441
       441
       +
       		for i := range count {

     

       442
       442
       +
       			language := summary.Data.Languages[i]

     

       104
       443
        
       

     

       105
       105
       -
       			c.Println("\nSending one quick heartbeat to make sure everything is ship shape and then you should be good to go!")

     

       444
       444
       +
       			// Format the language name and time with padding

     

       445
       445
       +
       			paddedName := fmt.Sprintf("%-*s", longestName+2, language.Name)

     

       446
       446
       +
       			timeStr := utils.PrettyPrintTime(int(language.TotalSeconds))

     

       447
       447
       +
       			paddedTime := fmt.Sprintf("%-*s", longestTime+2, timeStr)

     

       106
       448
        
       

     

       107
       107
       -
       			err = client.SendHeartbeat(wakatime.Heartbeat{

     

       108
       108
       -
       				Branch:           "main",

     

       109
       109
       -
       				Category:         "coding",

     

       110
       110
       -
       				CursorPos:        1,

     

       111
       111
       -
       				Entity:           filepath.Join(user_dir, "akami.txt"),

     

       112
       112
       -
       				Type:             "file",

     

       113
       113
       -
       				IsWrite:          true,

     

       114
       114
       -
       				Language:         "Go",

     

       115
       115
       -
       				LineNo:           1,

     

       116
       116
       -
       				LineCount:        4,

     

       117
       117
       -
       				Project:          "example",

     

       118
       118
       -
       				ProjectRootCount: 3,

     

       119
       119
       -
       				Time:             float64(time.Now().Unix()),

     

       120
       120
       -
       			})

     

       121
       121
       -
       			if err != nil {

     

       122
       122
       -
       				return errors.New("oh dear; looks like something went wrong when sending that heartbeat. " + styles.Bad.Render("Full error: \""+strings.TrimSpace(err.Error())+"\""))

     

       449
       449
       +
       			// Create the progress bar

     

       450
       450
       +
       			barWidth := 25

     

       451
       451
       +
       			bar := ""

     

       452
       452
       +
       			percentage := language.Percent

     

       453
       453
       +
       			for j := range barWidth {

     

       454
       454
       +
       				if float64(j) < percentage/(100/float64(barWidth)) {

     

       455
       455
       +
       					bar += "█"

     

       456
       456
       +
       				} else {

     

       457
       457
       +
       					bar += "░"

     

       458
       458
       +
       				}

     

       123
       459
        
       			}

     

       124
       460
        
       

     

       125
       125
       -
       			c.Println("\n🥳 it worked! you are good to go! Happy coding 👋")

     

       461
       461
       +
       			// Use different styles for different components

     

       462
       462
       +
       			styledName := styles.Fancy.Render(paddedName)

     

       463
       463
       +
       			styledTime := styles.Muted.Render(paddedTime)

     

       464
       464
       +
       			styledBar := styles.Success.Render(bar)

     

       465
       465
       +
       			styledPercent := styles.Warn.Render(fmt.Sprintf("%.2f%%", percentage))

     

       466
       466
       +
       

     

       467
       467
       +
       			// Print the formatted line

     

       468
       468
       +
       			c.Printf("  %s %s %s  %s\n", styledName, styledTime, styledBar, styledPercent)

     

       469
       469
       +
       		}

     

       126
       470
        
       

     

       127
       127
       -
       			return nil

     

       128
       128
       -
       		},

     

       471
       471
       +
       		c.Println()

     

       129
       472
        
       	}

     

       473
       473
       +
       

     

       474
       474
       +
       	return nil

     

       130
       475
        
       }

+23 -1

main.go

···

       26
       26
        
       	}

     

       27
       27
        
       

     

       28
       28
        
       	// diagnose command

     

       29
       29
       -
       	cmd.AddCommand(handler.Doctor())

     

       29
       29
       +
       	cmd.AddCommand(&cobra.Command{

     

       30
       30
       +
       		Use:   "doc",

     

       31
       31
       +
       		Short: "diagnose potential hackatime issues",

     

       32
       32
       +
       		RunE:  handler.Doctor,

     

       33
       33
       +
       		Args:  cobra.NoArgs,

     

       34
       34
       +
       	})

     

       35
       35
       +
       

     

       36
       36
       +
       	cmd.AddCommand(&cobra.Command{

     

       37
       37
       +
       		Use:   "test",

     

       38
       38
       +
       		Short: "send a test heartbeat to hackatime or whatever api url you provide",

     

       39
       39
       +
       		RunE:  handler.TestHeartbeat,

     

       40
       40
       +
       		Args:  cobra.NoArgs,

     

       41
       41
       +
       	})

     

       42
       42
       +
       

     

       43
       43
       +
       	cmd.AddCommand(&cobra.Command{

     

       44
       44
       +
       		Use:   "status",

     

       45
       45
       +
       		Short: "get your hackatime stats",

     

       46
       46
       +
       		RunE:  handler.Status,

     

       47
       47
       +
       		Args:  cobra.NoArgs,

     

       48
       48
       +
       	})

     

       49
       49
       +
       

     

       50
       50
       +
       	cmd.PersistentFlags().StringP("url", "u", "", "The base url for the hackatime client")

     

       51
       51
       +
       	cmd.PersistentFlags().StringP("key", "k", "", "API key to use for authentication")

     

       30
       52
        
       

     

       31
       53
        
       	// this is where we get the fancy fang magic ✨

     

       32
       54
        
       	if err := fang.Execute(

styles/main.go

···

       5
       5
        
       var Fancy = lipgloss.NewStyle().Foreground(lipgloss.Magenta).Bold(true).Italic(true)

     

       6
       6
        
       var Muted = lipgloss.NewStyle().Foreground(lipgloss.BrightBlue).Italic(true)

     

       7
       7
        
       var Bad = lipgloss.NewStyle().Foreground(lipgloss.BrightRed).Bold(true)

     

       8
       8
       +
       var Success = lipgloss.NewStyle().Foreground(lipgloss.Green).Bold(true)

     

       9
       9
       +
       var Warn = lipgloss.NewStyle().Foreground(lipgloss.Yellow).Bold(true)

+22

utils/main.go

···

       1
       1
       +
       package utils

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       )

     

       6
       6
       +
       

     

       7
       7
       +
       func PrettyPrintTime(totalSeconds int) string {

     

       8
       8
       +
       	hours := totalSeconds / 3600

     

       9
       9
       +
       	minutes := (totalSeconds % 3600) / 60

     

       10
       10
       +
       	seconds := totalSeconds % 60

     

       11
       11
       +
       

     

       12
       12
       +
       	formattedTime := ""

     

       13
       13
       +
       	if hours > 0 {

     

       14
       14
       +
       		formattedTime += fmt.Sprintf("%d hours, ", hours)

     

       15
       15
       +
       	}

     

       16
       16
       +
       	if minutes > 0 || hours > 0 {

     

       17
       17
       +
       		formattedTime += fmt.Sprintf("%d minutes, ", minutes)

     

       18
       18
       +
       	}

     

       19
       19
       +
       	formattedTime += fmt.Sprintf("%d seconds", seconds)

     

       20
       20
       +
       

     

       21
       21
       +
       	return formattedTime

     

       22
       22
       +
       }

+99 -1

wakatime/main.go

···

       10
       10
        
       	"fmt"

     

       11
       11
        
       	"net/http"

     

       12
       12
        
       	"runtime"

     

       13
       13
       +
       	"strings"

     

       13
       14
        
       	"time"

     

       14
       15
        
       )

     

       15
       16
        
       

     
···

       32
       33
        
       	ErrDecodingResponse = fmt.Errorf("failed to decode API response")

     

       33
       34
        
       	// ErrUnauthorized occurs when the API rejects the provided credentials

     

       34
       35
        
       	ErrUnauthorized = fmt.Errorf("unauthorized: invalid API key or insufficient permissions")

     

       36
       36
       +
       	// ErrNotFound occurs when the config file isn't found

     

       37
       37
       +
       	ErrNotFound = fmt.Errorf("config file not found")

     

       38
       38
       +
       	// ErrBrokenConfig occurs when there is no settings section in the config

     

       39
       39
       +
       	ErrBrokenConfig = fmt.Errorf("invalid config file: missing settings section")

     

       40
       40
       +
       	// ErrNoApiKey occurs when the api key is missing from the config

     

       41
       41
       +
       	ErrNoApiKey = fmt.Errorf("no API key found in config file")

     

       42
       42
       +
       	// ErrNoApiURL occurs when the api url is missing from the config

     

       43
       43
       +
       	ErrNoApiURL = fmt.Errorf("no API URL found in config file")

     

       35
       44
        
       )

     

       36
       45
        
       

     

       37
       46
        
       // Client represents a WakaTime API client with authentication and connection settings.

     
···

       59
       68
        
       func NewClientWithOptions(apiKey string, apiURL string) *Client {

     

       60
       69
        
       	return &Client{

     

       61
       70
        
       		APIKey:     apiKey,

     

       62
       62
       -
       		APIURL:     apiURL,

     

       71
       71
       +
       		APIURL:     strings.TrimSuffix(apiURL, "/"),

     

       63
       72
        
       		HTTPClient: &http.Client{Timeout: 10 * time.Second},

     

       64
       73
        
       	}

     

       65
       74
        
       }

     
···

       203
       212
        
       

     

       204
       213
        
       	return durationResp, nil

     

       205
       214
        
       }

     

       215
       215
       +
       

     

       216
       216
       +
       // Last7DaysResponse represents the response from the WakaTime Last 7 Days API endpoint.

     

       217
       217
       +
       // This contains detailed information about a user's coding activity over the past 7 days.

     

       218
       218
       +
       type Last7DaysResponse struct {

     

       219
       219
       +
       	// Data contains coding statistics for the last 7 days

     

       220
       220
       +
       	Data struct {

     

       221
       221
       +
       		// TotalSeconds is the total time spent coding in seconds

     

       222
       222
       +
       		TotalSeconds float64 `json:"total_seconds"`

     

       223
       223
       +
       		// HumanReadableTotal is the human-readable representation of the total coding time

     

       224
       224
       +
       		HumanReadableTotal string `json:"human_readable_total"`

     

       225
       225
       +
       		// DailyAverage is the average time spent coding per day in seconds

     

       226
       226
       +
       		DailyAverage float64 `json:"daily_average"`

     

       227
       227
       +
       		// HumanReadableDailyAverage is the human-readable representation of the daily average

     

       228
       228
       +
       		HumanReadableDailyAverage string `json:"human_readable_daily_average"`

     

       229
       229
       +
       		// Languages is a list of programming languages used with statistics

     

       230
       230
       +
       		Languages []struct {

     

       231
       231
       +
       			// Name is the programming language name

     

       232
       232
       +
       			Name string `json:"name"`

     

       233
       233
       +
       			// TotalSeconds is the time spent coding in this language in seconds

     

       234
       234
       +
       			TotalSeconds float64 `json:"total_seconds"`

     

       235
       235
       +
       			// Percent is the percentage of time spent in this language

     

       236
       236
       +
       			Percent float64 `json:"percent"`

     

       237
       237
       +
       			// Text is the human-readable representation of time spent in this language

     

       238
       238
       +
       			Text string `json:"text"`

     

       239
       239
       +
       		} `json:"languages"`

     

       240
       240
       +
       		// Editors is a list of editors used with statistics

     

       241
       241
       +
       		Editors []struct {

     

       242
       242
       +
       			// Name is the editor name

     

       243
       243
       +
       			Name string `json:"name"`

     

       244
       244
       +
       			// TotalSeconds is the time spent using this editor in seconds

     

       245
       245
       +
       			TotalSeconds float64 `json:"total_seconds"`

     

       246
       246
       +
       			// Percent is the percentage of time spent using this editor

     

       247
       247
       +
       			Percent float64 `json:"percent"`

     

       248
       248
       +
       			// Text is the human-readable representation of time spent using this editor

     

       249
       249
       +
       			Text string `json:"text"`

     

       250
       250
       +
       		} `json:"editors"`

     

       251
       251
       +
       		// Projects is a list of projects worked on with statistics

     

       252
       252
       +
       		Projects []struct {

     

       253
       253
       +
       			// Name is the project name

     

       254
       254
       +
       			Name string `json:"name"`

     

       255
       255
       +
       			// TotalSeconds is the time spent on this project in seconds

     

       256
       256
       +
       			TotalSeconds float64 `json:"total_seconds"`

     

       257
       257
       +
       			// Percent is the percentage of time spent on this project

     

       258
       258
       +
       			Percent float64 `json:"percent"`

     

       259
       259
       +
       			// Text is the human-readable representation of time spent on this project

     

       260
       260
       +
       			Text string `json:"text"`

     

       261
       261
       +
       		} `json:"projects"`

     

       262
       262
       +
       	} `json:"data"`

     

       263
       263
       +
       }

     

       264
       264
       +
       

     

       265
       265
       +
       // GetLast7Days retrieves a user's coding activity summary for the past 7 days from the WakaTime API.

     

       266
       266
       +
       // It returns a Last7DaysResponse and an error if the request fails or returns a non-success status code.

     

       267
       267
       +
       func (c *Client) GetLast7Days() (Last7DaysResponse, error) {

     

       268
       268
       +
       	req, err := http.NewRequest("GET", fmt.Sprintf("%s/users/current/stats/last_7_days", c.APIURL), nil)

     

       269
       269
       +
       	if err != nil {

     

       270
       270
       +
       		return Last7DaysResponse{}, fmt.Errorf("%w: %v", ErrCreatingRequest, err)

     

       271
       271
       +
       	}

     

       272
       272
       +
       

     

       273
       273
       +
       	req.Header.Set("Accept", "application/json")

     

       274
       274
       +
       	req.Header.Set("Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(c.APIKey)))

     

       275
       275
       +
       

     

       276
       276
       +
       	resp, err := c.HTTPClient.Do(req)

     

       277
       277
       +
       	if err != nil {

     

       278
       278
       +
       		return Last7DaysResponse{}, fmt.Errorf("%w: %v", ErrSendingRequest, err)

     

       279
       279
       +
       	}

     

       280
       280
       +
       	defer resp.Body.Close()

     

       281
       281
       +
       

     

       282
       282
       +
       	// Read the response body for potential error messages

     

       283
       283
       +
       	var respBody bytes.Buffer

     

       284
       284
       +
       	_, err = respBody.ReadFrom(resp.Body)

     

       285
       285
       +
       	if err != nil {

     

       286
       286
       +
       		return Last7DaysResponse{}, fmt.Errorf("failed to read response body: %v", err)

     

       287
       287
       +
       	}

     

       288
       288
       +
       

     

       289
       289
       +
       	respContent := respBody.String()

     

       290
       290
       +
       

     

       291
       291
       +
       	if resp.StatusCode == http.StatusUnauthorized {

     

       292
       292
       +
       		return Last7DaysResponse{}, fmt.Errorf("%w: %s", ErrUnauthorized, respContent)

     

       293
       293
       +
       	} else if resp.StatusCode < 200 || resp.StatusCode >= 300 {

     

       294
       294
       +
       		return Last7DaysResponse{}, fmt.Errorf("%w: status code %d, response: %s", ErrInvalidStatusCode, resp.StatusCode, respContent)

     

       295
       295
       +
       	}

     

       296
       296
       +
       

     

       297
       297
       +
       	var statsResp Last7DaysResponse

     

       298
       298
       +
       	if err := json.Unmarshal(respBody.Bytes(), &statsResp); err != nil {

     

       299
       299
       +
       		return Last7DaysResponse{}, fmt.Errorf("%w: %v, response: %s", ErrDecodingResponse, err, respContent)

     

       300
       300
       +
       	}

     

       301
       301
       +
       

     

       302
       302
       +
       	return statsResp, nil

     

       303
       303
       +
       }

Compare changes