Skip to content

Commit 4614358

Browse files
DutchJavaDevDutchJavaDev
authored
hotfix, sync (#94)
1 parent 7457183 commit 4614358

File tree

6 files changed

+20
-34
lines changed

6 files changed

+20
-34
lines changed

‎MyMusicBoxApi/go.mod‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ go 1.24.3
55
require (
66
github.com/DATA-DOG/go-sqlmock v1.5.2
77
github.com/gin-gonic/gin v1.10.1
8+
github.com/google/uuid v1.6.0
89
github.com/stretchr/testify v1.11.1
910
github.com/swaggo/swag v1.16.6
1011
)
1112

1213
require (
1314
github.com/KyleBanks/depth v1.2.1 // indirect
14-
github.com/ProtonMail/go-crypto v1.3.0 // indirect
15-
github.com/cloudflare/circl v1.6.1 // indirect
1615
github.com/davecgh/go-spew v1.1.1 // indirect
1716
github.com/go-openapi/jsonpointer v0.22.0 // indirect
1817
github.com/go-openapi/jsonreference v0.21.1 // indirect
@@ -29,11 +28,9 @@ require (
2928
github.com/go-openapi/swag/stringutils v0.24.0 // indirect
3029
github.com/go-openapi/swag/typeutils v0.24.0 // indirect
3130
github.com/go-openapi/swag/yamlutils v0.24.0 // indirect
32-
github.com/google/uuid v1.6.0 // indirect
3331
github.com/josharian/intern v1.0.0 // indirect
3432
github.com/mailru/easyjson v0.9.0 // indirect
3533
github.com/pmezard/go-difflib v1.0.0 // indirect
36-
github.com/ulikunitz/xz v0.5.15 // indirect
3734
golang.org/x/mod v0.29.0 // indirect
3835
golang.org/x/sync v0.18.0 // indirect
3936
golang.org/x/tools v0.38.0 // indirect
@@ -54,7 +51,6 @@ require (
5451
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
5552
github.com/leodido/go-urn v1.4.0 // indirect
5653
github.com/lib/pq v1.10.9
57-
github.com/lrstanley/go-ytdlp v1.2.7
5854
github.com/mattn/go-isatty v0.0.20 // indirect
5955
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6056
github.com/modern-go/reflect2 v1.0.2 // indirect

‎MyMusicBoxApi/go.sum‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@ github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7Oputl
22
github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
33
github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
44
github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
5-
github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
6-
github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
75
github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ=
86
github.com/bytedance/sonic v1.14.0/go.mod h1:WoEbx8WTcFJfzCe0hbmyTGrfjt8PzNEBdxlNUO24NhA=
97
github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA=
108
github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
11-
github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
12-
github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
139
github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M=
1410
github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU=
1511
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -83,10 +79,6 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
8379
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
8480
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
8581
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
86-
github.com/lrstanley/go-ytdlp v1.2.6 h1:LJ1I+uaP2KviRAfe3tUN0Sd4yI9XlCJBG37RCH+sfq8=
87-
github.com/lrstanley/go-ytdlp v1.2.6/go.mod h1:38IL64XM6gULrWtKTiR0+TTNCVbxesNSbTyaFG2CGTI=
88-
github.com/lrstanley/go-ytdlp v1.2.7 h1:YNDvKkd0OCJSZLZePZvJwcirBCfL8Yw3eCwrTCE5w7Q=
89-
github.com/lrstanley/go-ytdlp v1.2.7/go.mod h1:38IL64XM6gULrWtKTiR0+TTNCVbxesNSbTyaFG2CGTI=
9082
github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
9183
github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
9284
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -117,39 +109,21 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
117109
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
118110
github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA=
119111
github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4=
120-
github.com/ulikunitz/xz v0.5.13 h1:ar98gWrjf4H1ev05fYP/o29PDZw9DrI3niHtnEqyuXA=
121-
github.com/ulikunitz/xz v0.5.13/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
122-
github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
123-
github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
124112
golang.org/x/arch v0.20.0 h1:dx1zTU0MAE98U+TQ8BLl7XsJbgze2WnNKF/8tGp/Q6c=
125113
golang.org/x/arch v0.20.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
126-
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
127-
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
128114
golang.org/x/crypto v0.44.0 h1:A97SsFvM3AIwEEmTBiaxPPTYpDC47w720rdiiUvgoAU=
129115
golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
130-
golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
131-
golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
132116
golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
133117
golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
134-
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
135-
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
136118
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
137119
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
138-
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
139-
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
140120
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
141121
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
142122
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
143-
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
144-
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
145123
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
146124
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
147-
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
148-
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
149125
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
150126
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
151-
golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
152-
golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
153127
golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
154128
golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
155129
google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=

‎MyMusicBoxApi/release‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ cp selenium/* "$COOKIES_FOLDER"
3939
cp migration_scripts/* "$MIGRATION_FOLDER"
4040

4141
echo "=== Building executable ==="
42-
go mod tidy
4342
go build -trimpath -buildvcs=false -ldflags="-s -w" -o "$RELEASE_FOLDER"
4443

4544
echo "=== Reducing executable size ==="

‎MyMusicBoxApi/service/playlist.go‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func downloadPlaylist(
114114

115115
for id := range downloadCount {
116116
name := names[id]
117-
if canDownload(name) {
117+
if canDownload(name) && !existInArchive(archiveFileName, ids[id]) {
118118

119119
childTask, _ := tasklogTable.CreateChildTaskLog(parentTask)
120120

@@ -180,6 +180,22 @@ func downloadPlaylist(
180180
}
181181
}
182182

183+
func existInArchive(path string, id string) bool {
184+
lines, err := readLines(path)
185+
186+
if err != nil {
187+
panic(-654654)
188+
}
189+
190+
for line := range lines {
191+
if strings.Contains(lines[line], fmt.Sprintf("youtube %s", id)) {
192+
return true
193+
}
194+
}
195+
196+
return false
197+
}
198+
183199
func canDownload(name string) bool {
184200

185201
if strings.HasPrefix(name, "[Deleted video]") {

‎MyMusicBoxApi/service/ytdlpHotfix.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ func FlatPlaylistDownload(
4747
"--print-to-file", "%(playlist_id)s", playlistIdFileName,
4848
"--print-to-file", "%(playlist_title)s", playlistTitleFileName,
4949
"--ignore-errors",
50-
fmt.Sprintf("--download-archive=%s", archiveFileName),
5150
"--extractor-args=youtube:player_js_variant=tv",
5251
fmt.Sprintf("--cookies=%s", cookiesPath),
5352
"--js-runtimes=deno:/home/admin/.deno/bin",

‎MyMusicBoxApi/update‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ SCRIPTS_FOLDER="$DATABASE_FOLDER/initscripts"
77
IMAGES_FOLDER="$RELEASE_FOLDER/music/images"
88
COOKIES_FOLDER="$RELEASE_FOLDER/selenium"
99
MIGRATION_FOLDER="$RELEASE_FOLDER/migration_scripts"
10+
HOTFIX_FOLDER="$RELEASE_FOLDER/hotfix_logs"
1011

1112
echo "=== Checking release folder ==="
1213

@@ -17,6 +18,7 @@ FOLDERS=(
1718
"$IMAGES_FOLDER"
1819
"$COOKIES_FOLDER"
1920
"$MIGRATION_FOLDER"
21+
"$HOTFIX_FOLDER"
2022
)
2123

2224
for folder in "${FOLDERS[@]}"; do

0 commit comments

Comments
 (0)