From b54da8acbcba978e91ad1bf892605377af4d57bd Mon Sep 17 00:00:00 2001
From: Aidan <lwfcst@163.com>
Date: Thu, 5 Dec 2024 13:45:57 +0800
Subject: [PATCH 1/3] fix: merge py

---
 .DS_Store        | Bin 0 -> 8196 bytes
 scripts/merge.py |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..43eadf88e1f517ffc837f9cc45d5438ba35ad3ac
GIT binary patch
literal 8196
zcmeHM&59F25U!3pJF^=I@#J0>=IlTq>H}mq2^iFs><|?KySfP(h5WIJq8G_Mhb5Oq
z5PSu_dhqJSQw~0X;L*DWf2yhn>7JR6UUY@+hVBY8UsYFsUDZuZ06^?M?v??z0Kmge
zvY5vqqtScnsg{eMTt+ESAK(!j!WAgN6rQHg_JL)<GGH073|Iy%1OEd9cxO}d4EMf#
zYe&m~W#C*gK<9&xon$4JGb#D#z=2Bulxz5y8~(;RfOY&>R$@7ml2y^BtR6(HD&i7D
zNOgSg6C7nFmNO}(ItZx_BA!{q6^h{5QO{>Mh>DbUv<z4V(hN}To`()r?qhhM)$h|r
zf7ChZkB$(5NtOGEN%iFiH#XzKO=v(B>aYhP)O9rMpvHlM-hh2X?m!K0p)A1wx(SWf
z2@Mw}=+`lOHie0f7Tc@Q{iqyvMuV|ju=s#7VQ(<1)#BB8_rAY4csqNKKBrOLKR}Hi
zs<ZJ4<TR_e$_}pKNy7852_C&>H41u#{q1agE=u6no7bOx&c=#)0_%o%!%LCLGVUn6
zQufGc6|?Q~-al86UaJ@d?YYTk+I>A%+H?FeR5n<r6&4ihE~Du?QU-tQOB#JO8_k}m
zo=e-;3}}o&p`yL^JPMjs(>j^&6n?QZ;xTG9`|F3{-Y0`E6pba7m0rQjA)x2lUb>7n
za7fvcfi`eRtIR+fI20J)8rtg>qG0HlIHCB~@SFXMcfLgdF=Nu9UDb4)e#5{b@uIOf
zbXK#dM<SzFu&ALohE5ca_a?uI8%<-AG)|V2H|Di+jH&VNn6jT^T|=I{%VvdgNM}X*
zkd5XYRXNN{^y)q0eO0xb#nND(qESV9i{<aKPQyE=bAx5#Tg%T=%;#3ov_E{-s`&Mn
zw|h6TZBxc+XI!4JQ6NuT(+re(nieko%-RJx^A^?rb@TWCGxN_*Y#Fc&{Cx(*S}m;Y
z;yl7I7uDK6_WRhW5pE_WtKh)pI7%+ZQU3bF5P$m!C7ntvXHw!5Z2$a2fW7~@meX!f
P*WUkJ<5DGZPVWDoi|hV8

literal 0
HcmV?d00001

diff --git a/scripts/merge.py b/scripts/merge.py
index 3c053a4..49b94da 100644
--- a/scripts/merge.py
+++ b/scripts/merge.py
@@ -6,7 +6,7 @@
 def merge(output):
     with open(output, 'w', encoding='utf-8') as o:
         for file in os.listdir():
-            if file.endswith('.csv'):
+            if file.endswith('.csv') and file != output:
                 with open(file, encoding='utf-8') as i:
                     i.readline()    # the first row is the header, skipping
                     for line in i:

From 78f1649dc6b281556e0c12254dca3ff0b9baf634 Mon Sep 17 00:00:00 2001
From: vinelink <57426410+vinelink@users.noreply.github.com>
Date: Thu, 5 Dec 2024 14:47:31 +0800
Subject: [PATCH 2/3] Delete .DS_Store

---
 .DS_Store | Bin 8196 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 43eadf88e1f517ffc837f9cc45d5438ba35ad3ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHM&59F25U!3pJF^=I@#J0>=IlTq>H}mq2^iFs><|?KySfP(h5WIJq8G_Mhb5Oq
z5PSu_dhqJSQw~0X;L*DWf2yhn>7JR6UUY@+hVBY8UsYFsUDZuZ06^?M?v??z0Kmge
zvY5vqqtScnsg{eMTt+ESAK(!j!WAgN6rQHg_JL)<GGH073|Iy%1OEd9cxO}d4EMf#
zYe&m~W#C*gK<9&xon$4JGb#D#z=2Bulxz5y8~(;RfOY&>R$@7ml2y^BtR6(HD&i7D
zNOgSg6C7nFmNO}(ItZx_BA!{q6^h{5QO{>Mh>DbUv<z4V(hN}To`()r?qhhM)$h|r
zf7ChZkB$(5NtOGEN%iFiH#XzKO=v(B>aYhP)O9rMpvHlM-hh2X?m!K0p)A1wx(SWf
z2@Mw}=+`lOHie0f7Tc@Q{iqyvMuV|ju=s#7VQ(<1)#BB8_rAY4csqNKKBrOLKR}Hi
zs<ZJ4<TR_e$_}pKNy7852_C&>H41u#{q1agE=u6no7bOx&c=#)0_%o%!%LCLGVUn6
zQufGc6|?Q~-al86UaJ@d?YYTk+I>A%+H?FeR5n<r6&4ihE~Du?QU-tQOB#JO8_k}m
zo=e-;3}}o&p`yL^JPMjs(>j^&6n?QZ;xTG9`|F3{-Y0`E6pba7m0rQjA)x2lUb>7n
za7fvcfi`eRtIR+fI20J)8rtg>qG0HlIHCB~@SFXMcfLgdF=Nu9UDb4)e#5{b@uIOf
zbXK#dM<SzFu&ALohE5ca_a?uI8%<-AG)|V2H|Di+jH&VNn6jT^T|=I{%VvdgNM}X*
zkd5XYRXNN{^y)q0eO0xb#nND(qESV9i{<aKPQyE=bAx5#Tg%T=%;#3ov_E{-s`&Mn
zw|h6TZBxc+XI!4JQ6NuT(+re(nieko%-RJx^A^?rb@TWCGxN_*Y#Fc&{Cx(*S}m;Y
z;yl7I7uDK6_WRhW5pE_WtKh)pI7%+ZQU3bF5P$m!C7ntvXHw!5Z2$a2fW7~@meX!f
P*WUkJ<5DGZPVWDoi|hV8


From b5abff4c58fb8f6a39bcaa09f2fa5b98a4c6adfc Mon Sep 17 00:00:00 2001
From: vinelink <57426410+vinelink@users.noreply.github.com>
Date: Thu, 5 Dec 2024 14:48:05 +0800
Subject: [PATCH 3/3] Update .gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index b03e902..c09ba98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 *.pyc
 poetry.csv
+
+# macOS
+.DS_Store