Skip to content

Commit bbb4177

Browse files
authored
Merge branch 'BRAVO68WEB:main' into gh-action-test
2 parents 6ff0a1f + 7c10728 commit bbb4177

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

packages/dbgen/src/parser.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,8 @@ mod date_serde {
375375
D: Deserializer<'de>,
376376
{
377377
let timestamp = i64::deserialize(deserializer)?;
378-
Ok(Utc.timestamp(timestamp, 0))
378+
Ok(Utc.timestamp_opt(timestamp, 0)
379+
.single()
380+
.ok_or_else(|| serde::de::Error::custom("Invalid timestamp"))?)
379381
}
380382
}

scripts/get_dbs.sh

+15
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ echo "Downloading blackarch"
2424
curl https://mirrors.gethosted.online/blackarch/blackarch/blackarch/os/x86_64/blackarch.db.tar.gz --output db/blackarch.db.tar.gz >/dev/null 2>&1
2525
echo "Downloaded blackarch"
2626

27+
echo "Downloading mingw64"
28+
curl https://repo.msys2.org/mingw/x86_64/mingw64.files --output db/mingw64.files >/dev/null 2>&1
29+
echo "Downloaded mingw64"
30+
2731
echo "Completed downloading databases"
2832

2933
echo "Creating directories"
@@ -32,6 +36,7 @@ mkdir -p db/extra
3236
mkdir -p db/multilib
3337
mkdir -p db/chaotic-aur
3438
mkdir -p db/blackarch
39+
mkdir -p db/mingw64
3540
echo "Directories created"
3641

3742
echo "Extracting Databases"
@@ -57,6 +62,11 @@ echo "Extracting blackarch"
5762
tar -xzf db/blackarch.db.tar.gz -C db/blackarch >/dev/null 2>&1
5863
echo "Extracted blackarch"
5964

65+
echo "Extracting mingw64"
66+
cp db/mingw64.files db/mingw64.zst
67+
tar --zstd -xvf db/mingw64.zst -C db/mingw64 >/dev/null 2>&1
68+
echo "Extracted mingw64"
69+
6070
echo "Completed extracting databases"
6171

6272
echo "Removing tar files"
@@ -66,8 +76,13 @@ rm db/multilib.db.tar.gz
6676
rm db/chaotic-aur.zst
6777
rm db/chaotic-aur.files
6878
rm db/blackarch.db.tar.gz
79+
rm db/mingw64.zst
80+
rm db/mingw64.files
6981
echo "Removed tar files"
7082

83+
# Remove unnecessary files 'files'
84+
rm db/**/files
85+
7186
echo $(date +"%s") > db/endtime
7287

7388
# aur

0 commit comments

Comments
 (0)