Merge Refactor

.dockerignore

@@ -1 +1,14 @@
-.git*
+.git*
+**/node_modules
+Dockerfile*
+docker-compose*
+.dockerignore
+.gitignore
+README.md
+.vscode
+Makefile
+helm-charts
+.env
+.editorconfig
+.idea
+coverage*

.github/workflows/docker-publish.yml

@@ -1,10 +1,10 @@
 name: Docker
-
 on:
   push:
-    tags: ['v*.*.*']  # Triggers on tag following semantic versioning
+    tags: ['v*.*.*']
   pull_request:
-    branches: ['master', 'develop']  # Triggers on PR to these branches
+    types: [opened, synchronize]
+    branches: ['master', 'develop']
 
 env:
   REGISTRY: ghcr.io
@@ -17,16 +17,16 @@ jobs:
       contents: read
       packages: write
       id-token: write
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
 
       - name: Setup Docker buildx
         uses: docker/[email protected]
 
       - name: Log into registry ${{ env.REGISTRY }}
-        # if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') || github.event_name == 'pull_request'}}
         uses: docker/[email protected]
         with:
           registry: ${{ env.REGISTRY }}
@@ -40,8 +40,9 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@v6.11.0
         with:
           context: .
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          no-cache: true
+          tags: ${{ steps.meta.outputs.tags }}

.gitignore

@@ -1,6 +1,6 @@
 build
 .DS_Store
-*config.json
+**/config.json
 media.*.priv*
 docker/data
 coverage.*
@@ -20,3 +20,8 @@ coverage.*
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
+
+*.db
+*.sqlite3
+applog.log
+test_web.sh

.golangci.yml

@@ -0,0 +1,82 @@
+# Options for analysis running
+run:
+  # Timeout for analysis, e.g. 30s, 5m
+  timeout: 60s
+
+  # Include test files
+  tests: true
+
+  # Use all available CPU cores
+  concurrency: 4
+
+  # Exit code when at least one issue was found
+  issues-exit-code: 1
+
+# Output configuration options
+output:
+  # Make issues output unique by line
+  uniq-by-line: true
+
+  # Sort results by: filepath, line and column
+  sort-results: true
+
+# Linters settings
+linters:
+  disable-all: true
+  enable:
+    # - gofmt        # Checks formatting
+    # - gofumpt      # Stricter gofmt
+    - govet # Reports suspicious constructs
+    - errcheck # Checks for unchecked errors
+    - gosimple # Suggests code simplifications
+    - staticcheck # Go static analysis
+    - unused # Checks for unused constants, variables, functions and types
+    - ineffassign # Detects ineffective assignments
+    - typecheck # Go type checker
+    - bodyclose # Checks whether HTTP response bodies are closed
+    - gosec # Inspects code for security problems
+    - prealloc # Suggests slice preallocation
+    - revive # Fast, configurable, extensible, flexible, and beautiful linter
+    - misspell # Finds commonly misspelled English words
+    - copyloopvar # Checks for pointers to enclosing loop variables
+    - gocritic # Provides diagnostics that check for bugs, performance and style issues
+
+# Linter-specific settings
+linters-settings:
+  gosec:
+    excludes:
+      - G104 # Audit errors not being checked (too noisy)
+
+  revive:
+    rules:
+      - name: exported
+        severity: warning
+        disabled: true
+      - name: unexported-return
+        severity: warning
+        disabled: false
+      - name: receiver-naming
+        severity: warning
+        disabled: false
+
+  gocritic:
+    disabled-checks:
+      - commentedOutCode
+    enabled-tags:
+      - performance
+      - style
+      - diagnostic
+
+
+# Issues configuration
+issues:
+  # Maximum count of issues with the same text
+  max-same-issues: 3
+
+  # Maximum issues count per one linter
+  max-issues-per-linter: 50
+
+  # Don't show issues from excluded files
+  exclude-use-default: false
+  exclude-dirs:
+    - vendor

.pre-commit-config.yaml

@@ -0,0 +1,11 @@
+repos:
+  - repo: https://github.com/tekwizely/pre-commit-golang
+    rev: v1.0.0-rc.1
+    hooks:
+      - id: go-mod-tidy
+        # Formatting
+      - id: go-fumpt
+        args: [-l, -w]
+      # GolangCI-Lint
+      - id: golangci-lint-mod
+        args: [--fix, --config=.golangci.yml]

Dockerfile

@@ -1,22 +1,60 @@
-FROM golang:1.22 as build
-
+# Backend build stage
+FROM golang:1.23 AS backend-build
 WORKDIR /go/src/app
 COPY . .
 RUN go mod download
-WORKDIR /go/src/app/cmd
-RUN go vet -v
+WORKDIR /go/src/app/cmd/gowatchit
+
+RUN go build -o /go/bin/app
+
+# Frontend build stage
+FROM oven/bun:1 AS frontend-build
+WORKDIR /usr/src/app
+COPY web/package.json web/bun.lockb ./
+RUN bun install --frozen-lockfile
+COPY web/ ./
+RUN bun run build
 
-RUN CGO_ENABLED=0 go build -o /go/bin/app
+# Final stage
+FROM debian:bookworm-slim
+RUN apt-get update && apt-get install -y \
+    tzdata \
+    nginx \
+    sqlite3 \
+    libsqlite3-dev \
+    ca-certificates \
+    && rm -rf /var/lib/apt/lists/*      
 
-FROM alpine:20240329
+# Create necessary directories
+RUN mkdir -p /data \
+    /run/nginx \
+    /var/lib/nginx \
+    /var/lib/nginx/tmp \
+    /var/lib/nginx/logs \
+    /var/lib/nginx/tmp/client_body \
+    /var/lib/nginx/tmp/proxy \
+    /var/lib/nginx/tmp/fastcgi \
+    /var/lib/nginx/tmp/uwsgi \
+    /var/lib/nginx/tmp/scgi
 
-RUN apk add  supervisor
-COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY docker/watch.py /watch.py
+# Copy backend
+COPY --from=backend-build /go/bin/app /gowatchit
+RUN chmod +x /gowatchit
+
+# Copy frontend build files
+COPY --from=frontend-build /usr/src/app/dist /var/www/html/
+
+# Copy config files
+COPY docker/nginx.conf /etc/nginx/nginx.conf
+COPY docker/entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
 
-COPY --from=build /go/bin/app /
-COPY --from=build /go/src/app/web /web
 EXPOSE 9999
+EXPOSE 3000
+
+ENV TZ=America/New_York
+ENV GIN_MODE=release
+ENV LOG_FILE=true
+ENV BASE_DIR=/data
 
-# CMD ["/app"]
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+CMD ["/entrypoint.sh"]

Justfile

@@ -0,0 +1,18 @@
+help:
+
+build: 
+	cd cmd/gowatchit && go build -o ../../build/gowatchit
+test:
+	./test.sh
+docker-build:
+	docker buildx build --platform linux/arm64 --load --tag gowatchit-local . -f ./Dockerfile
+docker-push:
+	docker buildx build --push --platform linux/amd64 --tag ghcr.io/iloveicedgreentea/gowatchit:test . 
+docker-run: docker-build
+	LOG_FILE=true LOG_LEVEL=debug docker-compose -f docker-compose.yml up
+run: 
+	LOG_ENV=local LOG_FILE=true LOG_LEVEL=debug go run ./cmd/gowatchit/
+run-ui:
+	cd web && bun run dev
+live-test:
+	./test_web.sh

LICENSE

@@ -6,7 +6,7 @@ Without limiting other conditions in the License, the grant of rights under the
 
 For purposes of the foregoing, “Sell” means practicing any or all of the rights granted to you under the License to provide to third parties, for a fee or other consideration (including without limitation fees for hosting or consulting/ support services related to the Software), a product or service whose value derives, entirely or substantially, from the functionality of the Software. Any license notice or attribution required by the License must also include this Commons Clause License Condition notice.
 
-Software: Plex Webhook Automation
+Software: Gowatchit
 
 License: Commons Clause + The license below