24 changed files with 101 additions and 628 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,8 +0,0 @@
-/**
-
-!main.go
-!/lib
-!/templates
-!/static
-!/go.mod
-!/go.sum
--- a/.gitignore
+++ b/.gitignore
@ -2,5 +2,4 @@ snapshots.dat
 .env
 dist
 data.db
-data.sqlite
-dev_data
+data.sqlite
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -1,15 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Launch Package",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "${workspaceFolder}"
-        }
-    ]
-}
--- a/65
+++ b/65
@ -1,65 +0,0 @@
-# === Build Stage ===
-FROM debian:bullseye-slim AS builder
-ENV IS_DOCKER TRUE
-
-LABEL org.opencontainers.image.source https://github.com/JustKato/drive-health
-
-# Install build dependencies and runtime dependencies
-RUN apt-get update && apt-get install -y \
-    gcc \
-    musl-dev \
-    libsqlite3-dev \
-    libsqlite3-0 \
-    wget \
-    && rm -rf /var/lib/apt/lists/*
-
-# Manually install Go 1.21
-ENV GOLANG_VERSION 1.21.0
-RUN wget https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz -O go.tgz \
-    && tar -C /usr/local -xzf go.tgz \
-    && rm go.tgz
-ENV PATH /usr/local/go/bin:$PATH
-
-# Set the environment variable for Go
-ENV GOPATH=/go
-ENV PATH=$GOPATH/bin:$PATH
-ENV GO111MODULE=on
-
-# Create the directory and set it as the working directory
-WORKDIR /app
-
-# Copy the Go files and download dependencies
-COPY go.mod go.sum ./
-RUN go mod download
-
-# Copy the source from the current directory to the Working Directory inside the container
-COPY . .
-
-# Build the Go app
-RUN go build -o drive-health
-
-# Cleanup build dependencies to reduce image size
-RUN apt-get purge -y gcc musl-dev libsqlite3-dev wget \
-    && apt-get autoremove -y \
-    && apt-get clean
-
-# === Final Stage ===
-FROM debian:bullseye-slim AS final
-
-# Set the environment variable
-ENV IS_DOCKER TRUE
-
-# Create the directory and set it as the working directory
-WORKDIR /app
-
-# Copy only the necessary files from the builder stage
-COPY --from=builder /app/drive-health .
-
-# Expose the necessary port
-EXPOSE 8080
-
-# Volume for external data
-VOLUME [ "/data" ]
-
-# Command to run the executable
-CMD ["./drive-health"]
--- a/13
+++ b/13
@ -1,13 +0,0 @@
-Copyright [2024] [Daniel Legt]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--- a/README.md
+++ b/README.md
@ -1,98 +1,11 @@
-## 📖 About
-Drive Health is a program written in golang to help with tracking and monitoring of your hardware's temperature.
+## About

-This tool had been conceived with the purpose of installing it on different servers I own with different configurations to help keep track of the temperature of hard-disks, ssds, nvme drives, etc...
+## Disclaimer

-### Features
- Disk Listing
- Temperature Graphing
- Disk activity logging
- [API](./lib/web/api.go)
+This software is only meant to run on linux, it's something I threw together all at once in one sitting without really thinking about structure or even caring about anything but making it work.

-![UI Example](./media/design_v1.webp)
+It's actually meant to run on my own server just so I can track the temperature of my harddrives in a live environment, I just want this service to run, record the status of the harddrives, and be able via my VPN to access it in a private manner, it's not meant to be dockerized, it's not meant to be ran in a VM, it's meant to be ran either as a `service` or in a [screen](https://git.savannah.gnu.org/cgit/screen.git) in the background.

-## ❗ Disclaimer
-I'm not exactly a linux hardware wizard, so I honestly have no clue about a lot of things and I myself can tell there's a lot to improve upon and that there's a lot of other things missing that are a little bit more obscure, I personally don't currently own any m.2 sata drives to test the code on, or many of the other drive types, I have only tested on HDD, SSD and NVMe drives, any issues opened would help me so much!
+It's not really meant to run all the time or anything like that, I just wanted to write this disclaimer, feel free to use the code any way you want to :)

-## ❗ Requirements
-1. A linux machine, this will NOT work on macOS or on Windows, it's meant to be ran on servers as a service with which administrators can privately connect to for temperature logging.
-
-2. Please make sure you have the [**drivetemp kernel drive**](https://docs.kernel.org/hwmon/drivetemp.html) you can check this by running `sudo modprobe drivetemp`.
-The program depends on this to be able to log the temperature of your devices.
-
-
-## 📖 How to use
-1. Follow the `Deployment` section instrcutions to launch the program
-
-2. Once the program has launched, access it in your browser
-
-3. Enter the administrative username and password for the simple HTTP Auth
-
-4. You now have access to the application, you can monitor your disk's temperature over a period of time.
-
-## 🐦 Deployment
-To deploy the application you have multiple choices, the preffered method should be one which runs the binary directly and not containerization, the `docker` image is taking up a wopping `1Gb+` because I have to include sqlite3-dev and musl-dev dependencies, which sucks, so I whole heartedly recommend just installing this on your system as a binary either with `SystemD` or whichever service manager you are using.
-
-Download binaries from [the releases page](https://github.com/JustKato/drive-health/releases)
-
-### 🐋 Docker
-In the project there's a `docker-compose.prod.yml` which you can deploy on your server, you will notice that there's also a "dev" version, this version simply has a `build` instead of `image` property, so feel free to use either.
-
-Please do take notice that I have just fed the `environment file` directly to the service via docker-compose, and I recommend you do the same but please feel free to pass in `environment` variables straight to the process as well.
-
-[Docker Compose File](./docker-compose.prod.yml)
-```yaml
-version: "3.8"
-
-services:
-  drive-health:
-    # Latest image pull, mention the specific version here please.
-    image: ghcr.io/justkato/drive-health:latest
-    # Restart in case of crashing
-    restart: unless-stopped
-    # Load environment variables from .env file
-    env_file:
-      - .env
-    # Mount the volume to the local drive
-    volumes:
-      - ./data:/data
-    # Setup application ports
-    ports:
-      - 5003:8080
-```
-
-### 💾 SystemD
-When running with SystemD or any other service manager, please make sure you have a `.env` inside the `WorkingDirectory` of your runner, in the below example I will simply put my env in `/home/daniel/services/drive-health/.env`
-
-```ini
-[Unit]
-Description=Drive Health Service
-After=network.target
-
-[Service]
-Type=simple
-User=daniel # Your user here
-WorkingDirectory=/home/daniel/services/drive-health # The path to the service's directory
-ExecStart=/home/daniel/services/drive-health/drive-health # The path to the binary
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-```
-
-## ❔ FAQ
-
-### How does it work?
-Currently the program does not depend on any go library for hardware detection as I couldn't find anything that would not require root access while giving me the possibility to interrogate the temperature of the drives.
-
-I chose not to depend on `lsblk` either, so how does the program work?
-The program currently looks in `/sys/block` and then tries to make sense of the devices, I have had limited testing with my hardware specs, any issues being open in regards to different kinds of hardware would be highly appreciated
-
-### Why not just run as root?
-I really, REALLY, **REALLY** want to avoid asking people to run **ANY** program I write as root and even try and prevent that from happening since that's how things can go bad, especially because I am running actions over hardware devices.
-
-## Support & Contribution
-For support, bug reports, or feature requests, please open an issue on the [GitHub repository](https://github.com/JustKato/drive-health/issues). Contributions are welcome! Fork the repository, make your changes, and submit a pull request.
-
-## License
-This project is licensed under the [Apache License 2.0](./LICENSE).
+## How to use
--- a/build.sh
+++ b/build.sh
@ -1,50 +1,17 @@
-#!/usr/bin/env bash
-
-set -o pipefail
-set -u
-
-# Function to display messages in color
-echo_color() {
-    color=$1
-    text=$2
-    case $color in
-        "green") echo -e "\033[0;32m$text\033[0m" ;;
-        "yellow") echo -e "\033[0;33m$text\033[0m" ;;
-        "red") echo -e "\033[0;31m$text\033[0m" ;;
-        *) echo "$text" ;;
-    esac
-}
-
-# Getting GIT_VERSION from the most recent tag or commit hash
-GIT_VERSION=$(git describe --tags --always)
-if [ -z "$GIT_VERSION" ]; then
-    echo_color red "Error: Unable to determine GIT_VERSION."
-    exit 1
-fi
+#!/bin/bash

 APP_NAME="drive-health"
-DIST_DIR="${DIST_DIR:-dist}"
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-# make sure we are in the source dir
-cd $SCRIPT_DIR;
+DIST_DIR="dist"

 # Create the dist directory if it doesn't exist
 mkdir -p $DIST_DIR

 # Build the application
-echo_color yellow "[🦝] Building the application..."
-GOOS=linux CGO_ENABLED=1 GOARCH=amd64 go build -o $DIST_DIR/$APP_NAME
+echo "Building the application..."
+GOOS=linux GOARCH=amd64 go build -o $DIST_DIR/$APP_NAME

-# Copying additional resources...
-cp -r static templates $DIST_DIR/
+# Copy additional resources (like .env, static files, templates) to the dist directory
+echo "Copying additional resources..."
+cp -r .env static templates $DIST_DIR/

-echo_color yellow "[🦝] Compilation and packaging completed, archiving..."
-
-cd $DIST_DIR/
-
-zip "drive-health_$GIT_VERSION.zip" -r .
-
-# TODO: Add reliable method of cleaning up the compiled files optionally
-
-cd $SCRIPT_DIR;
+echo "Compilation and packaging completed."
--- a/deploy.sh
+++ b/deploy.sh
@ -1,65 +0,0 @@
-#!/bin/bash
-
-# Function to display messages in color
-echo_color() {
-    color=$1
-    text=$2
-    case $color in
-        "green") echo -e "\033[0;32m$text\033[0m" ;;
-        "yellow") echo -e "\033[0;33m$text\033[0m" ;;
-        "red") echo -e "\033[0;31m$text\033[0m" ;;
-        *) echo "$text" ;;
-    esac
-}
-
-# Getting GIT_VERSION from the most recent tag or commit hash
-GIT_VERSION=$(git describe --tags --always)
-if [ -z "$GIT_VERSION" ]; then
-    echo_color red "Error: Unable to determine GIT_VERSION."
-    exit 1
-fi
-
-# Run tests before proceeding
-echo_color yellow "Running tests..."
-if ! go test; then
-    echo_color red "Tests failed. Cancelling build process."
-    exit 1
-fi
-echo_color green "All tests passed successfully."
-
-echo_color green "Starting the Docker build process with version $GIT_VERSION..."
-
-LATEST_IMAGE_NAME="ghcr.io/justkato/drive-health:latest"
-IMAGE_NAME="ghcr.io/justkato/drive-health:$GIT_VERSION"
-echo_color yellow "Image to be built: $IMAGE_NAME"
-
-# Confirmation to build
-read -p "Are you sure you want to build an image? (y/N) " response
-if [[ "$response" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-    # Building the Docker image
-    echo "Building Docker image: $IMAGE_NAME"
-    docker build --no-cache -t $IMAGE_NAME .
-
-    # Also tag this build as 'latest'
-    echo "Tagging image as latest: $LATEST_IMAGE_NAME"
-    docker tag $IMAGE_NAME $LATEST_IMAGE_NAME
-else
-    echo_color red "Build cancelled."
-    exit 1
-fi
-
-# Prompt to push the image
-read -p "Push image to repository? (y/N) " push_response
-if [[ "$push_response" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-    # Pushing the image
-    echo "Pushing image: $IMAGE_NAME"
-    docker push $IMAGE_NAME
-
-    # Pushing the 'latest' image
-    echo "Pushing latest image: $LATEST_IMAGE_NAME"
-    docker push $LATEST_IMAGE_NAME
-else
-    echo_color red "Push cancelled."
-fi
-
-echo_color green "Ending the Docker build process..."
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@ -1,14 +0,0 @@
-version: "3.8"
-
-services:
-  drive-health:
-    # Build the current image
-    build: .
-    # Read straight from the .env file, or use the environment path
-    env_file:
-      - .env
-    volumes:
-      - ./dev_data:/data
-    # Setup application ports
-    ports:
-      - 8080:8080
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@ -1,17 +0,0 @@
-version: "3.8"
-
-services:
-  drive-health:
-    # Latest image pull, mention the specific version here please.
-    image: ghcr.io/justkato/drive-health:latest
-    # Restart in case of crashing
-    restart: unless-stopped
-    # Load environment variables from .env file
-    env_file:
-      - .env
-    # Mount the volume to the local drive
-    volumes:
-      - ./data:/data
-    # Setup application ports
-    ports:
-      - 5003:8080
--- a/go.mod
+++ b/go.mod
@ -1,22 +1,15 @@
-module github.com/JustKato/drive-health
+module tea.chunkbyte.com/kato/drive-health

 go 1.21.6

 require (
-	github.com/gin-gonic/gin v1.9.1
-	github.com/joho/godotenv v1.5.1
-	github.com/wcharczuk/go-chart/v2 v2.1.1
-	gorm.io/driver/sqlite v1.5.4
-	gorm.io/gorm v1.25.5
-)
-
-require (
-	github.com/blend/go-sdk v1.20220411.3 // indirect
+	github.com/anatol/smart.go v0.0.0-20230705044831-c3b27137baa3 // indirect
 	github.com/bytedance/sonic v1.10.2 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/chenzhuoyu/iasm v0.9.1 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/gin-gonic/gin v1.9.1 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.17.0 // indirect
@ -24,6 +17,7 @@ require (
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/joho/godotenv v1.5.1 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
@ -34,6 +28,7 @@ require (
 	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
+	github.com/wcharczuk/go-chart/v2 v2.1.1 // indirect
 	golang.org/x/arch v0.7.0 // indirect
 	golang.org/x/crypto v0.18.0 // indirect
 	golang.org/x/image v0.11.0 // indirect
@ -42,4 +37,6 @@ require (
 	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gorm.io/driver/sqlite v1.5.4 // indirect
+	gorm.io/gorm v1.25.5 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -1,5 +1,5 @@
-github.com/blend/go-sdk v1.20220411.3 h1:GFV4/FQX5UzXLPwWV03gP811pj7B8J2sbuq+GJQofXc=
-github.com/blend/go-sdk v1.20220411.3/go.mod h1:7lnH8fTi6U4i1fArEXRyOIY2E1X4MALg09qsQqY1+ak=
+github.com/anatol/smart.go v0.0.0-20230705044831-c3b27137baa3 h1:kAF2MWFD8tyDqD74OQizymjj2cnZAURwSzBrEslCDnI=
+github.com/anatol/smart.go v0.0.0-20230705044831-c3b27137baa3/go.mod h1:llkexGSe52bW0OjNva0kvIqGZxfSnVfpKHrnKBI2+pU=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
 github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE=
@ -12,7 +12,6 @@ github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLI
 github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0=
 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
 github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
@ -20,8 +19,6 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
-github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
-github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
@ -32,7 +29,7 @@ github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
@ -60,7 +57,6 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
 github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
@ -71,7 +67,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
@ -107,6 +102,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
+golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@ -124,11 +121,9 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
 google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
--- a/lib/config/config.go
+++ b/lib/config/config.go
@ -17,20 +17,11 @@ type DHConfig struct {
 	IdentityUsername string `json:"identityUsername"`
 	IdentityPassword string `json:"identityPassword"`

-	IsDocker bool `json:isDocker`
-
 	DebugMode bool `json:"debugMode"`
 }

-var config *DHConfig = nil
-
-func GetConfiguration() *DHConfig {
-
-	if config != nil {
-		return config
-	}
-
-	config = &DHConfig{
+func GetConfiguration() DHConfig {
+	config := DHConfig{
 		DiskFetchFrequency:      5,
 		CleanupServiceFrequency: 3600,
 		MaxHistoryAge:           2592000,
@ -38,8 +29,6 @@ func GetConfiguration() *DHConfig {
 		IdentityUsername:        "admin",
 		IdentityPassword:        "admin",

-		IsDocker: false,
-
 		Listen: ":8080",
 	}

@ -83,13 +72,5 @@ func GetConfiguration() *DHConfig {
 		}
 	}

-	if val, exists := os.LookupEnv("IS_DOCKER"); exists {
-		if isDocker, err := strconv.ParseBool(val); err == nil {
-			config.IsDocker = isDocker
-
-			config.DatabaseFilePath = "/data/data.sqlite"
-		}
-	}
-
 	return config
 }
--- a/lib/hardware/logic.go
+++ b/lib/hardware/logic.go
@ -1,78 +1,70 @@
 package hardware

 import (
+	"bufio"
+	"bytes"
 	"fmt"
-	"os"
-	"path/filepath"
-	"strconv"
+	"os/exec"
 	"strings"
 	"time"

-	"github.com/JustKato/drive-health/lib/config"
 	"gorm.io/gorm"
 )

 func GetSystemHardDrives(db *gorm.DB, olderThan *time.Time, newerThan *time.Time) ([]*HardDrive, error) {
-	var systemHardDrives []*HardDrive

-	// List all block devices
-	devices, err := os.ReadDir("/sys/block/")
+	// Execute the lsblk command to get detailed block device information
+	cmd := exec.Command("lsblk", "-d", "-o", "NAME,TRAN,SIZE,MODEL,SERIAL,TYPE")
+	var out bytes.Buffer
+	cmd.Stdout = &out
+	err := cmd.Run()
 	if err != nil {
-		return nil, fmt.Errorf("failed to list block devices: %w", err)
+		fmt.Println("Failed to execute command:", err)
+		return nil, err
 	}

-	for _, device := range devices {
-		deviceName := device.Name()
+	var systemHardDrives []*HardDrive

-		// Skip non-physical devices (like loop and ram devices)
-		// TODO: Read more about this, there might be some other devices we should or should not skip
-		if strings.HasPrefix(deviceName, "loop") || strings.HasPrefix(deviceName, "ram") {
+	// Scan the output line by line
+	scanner := bufio.NewScanner(&out)
+	for scanner.Scan() {
+		line := scanner.Text()
+
+		// Skip the header line
+		if strings.Contains(line, "NAME") {
 			continue
 		}

-		// Read device details
-		model, _ := os.ReadFile(fmt.Sprintf("/sys/block/%s/device/model", deviceName))
-		serial, _ := os.ReadFile(fmt.Sprintf("/sys/block/%s/device/serial", deviceName))
-		sizeBytes, _ := os.ReadFile(fmt.Sprintf("/sys/block/%s/size", deviceName))
+		// Split the line into columns
+		cols := strings.Fields(line)
+		if len(cols) < 6 {
+			continue
+		}

-		size := convertSizeToString(sizeBytes)
-		transport := getTransportType(deviceName)
-
-		// TODO: Maybe find a better way?
-		if size == "0 Bytes" {
-			// This looks like an invalid device, skip it.
-			if config.GetConfiguration().DebugMode {
-				fmt.Printf("[🟨] Igoring device:[/dev/%s], reported size of 0\n", deviceName)
+		// Filter out nvme drives (M.2)
+		if cols[1] != "usb" {
+			hd := &HardDrive{
+				Name:      cols[0],
+				Transport: cols[1],
+				Size:      cols[2],
+				Model:     cols[3],
+				Serial:    cols[4],
+				Type:      cols[5],
 			}
-			continue
+			systemHardDrives = append(systemHardDrives, hd)
 		}
+	}

-		hwid, err := getHardwareID(deviceName)
-		if err != nil {
-			if config.GetConfiguration().DebugMode {
-				fmt.Printf("[🟨] No unique identifier found for device:[/dev/%s] unique identifier\n", deviceName)
-			}
-			continue
-		}
-
-		hd := &HardDrive{
-			Name:      deviceName,
-			Transport: transport,
-			Model:     strings.TrimSpace(string(model)),
-			Serial:    strings.TrimSpace(string(serial)),
-			Size:      size,
-			Type:      getDriveType(deviceName),
-			HWID:      hwid,
-		}
-
-		systemHardDrives = append(systemHardDrives, hd)
+	// Handle error
+	if err := scanner.Err(); err != nil {
+		return nil, err
 	}

 	var updatedHardDrives []*HardDrive

 	for _, sysHDD := range systemHardDrives {
 		var existingHD HardDrive
-		q := db.Where("hw_id = ?", sysHDD.HWID)
+		q := db.Where("serial = ? AND model = ? AND type = ?", sysHDD.Serial, sysHDD.Model, sysHDD.Type)

 		if newerThan != nil && olderThan != nil {
 			q = q.Preload("Temperatures", "time_stamp < ? AND time_stamp > ?", newerThan, olderThan)
@ -98,101 +90,3 @@ func GetSystemHardDrives(db *gorm.DB, olderThan *time.Time, newerThan *time.Time

 	return updatedHardDrives, nil
 }
-
-func getTransportType(deviceName string) string {
-	transportLink, err := filepath.EvalSymlinks(fmt.Sprintf("/sys/block/%s/device", deviceName))
-	if err != nil {
-		return "Unknown"
-	}
-
-	if strings.Contains(transportLink, "/usb/") {
-		return "USB"
-	} else if strings.Contains(transportLink, "/ata") {
-		return "SATA"
-	} else if strings.Contains(transportLink, "/nvme/") {
-		return "NVMe"
-	}
-
-	return "Other"
-}
-
-func convertSizeToString(sizeBytes []byte) string {
-	// Convert the size from a byte slice to a string, then to an integer
-	sizeStr := strings.TrimSpace(string(sizeBytes))
-	sizeSectors, err := strconv.ParseInt(sizeStr, 10, 64)
-	if err != nil {
-		return "Unknown"
-	}
-
-	// Convert from 512-byte sectors to bytes
-	sizeInBytes := sizeSectors * 512
-
-	// Define size units
-	const (
-		_          = iota // ignore first value by assigning to blank identifier
-		KB float64 = 1 << (10 * iota)
-		MB
-		GB
-		TB
-	)
-
-	var size float64 = float64(sizeInBytes)
-	var unit string
-
-	// Determine the unit to use
-	switch {
-	case size >= TB:
-		size /= TB
-		unit = "TB"
-	case size >= GB:
-		size /= GB
-		unit = "GB"
-	case size >= MB:
-		size /= MB
-		unit = "MB"
-	case size >= KB:
-		size /= KB
-		unit = "KB"
-	default:
-		unit = "Bytes"
-	}
-
-	// Return the formatted size
-	return fmt.Sprintf("%.2f %s", size, unit)
-}
-
-// Look throug /sys/block/device/ and try and find the unique identifier of the device.
-func getHardwareID(deviceName string) (string, error) {
-	// Define potential ID file paths
-	idFilePaths := []string{
-		"/sys/block/" + deviceName + "/device/wwid",
-		"/sys/block/" + deviceName + "/device/wwn",
-		"/sys/block/" + deviceName + "/device/serial",
-	}
-
-	// Try to read each file and return the first successful read
-	for _, path := range idFilePaths {
-		if idBytes, err := os.ReadFile(path); err == nil {
-			return strings.TrimSpace(string(idBytes)), nil
-		}
-	}
-
-	// Return an empty string if no ID is found
-	return "", fmt.Errorf("could not find unique identifier for %s", deviceName)
-}
-
-// Figure out what kind of device this is by reading if it's rotational or not
-func getDriveType(deviceName string) string {
-	// Check if the drive is rotational (HDD)
-	if isRotational, _ := os.ReadFile(fmt.Sprintf("/sys/block/%s/queue/rotational", deviceName)); string(isRotational) == "1\n" {
-		return "HDD"
-	}
-
-	// Check if the drive is NVMe
-	if strings.HasPrefix(deviceName, "nvme") {
-		return "NVMe"
-	}
-
-	// Default to SSD for non-rotational and non-NVMe drives
-	return "SSD"
-}
--- a/lib/hardware/models.go
+++ b/lib/hardware/models.go
@ -2,12 +2,9 @@ package hardware

 import (
 	"fmt"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
 	"time"

+	"github.com/anatol/smart.go"
 	"gorm.io/gorm"
 )

@ -22,7 +19,6 @@ type HardDrive struct {
 	Model        string
 	Serial       string
 	Type         string
-	HWID         string
 	Temperatures []HardDriveTemperature `gorm:"foreignKey:HardDriveID"`
 }

@ -43,52 +39,26 @@ type Snapshots struct {
 	List []*HardwareSnapshot
 }

+// Fetch the temperature of the device, optinally update the reference object
 func (h *HardDrive) GetTemperature() int {
-
-	possiblePaths := []string{
-		"/sys/block/" + h.Name + "/device/hwmon/",
-		"/sys/block/" + h.Name + "/device/",
-		"/sys/block/" + h.Name + "/device/generic/device/",
-	}
-
-	for _, path := range possiblePaths {
-		// Try HDD/SSD path
-		temp, found := h.getTemperatureFromPath(path)
-		if found {
-			return temp
-		}
-	}
-
-	fmt.Printf("[🛑] Failed to get temperature for %s\n", h.Name)
-	return -1
-}
-
-func (h *HardDrive) getTemperatureFromPath(basePath string) (int, bool) {
-	hwmonDirs, err := os.ReadDir(basePath)
+	// Fetch the device by name
+	disk, err := smart.Open("/dev/" + h.Name)
 	if err != nil {
-		return 0, false
+		fmt.Printf("Failed to open device %s: %s\n", h.Name, err)
+		return -1
+	}
+	defer disk.Close()
+
+	// Fetch SMART data
+	smartInfo, err := disk.ReadGenericAttributes()
+	if err != nil {
+		fmt.Printf("Failed to get SMART data for %s: %s\n", h.Name, err)
+		return -1
 	}

-	for _, dir := range hwmonDirs {
-		if strings.HasPrefix(dir.Name(), "hwmon") {
-			tempPath := filepath.Join(basePath, dir.Name(), "temp1_input")
-			if _, err := os.Stat(tempPath); err == nil {
-				tempBytes, err := os.ReadFile(tempPath)
-				if err != nil {
-					continue
-				}
+	// Parse the temperature
+	temperature := int(smartInfo.Temperature)

-				tempStr := strings.TrimSpace(string(tempBytes))
-				temperature, err := strconv.Atoi(tempStr)
-				if err != nil {
-					continue
-				}
-
-				// Convert millidegree Celsius to degree Celsius
-				return temperature / 1000, true
-			}
-		}
-	}
-
-	return 0, false
+	// Return the found value
+	return temperature
 }
--- a/lib/svc/service.go
+++ b/lib/svc/service.go
@ -5,11 +5,11 @@ import (
 	"fmt"
 	"time"

-	"github.com/JustKato/drive-health/lib/config"
-	"github.com/JustKato/drive-health/lib/hardware"
 	"github.com/wcharczuk/go-chart/v2"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
+	"tea.chunkbyte.com/kato/drive-health/lib/config"
+	"tea.chunkbyte.com/kato/drive-health/lib/hardware"
 )

 var db *gorm.DB
--- a/lib/svc/service_cleanup.go
+++ b/lib/svc/service_cleanup.go
@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"

-	"github.com/JustKato/drive-health/lib/config"
-	"github.com/JustKato/drive-health/lib/hardware"
+	"tea.chunkbyte.com/kato/drive-health/lib/config"
+	"tea.chunkbyte.com/kato/drive-health/lib/hardware"
 )

 // Delete all thermal entries that are older than X amount of seconds
--- a/lib/web/api.go
+++ b/lib/web/api.go
@ -5,9 +5,9 @@ import (
 	"strconv"
 	"time"

-	"github.com/JustKato/drive-health/lib/hardware"
-	"github.com/JustKato/drive-health/lib/svc"
 	"github.com/gin-gonic/gin"
+	"tea.chunkbyte.com/kato/drive-health/lib/hardware"
+	"tea.chunkbyte.com/kato/drive-health/lib/svc"
 )

 func setupApi(r *gin.Engine) {
--- a/lib/web/frontend.go
+++ b/lib/web/frontend.go
@ -6,9 +6,9 @@ import (
 	"strconv"
 	"time"

-	"github.com/JustKato/drive-health/lib/hardware"
-	"github.com/JustKato/drive-health/lib/svc"
 	"github.com/gin-gonic/gin"
+	"tea.chunkbyte.com/kato/drive-health/lib/hardware"
+	"tea.chunkbyte.com/kato/drive-health/lib/svc"
 )

 func setupFrontend(r *gin.Engine) {
--- a/lib/web/net.go
+++ b/lib/web/net.go
@ -1,8 +1,8 @@
 package web

 import (
-	"github.com/JustKato/drive-health/lib/config"
 	"github.com/gin-gonic/gin"
+	"tea.chunkbyte.com/kato/drive-health/lib/config"
 )

 func SetupRouter() *gin.Engine {
--- a/main.go
+++ b/main.go
@ -9,10 +9,10 @@ import (
 	"syscall"
 	"time"

-	"github.com/JustKato/drive-health/lib/config"
-	"github.com/JustKato/drive-health/lib/svc"
-	"github.com/JustKato/drive-health/lib/web"
 	"github.com/joho/godotenv"
+	"tea.chunkbyte.com/kato/drive-health/lib/config"
+	"tea.chunkbyte.com/kato/drive-health/lib/svc"
+	"tea.chunkbyte.com/kato/drive-health/lib/web"
 )

 func main() {
--- a/media/design_v1.webp
+++ b/media/design_v1.webp
--- a/static/style.css
+++ b/static/style.css
@ -10,17 +10,7 @@
    --fg0: #bbc0ca;
    --fg1: #434c56;

-    --acc1: #2aa3f4;
-    --acc1BG0: #2aa3f450;
-    --acc1BG1: #2aa3f430;
-
-    --acc2: #2af488;
-    --acc2BG0: #2af48850;
-    --acc2BG1: #2af48830;
-
-    --acc3: #f4e02a;
-    --acc3BG0: #f4e02a50;
-    --acc3BG1: #f4e02a30;
+    --acc: #bbc0ca;
 }

 :root {
@ -65,41 +55,6 @@ html, body {
    margin: 0;
 }

-.badge {
-    font-size: 12px;
-    font-weight: bold;
-    padding: .1rem .4rem;
-
-    display: inline-block;
-    border-radius: 3px;
-
-    color: var(--acc1);
-    background-color: var(--acc1BG0);
-    border: 1px solid var(--acc1BG1);
-}
-
-.badge[type="HDD"] {
-    color: var(--acc2);
-    background-color: var(--acc2BG0);
-    border: 1px solid var(--acc2BG1);
-}
-
-.badge[type="NVMe"] {
-    color: var(--acc3);
-    background-color: var(--acc3BG0);
-    border: 1px solid var(--acc3BG1);
-}
-
-.grooved {
-    background-color: var(--bg0);
-    border: 1px solid var(--bg1);
-
-    font-size: 12px;
-    padding: .1rem .3rem;
-
-    border-radius: 4px;
-}
-

 /* Table */

--- a/templates/index.html
+++ b/templates/index.html
@ -99,9 +99,8 @@
                <!-- Drives -->
                {{ if len .drives }}
                    {{ range .drives }}
-                        <div class="disk-graph-entry bordered" id="disk-temp-{{ .ID }}" style="position: relative;">
-                            <div class="badge" type="{{.Type}}" style="position: absolute; top: 1rem; right: 1rem;">/dev/{{.Name}}</div>
-                            <h4>{{.Model}}:{{.HWID}} <span class="grooved">{{.Size}}</span></h4>
+                        <div class="disk-graph-entry bordered" id="disk-temp-{{ .ID }}">
+                            <h4>{{.Name}}:{{.Serial}} [{{.Size}}]</h4>
                            <a href="/api/v1/disks/{{.ID}}/chart" target="_blank">
                                <img class="graph-image" src="/api/v1/disks/{{.ID}}/chart?older={{ $older }}&newer={{ $newer }}" alt="{{ .Model }} Image">
                            </a>