Skip to content
Snippets Groups Projects
Commit 1a374abe authored by Alex McGrath's avatar Alex McGrath
Browse files

community/gonic: upgrade to 0.16.4

parent f062a56f
No related branches found
No related tags found
2 merge requests!79570community/firefox-esr: upgrade to 128.7.0,!79047community/gonic: upgrade to 0.16.4
# Contributor: Alex McGrath <amk@amk.ie>
# Maintainer: Alex McGrath <amk@amk.ie>
pkgname=gonic
pkgver=0.16.2
pkgrel=7
pkgver=0.16.4
pkgrel=0
pkgdesc="Subsonic compatible music streaming server"
url="https://github.com/sentriz/gonic"
arch="all"
......@@ -14,8 +14,6 @@ install="$pkgname.pre-install"
source="gonic-$pkgver.tar.gz::https://github.com/sentriz/gonic/archive/v$pkgver.tar.gz
gonic.initd
gonic.confd
taglib-2.0.patch
"
options="!check" # intermittent test failure
......@@ -44,8 +42,7 @@ package() {
}
sha512sums="
3d42be96b1381b58a44779e71294c4380c3005d22876b848d3f85bba5687f954883be45cda37ad40c147a64b4317566b3d647767375a76cd03c8311a26a1c972 gonic-0.16.2.tar.gz
b84492af1f4e91a4f0a631e5c8019175e3636f708dea97b10ee13f1a25e05e7836603b61a999c8b8547b5acaaea4011c37338a755d0b4ce33d1e0806d874db39 gonic-0.16.4.tar.gz
e8a65612bffd1b62175968cc34a227393364ea6fedd661854bf515cc7306e9266d823544989b671f99beb72b6caf83728fa7c7fd9eedbc85a3e34ea84c1ce269 gonic.initd
b72e31c0f9f79694736aadb8ca581fdb269e82ece9f2c8e45cdb4edb3e01c7fd140e65c11be65cc242dddb273c8c93fde2af12a32241d7936318f3c3cd73d2ec gonic.confd
6bf5b5d740e5c3f448978c66af0b4f11608a1c0323e3b898a2c599be8c058fdad390685843cf4e5efedcada49441807493e09d6b7911a64a13b4871b2c63e1ea taglib-2.0.patch
"
Patch-Source: https://github.com/sentriz/gonic/commit/29c5397dae82017e24347afe65e9bbf9be10a494
From 29c5397dae82017e24347afe65e9bbf9be10a494 Mon Sep 17 00:00:00 2001
From: sentriz <senan@senan.xyz>
Date: Fri, 2 Feb 2024 19:42:24 +0000
Subject: [PATCH] feat: bump audiotags fork to support taglib v2
---
go.mod | 2 +-
go.sum | 4 ++--
tags/taglib/taglib.go | 10 ++++++++--
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/go.mod b/go.mod
index 4b6d3e97..28204815 100644
--- a/go.mod
+++ b/go.mod
@@ -23,7 +23,7 @@ require (
github.com/peterbourgon/ff v1.7.1
github.com/philippta/go-template v0.0.0-20220911145045-4556aca435e4
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be
- github.com/sentriz/audiotags v0.0.0-20230419125925-8886243b2137
+ github.com/sentriz/audiotags v0.0.0-20240202193907-618ae39d7743
github.com/sentriz/gormstore v0.0.0-20220105134332-64e31f7f6981
github.com/stretchr/testify v1.8.4
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3
diff --git a/go.sum b/go.sum
index 58d52527..b2e21f02 100644
--- a/go.sum
+++ b/go.sum
@@ -132,8 +132,8 @@ github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
-github.com/sentriz/audiotags v0.0.0-20230419125925-8886243b2137 h1:K0PSMi/p9ISHpfRFJB03d7VX+jjEsDARsTlAcN1zpac=
-github.com/sentriz/audiotags v0.0.0-20230419125925-8886243b2137/go.mod h1:nUVlCJ7n2jQoJ5rttpHozZ8pHJIhD9VehL6GP21FoDU=
+github.com/sentriz/audiotags v0.0.0-20240202193907-618ae39d7743 h1:aecPwcrY8mYmZmd9XgQcG8aILRuhRxeQMSunnr6DQ3U=
+github.com/sentriz/audiotags v0.0.0-20240202193907-618ae39d7743/go.mod h1:Zoo4UP5t2ySbPwScJfoydAlLLBonoqntv4ovA1T91Z8=
github.com/sentriz/gormstore v0.0.0-20220105134332-64e31f7f6981 h1:sLILANWN76ja66/K4k/mBqJuCjDZaM67w+Ru6rEB0s0=
github.com/sentriz/gormstore v0.0.0-20220105134332-64e31f7f6981/go.mod h1:Rx8XB1ck+so+41uu9VY1gMKs1CPQ2NTq0pzf+OCCQHo=
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=
diff --git a/tags/taglib/taglib.go b/tags/taglib/taglib.go
index ff660165..3008c376 100644
--- a/tags/taglib/taglib.go
+++ b/tags/taglib/taglib.go
@@ -1,6 +1,7 @@
package taglib
import (
+ "fmt"
"path/filepath"
"strconv"
"strings"
@@ -20,8 +21,13 @@ func (TagLib) CanRead(absPath string) bool {
}
func (TagLib) Read(absPath string) (tagcommon.Info, error) {
- raw, props, err := audiotags.Read(absPath)
- return &info{raw, props}, err
+ f, err := audiotags.Open(absPath)
+ if err != nil {
+ return nil, fmt.Errorf("open: %w", err)
+ }
+ props := f.ReadAudioProperties()
+ raw := f.ReadTags()
+ return &info{raw, props}, nil
}
type info struct {
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment