Skip to content

Commit

Permalink
Merge pull request #22 from OldTyT/dev
Browse files Browse the repository at this point in the history 
Remove sub label
  • Loading branch information
@OldTyT
OldTyT authored Dec 23, 2024
2 parents d4956e2 + 8ed5f32 commit a56d941
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 6 deletions.
123 changes: 123 additions & 0 deletions .github/workflows/github-docker-dev.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
---
name: Dev Docker Image CI(GitHub)

on:
push:
branches:
- dev


jobs:
build_amd64:
name: "[amd64] Build & Push"
runs-on: ubuntu-latest
env:
REPOSITORY_URL: ghcr.io
IMAGE_NAME: oldtyt/frigate-telegram
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Variables
id: vars
run: echo "::set-output name=SHORT_COMMIT_ID::$(git rev-parse --short HEAD)"
- name: Build image
id: docker-build
run: >-
docker build
-t $IMAGE_NAME
-t $REPOSITORY_URL/$IMAGE_NAME:dev-amd64-${{ steps.vars.outputs.SHORT_COMMIT_ID }}
-t $REPOSITORY_URL/$IMAGE_NAME:dev-amd64
-f docker/amd64/Dockerfile .
- name: Docker Login
uses: docker/login-action@v3
with:
registry: ${{ env.REPOSITORY_URL }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Publish Image
id: docker-push
run: docker push --all-tags $REPOSITORY_URL/$IMAGE_NAME
build_arm32v6:
name: "[arm32v6] Build & Push"
runs-on: ubuntu-latest
env:
REPOSITORY_URL: ghcr.io
IMAGE_NAME: oldtyt/frigate-telegram
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Variables
id: vars
run: echo "::set-output name=SHORT_COMMIT_ID::$(git rev-parse --short HEAD)"
- name: Set arm32v6 platform
run: docker buildx create --platform linux/arm/v6 --name arm --use
- name: Docker Login
uses: docker/login-action@v3
with:
registry: ${{ env.REPOSITORY_URL }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build image
id: docker-build
run: >-
docker buildx build
--platform linux/arm/v6
-t $REPOSITORY_URL/$IMAGE_NAME:dev-arm32v6-${{ steps.vars.outputs.SHORT_COMMIT_ID }}
-t $REPOSITORY_URL/$IMAGE_NAME:dev-arm32v6
-f docker/arm32v6/Dockerfile --push .
build_arm32v7:
name: "[arm32v7] Build & Push"
runs-on: ubuntu-latest
env:
REPOSITORY_URL: ghcr.io
IMAGE_NAME: oldtyt/frigate-telegram
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Variables
id: vars
run: echo "::set-output name=SHORT_COMMIT_ID::$(git rev-parse --short HEAD)"
- name: Set arm32v7 platform
run: docker buildx create --platform linux/arm/v7 --name arm --use
- name: Docker Login
uses: docker/login-action@v3
with:
registry: ${{ env.REPOSITORY_URL }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build image
id: docker-build
run: >-
docker buildx build
--platform linux/arm/v7
-t $REPOSITORY_URL/$IMAGE_NAME:dev-arm32v7-${{ steps.vars.outputs.SHORT_COMMIT_ID }}
-t $REPOSITORY_URL/$IMAGE_NAME:dev-arm32v7
-f docker/arm32v7/Dockerfile --push .
build_arm64v8:
name: "[arm64v8] Build & Push"
runs-on: ubuntu-latest
env:
REPOSITORY_URL: ghcr.io
IMAGE_NAME: oldtyt/frigate-telegram
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Variables
id: vars
run: echo "::set-output name=SHORT_COMMIT_ID::$(git rev-parse --short HEAD)"
- name: Set arm64v8 platform
run: docker buildx create --platform linux/arm64/v8 --name arm --use
- name: Docker Login
uses: docker/login-action@v3
with:
registry: ${{ env.REPOSITORY_URL }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build image
id: docker-build
run: >-
docker buildx build
--platform linux/arm64/v8
-t $REPOSITORY_URL/$IMAGE_NAME:dev-arm64v8-${{ steps.vars.outputs.SHORT_COMMIT_ID }}
-t $REPOSITORY_URL/$IMAGE_NAME:dev-arm64v8
-f docker/arm64v8/Dockerfile --push .
11 changes: 5 additions & 6 deletions internal/frigate/frigate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ type EventsStruct []struct {
PlusID interface{} `json:"plus_id"`
RetainIndefinitely bool `json:"retain_indefinitely"`
StartTime float64 `json:"start_time"`
SubLabel []any `json:"sub_label"`
// SubLabel []any `json:"sub_label"`
Thumbnail string `json:"thumbnail"`
TopScore interface{} `json:"top_score"`
Zones []any `json:"zones"`
Expand All @@ -65,7 +65,7 @@ type EventStruct struct {
PlusID interface{} `json:"plus_id"`
RetainIndefinitely bool `json:"retain_indefinitely"`
StartTime float64 `json:"start_time"`
SubLabel []any `json:"sub_label"`
// SubLabel []any `json:"sub_label"`
Thumbnail string `json:"thumbnail"`
TopScore interface{} `json:"top_score"`
Zones []any `json:"zones"`
Expand Down Expand Up @@ -93,7 +93,6 @@ func NormalizeTagText(text string) string {
func GetTagList(Tags []any) []string {
var my_tags []string
for _, zone := range Tags {
fmt.Println(zone)
if zone != nil {
my_tags = append(my_tags, NormalizeTagText(zone.(string)))
}
Expand Down Expand Up @@ -226,9 +225,9 @@ func SendMessageEvent(FrigateEvent EventStruct, bot *tgbotapi.BotAPI) {
text := "*Event*\n"
text += "┣*Camera*\n┗ #" + NormalizeTagText(FrigateEvent.Camera) + "\n"
text += "┣*Label*\n┗ #" + NormalizeTagText(FrigateEvent.Label) + "\n"
if FrigateEvent.SubLabel != nil {
text += "┣*SubLabel*\n┗ #" + strings.Join(GetTagList(FrigateEvent.SubLabel), ", #") + "\n"
}
// if FrigateEvent.SubLabel != nil {
// text += "┣*SubLabel*\n┗ #" + strings.Join(GetTagList(FrigateEvent.SubLabel), ", #") + "\n"
// }
t_start := time.Unix(int64(FrigateEvent.StartTime), 0)
text += fmt.Sprintf("┣*Start time*\n┗ `%s", t_start) + "`\n"
if FrigateEvent.EndTime == 0 {
Expand Down

0 comments on commit a56d941

Please sign in to comment.