Skip to content

Commit 0c2e3d6

Browse files
cecobaskcecobask
committed
refactor: clean up project structure
1 parent e917f22 commit 0c2e3d6

39 files changed

+1370
-4777
lines changed

‎.codecov.yaml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎.dockerignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
.github
22
assets
33
build
4-
.codecov.yaml
54
.env
65
.gitignore
76
.golangci.yaml
87
.goreleaser.yaml
9-
coverage.out
108
Dockerfile
119
Makefile

‎.github/workflows/package.yaml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: package
22
on:
33
push:
44
tags:
5-
- "*"
5+
- "*"
66
permissions:
77
contents: read
88
packages: write
@@ -15,32 +15,32 @@ jobs:
1515
package:
1616
runs-on: ubuntu-24.04
1717
steps:
18-
- name: Check out code
19-
uses: actions/checkout@v4
20-
with:
21-
fetch-depth: 0
22-
- name: Login to GitHub Container Registry
23-
uses: docker/login-action@v3
24-
with:
25-
registry: ${{ env.REGISTRY }}
26-
username: ${{ github.actor }}
27-
password: ${{ secrets.GITHUB_TOKEN }}
28-
- name: Extract metadata
29-
uses: docker/metadata-action@v5
30-
id: meta
31-
with:
32-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
33-
- name: Build and push Docker image
34-
uses: docker/build-push-action@v6
35-
id: push
36-
with:
37-
context: .
38-
push: true
39-
tags: ${{ steps.meta.outputs.tags }}
40-
labels: ${{ steps.meta.outputs.labels }}
41-
- name: Generate artifact attestation
42-
uses: actions/attest-build-provenance@v2
43-
with:
44-
subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
45-
subject-digest: ${{ steps.push.outputs.digest }}
46-
push-to-registry: true
18+
- name: Check out code
19+
uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 0
22+
- name: Login to GitHub Container Registry
23+
uses: docker/login-action@v3
24+
with:
25+
registry: ${{ env.REGISTRY }}
26+
username: ${{ github.actor }}
27+
password: ${{ secrets.GITHUB_TOKEN }}
28+
- name: Extract metadata
29+
uses: docker/metadata-action@v5
30+
id: meta
31+
with:
32+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
33+
- name: Build and push Docker image
34+
uses: docker/build-push-action@v6
35+
id: push
36+
with:
37+
context: .
38+
push: true
39+
tags: ${{ steps.meta.outputs.tags }}
40+
labels: ${{ steps.meta.outputs.labels }}
41+
- name: Generate artifact attestation
42+
uses: actions/attest-build-provenance@v2
43+
with:
44+
subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
45+
subject-digest: ${{ steps.push.outputs.digest }}
46+
push-to-registry: true

‎.github/workflows/quality.yaml‎

Lines changed: 20 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,33 @@ name: quality
22
on:
33
push:
44
branches:
5-
- main
5+
- main
66
pull_request:
77
permissions:
88
contents: read
99
jobs:
1010
lint:
1111
runs-on: ubuntu-24.04
1212
steps:
13-
- name: Check out code
14-
uses: actions/checkout@v4
15-
- name: Setup Go
16-
uses: actions/setup-go@v5
17-
with:
18-
go-version: 1.23.4
19-
- name: Lint
20-
uses: golangci/golangci-lint-action@v4
21-
with:
22-
version: v1.62.2
23-
skip-cache: true
13+
- name: Check out code
14+
uses: actions/checkout@v4
15+
- name: Setup Go
16+
uses: actions/setup-go@v5
17+
with:
18+
go-version: 1.23.4
19+
- name: Lint
20+
uses: golangci/golangci-lint-action@v7
21+
with:
22+
version: v2.1.5
23+
skip-cache: true
2424
build:
2525
runs-on: ubuntu-24.04
2626
steps:
27-
- name: Check out code
28-
uses: actions/checkout@v4
29-
- name: Setup Go
30-
uses: actions/setup-go@v5
31-
with:
32-
go-version: 1.23.4
33-
- name: Build
34-
run: make build
35-
test:
36-
runs-on: ubuntu-24.04
37-
steps:
38-
- name: Check out code
39-
uses: actions/checkout@v4
40-
- name: Setup Go
41-
uses: actions/setup-go@v5
42-
with:
43-
go-version: 1.23.4
44-
- name: Run tests
45-
run: make test
46-
- name: Upload coverage
47-
uses: codecov/codecov-action@v4
48-
with:
49-
files: coverage.out
50-
token: ${{ secrets.CODECOV_TOKEN }}
27+
- name: Check out code
28+
uses: actions/checkout@v4
29+
- name: Setup Go
30+
uses: actions/setup-go@v5
31+
with:
32+
go-version: 1.23.4
33+
- name: Build
34+
run: make build

‎.github/workflows/release.yaml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@ name: release
22
on:
33
push:
44
tags:
5-
- "*"
5+
- "*"
66
permissions:
77
contents: write
88
jobs:
99
release:
1010
runs-on: ubuntu-24.04
1111
steps:
12-
- name: Check out code
13-
uses: actions/checkout@v4
14-
with:
15-
fetch-depth: 0
16-
- name: Setup Go
17-
uses: actions/setup-go@v5
18-
with:
19-
go-version: 1.23.4
20-
- name: Create release
21-
uses: goreleaser/goreleaser-action@v6
22-
with:
23-
distribution: goreleaser
24-
version: '~> v2'
25-
args: release --clean
26-
env:
27-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12+
- name: Check out code
13+
uses: actions/checkout@v4
14+
with:
15+
fetch-depth: 0
16+
- name: Setup Go
17+
uses: actions/setup-go@v5
18+
with:
19+
go-version: 1.23.4
20+
- name: Create release
21+
uses: goreleaser/goreleaser-action@v6
22+
with:
23+
distribution: goreleaser
24+
version: '~> v2'
25+
args: release --clean
26+
env:
27+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/sync.yaml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: sync
22
on:
33
push:
44
branches:
5-
- main
5+
- main
66
schedule:
7-
- cron: "0 */12 * * *"
7+
- cron: "0 */12 * * *"
88
workflow_dispatch:
99
env:
1010
ITS_IMDB_AUTH: ${{ secrets.IMDB_AUTH }}
@@ -30,23 +30,23 @@ jobs:
3030
sync:
3131
runs-on: ubuntu-24.04
3232
steps:
33-
- name: Check out code
34-
uses: actions/checkout@v4
35-
- name: Install Google Chrome
36-
run: |
37-
wget -q https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1321438/chrome-linux.zip
38-
unzip -q chrome-linux.zip
39-
if test -f "$ITS_IMDB_BROWSERPATH"; then
40-
echo "Google Chrome binary stored at $ITS_IMDB_BROWSERPATH"
41-
else
42-
echo "Google Chrome binary not found at $ITS_IMDB_BROWSERPATH"
43-
exit 1
44-
fi
45-
- name: Setup Go
46-
uses: actions/setup-go@v5
47-
with:
48-
go-version: 1.23.4
49-
- name: Build
50-
run: make build
51-
- name: Sync
52-
run: make sync
33+
- name: Check out code
34+
uses: actions/checkout@v4
35+
- name: Install Google Chrome
36+
run: |
37+
wget -q https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1321438/chrome-linux.zip
38+
unzip -q chrome-linux.zip
39+
if test -f "$ITS_IMDB_BROWSERPATH"; then
40+
echo "Google Chrome binary stored at $ITS_IMDB_BROWSERPATH"
41+
else
42+
echo "Google Chrome binary not found at $ITS_IMDB_BROWSERPATH"
43+
exit 1
44+
fi
45+
- name: Setup Go
46+
uses: actions/setup-go@v5
47+
with:
48+
go-version: 1.23.4
49+
- name: Build
50+
run: make build
51+
- name: Sync
52+
run: make sync

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
build/
2-
coverage.out
32
dist/

‎.golangci.yaml‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
1+
version: "2"
12
linters:
23
enable:
3-
- errcheck
4-
- gosimple
5-
- govet
6-
- ineffassign
7-
- staticcheck
8-
- unused
9-
- misspell
10-
- revive
11-
- unconvert
12-
- gci
13-
run:
14-
timeout: 5m
15-
linters-settings:
16-
revive:
17-
rules:
4+
- errcheck
5+
- govet
6+
- ineffassign
7+
- staticcheck
8+
- unused
9+
- misspell
10+
- revive
11+
- unconvert
12+
settings:
13+
revive:
14+
rules:
1815
- name: var-naming
1916
arguments:
20-
- ["ID", "URL", "HTTP", "JSON", "API"]
21-
gci:
22-
sections:
17+
- [ "ID", "URL", "HTTP", "JSON", "API" ]
18+
errcheck:
19+
exclude-functions:
20+
- (*bytes.Buffer).ReadFrom
21+
- io.Copy
22+
- (io.ReadCloser).Close
23+
formatters:
24+
settings:
25+
gci:
26+
sections:
2327
- standard
2428
- default
2529
- prefix(github.com/cecobask/imdb-trakt-sync)
26-
custom-order: true
30+
custom-order: true

‎Makefile‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
11
.PHONY: *
22

33
build:
4-
@go build -o build/its main.go
4+
go build -o build/its main.go
55

66
package:
7-
@docker buildx build -t its:dev --platform=linux/amd64 .
7+
docker buildx build -t its:dev --platform=linux/amd64 .
88

99
configure:
10-
@./build/its configure
10+
./build/its configure
1111

1212
sync:
13-
@./build/its sync
13+
./build/its sync
1414

1515
sync-container:
16-
@docker run -it --rm --platform=linux/amd64 --env-file=.env its:dev
17-
18-
html-coverage:
19-
@go tool cover -html=coverage.out
16+
docker run -it --rm --platform=linux/amd64 --env-file=.env its:dev
2017

2118
lint:
22-
@golangci-lint run
19+
golangci-lint run
2320

2421
lint-fix:
25-
@golangci-lint run --fix
26-
27-
test:
28-
@go test -race -coverprofile=coverage.out -shuffle on ./...
22+
golangci-lint run --fix

‎cmd/configure/configure.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func NewCommand(ctx context.Context) *cobra.Command {
1818
command := &cobra.Command{
1919
Use: fmt.Sprintf("%s [command]", cmd.CommandNameConfigure),
2020
Short: "Configure provider credentials and sync options",
21-
PreRunE: func(c *cobra.Command, args []string) (err error) {
21+
PreRunE: func(c *cobra.Command, _ []string) (err error) {
2222
confPath, err = c.Flags().GetString(cmd.FlagNameConfigFile)
2323
if err != nil {
2424
return err
@@ -28,7 +28,7 @@ func NewCommand(ctx context.Context) *cobra.Command {
2828
}
2929
return nil
3030
},
31-
RunE: func(c *cobra.Command, args []string) error {
31+
RunE: func(c *cobra.Command, _ []string) error {
3232
opts := []tea.ProgramOption{
3333
tea.WithContext(ctx),
3434
tea.WithOutput(c.OutOrStdout()),

0 commit comments

Comments
 (0)