Merge pull request #13 from CosmicPredator/develop

Version 1.0.4

Author: CosmicPredator

.github/workflows/build.yml

@@ -1,8 +1,6 @@
 name: Build (Multiple Arch)
 
 on:
-  push:
-    branches: [ develop ]
   pull_request: 
     branches: [ develop ]
   workflow_dispatch:

.github/workflows/create_release.yml

@@ -2,13 +2,13 @@ name: Release (Multiple Arch)
 
 on:
   push:
-    branches: [ prod ]
-  pull_request: 
-    branches: [ prod ]
+    tags:
+      - "*"
   workflow_dispatch:
 
 jobs:
   build_release:
+    name: Run Make Build
     permissions: write-all
     runs-on: ubuntu-latest
     steps:
@@ -17,6 +17,16 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Cache Go Modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/go/pkg/mod
+            ~/.cache/go-build
+          key: go-mod-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            go-mod-${{ runner.os }}-
+
       - name: Run Make
         run: make BUILD_TYPE=RELEASE
 
@@ -32,13 +42,22 @@ jobs:
   build_win_installer:
     needs: build_release
     runs-on: windows-latest
+    name: Build Windows Installer (INNO)
     permissions: write-all
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Read Version
+        id: read_version
+        shell: pwsh
+        run: |
+          $TAG = git describe --tags --abbrev=0
+          echo "Current tag: $TAG"
+          echo "V_TAG=$TAG" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      
       - name: Download Artifact
         uses: actions/download-artifact@v4
         with:
@@ -48,17 +67,23 @@ jobs:
 
       - name: Rename Binary
         shell: cmd
-        run: ren build\chibi_windows.exe chibi.exe
+        run: ren build\chibi_${{ env.V_TAG }}_win_amd64.exe chibi.exe
 
       - name: Pack Installer
         uses: Minionguyjpro/[email protected]
+        env:
+          V_TAG: ${{ env.V_TAG }}
         with:
           path: installer_scripts\chibi_setup.iss
           options: /O+
 
       - name: Move installer to build dir
         shell: cmd
-        run: move installer_scripts\Output\chibi_installer.exe build\
+        run: move installer_scripts\Output\chibi_${{ env.V_TAG }}_installer.exe build\
+      
+      - name: Rename Binary (Again)
+        shell: cmd
+        run: ren build\chibi.exe chibi_${{ env.V_TAG }}_win_amd64.exe
 
       - name: Upload Installer Artifacts
         uses: actions/upload-artifact@v4
@@ -67,6 +92,7 @@ jobs:
           path: build
 
   create_release:
+    name: Publish new Release
     needs: build_win_installer
     permissions: write-all
     runs-on: ubuntu-latest
@@ -111,4 +137,81 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           release-tag: ${{ env.tag }}
-          files: "build/*"
+          files: "build/*"
+
+  publish_to_winget:
+    needs: create_release
+    permissions: write-all
+    runs-on: windows-latest
+    name: Publish installer to WinGet
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      
+      - name: Publish to WinGet
+        uses: vedantmgoyal9/winget-releaser@main
+        with:
+          identifier: CosmicPredator.Chibi
+          installers-regex: '.*_installer\.exe$'
+          token: ${{ secrets.WINGET_TOKEN }} 
+
+  publish_to_snap_store:
+    needs: create_release
+    runs-on: ubuntu-latest
+    name: Publish to Snap Store
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      
+      - name: Read Tag
+        id: read_version
+        run: |
+          TAG=$(git describe --tags --abbrev=0)
+          echo "Current tag: $TAG"
+          echo "tag=$TAG" >> $GITHUB_ENV
+
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: build_artifacts_with_installer
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path: build/
+      
+      - name: Rename Linux Binary
+        run: |
+          mv build/chibi_${{ env.tag }}_linux_amd64 build/chibi
+          sudo chmod 777 build/chibi
+          echo "Rename binary successful"
+      
+      - name: Move snapcraft.yaml file to root
+        run: |
+          mv installer_scripts/snapcraft.yaml snapcraft.yaml
+          echo "version: ${{ env.tag }}" >> snapcraft.yaml 
+
+      - name: Install Snapcraft
+        run: |
+          sudo snap install snapcraft --classic
+
+      - name: Setup LXD
+        uses: canonical/setup-lxd@main
+        with:
+          group: lxd
+      
+      - name: Build snap
+        run: |
+          sudo usermod -a -G lxd $USER
+          sudo snapcraft
+
+      - name: Upload snap to Snap Store
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
+        run: |
+          sudo snap install snapcraft --classic
+          snapcraft upload *.snap --release=candidate
+          
+
+      

CHANGELOG.md

@@ -1,16 +1,22 @@
 ### ✨ What's New
-- The `ls` command now shows Rewatching/Rereading Media along with Current Media. The Rewatching/Rereading media will be marked by **"(R)"** before the media title.
-- You can now pass incremental or decremental progress to `update` command. For example,
+- Chibi is now available in Snap Store for Linux users. To install chibi, run
+    ```shell
+    sudo snap install chibi
+- Added Loading indicator to all API Requests.
+- Added `chibi logout` command to log you out from AniList.
+- Start Date is automatically added when `chibi add` command in invoked and `status` flag is set to `watching`.
+- `chibi update` command now supports 2 new flags,
+    - `-n "<note>"` for entry notes.
+    - `-r <score>` for entry score.
 
-  To increment progress of a media by 2,
-  ```shell
-  $ chibi update 8861 -p +2
-  ```
-
-  To decrement progress of a media by 5,
-  ```shell
-  $ chibi update 8861 -p -5
-  ```
+### ✨ Other Changes
+- Migrated from JSON file storage to Sqlite3 storage for configurations.
+- Complete Architecture change for faster response.
+- Added Code Comments in missing areas
 
 ### 🐛 Bug Fixes
-- None for now 👽️
+- Fixed a bad `if` check when handling start date. (085fff237d04fde01e6b19d96078af2030ab1bbb)
+- Fixed app exiting with weird error messages.
+- Fixed "WinGet not detecting app version". This change will take effect when installing upcoming versions of chibi.
+
+Thanks @mist8kengas for the contributions ☺️.

Makefile

@@ -13,10 +13,11 @@ else
 	LDFLAGS:="-X 'main.VERSION=${LATEST_TAG}'"
 endif
 
-LINUX_BIN=${BINARY_NAME}_linux_amd64
-WIN_BIN=${BINARY_NAME}_windows.exe
-APPLE_INTEL_BIN=${BINARY_NAME}_darwin_amd64
-APPLE_SILICON_BIN=${BINARY_NAME}_darwin_arm64
+LINUX_BIN=${BINARY_NAME}_${LATEST_TAG}_linux_amd64
+WIN_BIN=${BINARY_NAME}_${LATEST_TAG}_win_amd64.exe
+WIN_ARM_BIN=${BINARY_NAME}_${LATEST_TAG}_win_arm64.exe
+APPLE_INTEL_BIN=${BINARY_NAME}_${LATEST_TAG}_darwin_amd64
+APPLE_SILICON_BIN=${BINARY_NAME}_${LATEST_TAG}_darwin_arm64
 
 .PHONY: all
 
@@ -31,6 +32,7 @@ compile:
 	GOARCH=amd64 GOOS=darwin go build -ldflags=${LDFLAGS} -o ${BUILD_DIR}/${APPLE_INTEL_BIN}
 	GOARCH=arm64 GOOS=darwin go build -ldflags=${LDFLAGS} -o ${BUILD_DIR}/${APPLE_SILICON_BIN}
 	GOARCH=amd64 GOOS=windows go build -ldflags=${LDFLAGS} -o ${BUILD_DIR}/${WIN_BIN}
+	GOARCH=arm64 GOOS=windows go build -ldflags=${LDFLAGS} -o ${BUILD_DIR}/${WIN_ARM_BIN}
 	GOARCH=amd64 GOOS=linux go build -ldflags=${LDFLAGS} -o ${BUILD_DIR}/${LINUX_BIN}
 
 #TODO: Implement dynamic versioning

README.md

@@ -1,12 +1,27 @@
+<div align=center>
+    <img width=150
+        src=https://i.imgur.com/qQ6Qs0v.png/>
+</div>
+
 <div align="center">
 <h1>Chibi for AniList</h1>
 <h2>A lightweight anime & manga tracker CLI app powered by AniList</h2>
 
+<div align="center">
+<a href="https://snapcraft.io/chibi">
+    <img alt="Get it from the Snap Store" src=https://snapcraft.io/en/dark/install.svg />
+</a>
+<a href="#windows-via-winget">
+    <img alt="Install for windows via winget" src=https://i.imgur.com/ENKa9Lv.png/>
+</a>
+</div>
+
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 ![Go](https://img.shields.io/badge/go-%2300ADD8.svg?style=flat&logo=go&logoColor=white)
 [![Build (Multiple Arch)](https://github.com/CosmicPredator/chibi-cli/actions/workflows/build.yml/badge.svg)](https://github.com/CosmicPredator/chibi-cli/actions/workflows/build.yml)
+[![Release (Multiple Arch)](https://github.com/CosmicPredator/chibi-cli/actions/workflows/create_release.yml/badge.svg?branch=prod)](https://github.com/CosmicPredator/chibi-cli/actions/workflows/create_release.yml)
 
-![Made with VHS](https://vhs.charm.sh/vhs-4o1iqUYYSVr7QIO5m9Q5nX.gif)
+<!-- ![Made with VHS](https://vhs.charm.sh/vhs-4o1iqUYYSVr7QIO5m9Q5nX.gif) -->
 
 </div>
 
@@ -27,6 +42,18 @@ This section provides the quickest way to get started with chibi-cli. For detail
 - Most modern terminals like **Windows Terminal**, **Gnome Terminal**, **Kitty** or **Alacritty** etc., should work.
 
 ### Quick Installation
+
+#### Linux (via snap store)
+```bash
+$ sudo snap install chibi
+```
+
+#### Windows (via winget)
+```pwsh
+PS C:\> winget install CosmicPredator.Chibi
+```
+
+#### Manual Installation
 - Download the binary for your OS from the [releases](https://github.com/CosmicPredator/chibi-cli/releases) page.
 
 - Open your favourite terminal in the directory where you downloaded chibi.
@@ -57,4 +84,4 @@ This project is not possible without the following libraries,
 - AniList - [Website](https://anilist.co)
 - spf13/cobra - [GitHub](https://github.com/spf13/cobra)
 - charmbracelet/huh - [GitHub](https://github.com/charmbracelet/huh)
-- charmbracelet/lipgloss - [GitHub](https://github.com/charmbracelet/lipgloss)
+- charmbracelet/lipgloss - [GitHub](https://github.com/charmbracelet/lipgloss)

cmd/cmd_add.go

@@ -1,70 +1,43 @@
 package cmd
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"strconv"
-	"time"
 
-	"github.com/CosmicPredator/chibi/internal"
+	"github.com/CosmicPredator/chibi/internal/ui"
+	"github.com/CosmicPredator/chibi/internal/viewmodel"
 	"github.com/spf13/cobra"
 )
 
 var mediaAddStatus string
 
-func handleMediaAdd(mediaId int) {
-	CheckIfTokenExists()
-
-	switch mediaAddStatus {
-	case "watching", "reading", "w", "r":
-		mediaAddStatus = "CURRENT"
-	case "planning", "p":
-		mediaAddStatus = "PLANNING"
-	case "completed", "c":
-		mediaAddStatus = "COMPLETED"
-	case "dropped", "d":
-		mediaAddStatus = "DROPPED"
-	case "paused", "ps":
-		mediaAddStatus = "PAUSED"
-	case "repeating", "rp":
-		mediaAddStatus = "REPEATING"
-	default:
-		mediaAddStatus = "CURRENT"
-	}
-
-	mediaUpdate := internal.NewMediaUpdate()
-	if mediaAddStatus == "CURRENT" {
-		currDate := fmt.Sprintf("%d/%d/%d", time.Now().Day(), time.Now().Month(), time.Now().Year())
-		err := mediaUpdate.Get(true, mediaId, "0", mediaAddStatus, currDate)
-		if err != nil {
-			ErrorMessage(err.Error())
-		}
-	} else {
-		err := mediaUpdate.Get(true, mediaId, "0", mediaAddStatus, "")
-		if err != nil {
-			ErrorMessage(err.Error())
-		}
+func handleMediaAdd(cmd *cobra.Command, args []string) {
+	mediaId, err := strconv.Atoi(args[0])
+	if err != nil {
+		fmt.Println(
+			ui.ErrorText(errors.New("invalid media ID. Please provide a valid one")),
+		)
+		os.Exit(0)
 	}
-
-	fmt.Println(
-		SUCCESS_MESSAGE_TEMPLATE.Render("Done ✅"),
+	err = viewmodel.HandleMediaUpdate(
+		viewmodel.MediaUpdateParams{
+			IsNewAddition: true,
+			MediaId:       mediaId,
+			Status:        mediaAddStatus,
+		},
 	)
+	if err != nil {
+		fmt.Println(ui.ErrorText(err))
+	}
 }
 
 var mediaAddCmd = &cobra.Command{
 	Use:   "add [id]",
 	Short: "Add a media to your list",
 	Args:  cobra.ExactArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		mediaId, err := strconv.Atoi(args[0])
-		if err != nil {
-			fmt.Println(ERROR_MESSAGE_TEMPLATE.Render(
-				"Invalid media ID. Please provide a valid one",
-			))
-			os.Exit(0)
-		}
-		handleMediaAdd(mediaId)
-	},
+	Run:   handleMediaAdd,
 }
 
 func init() {