fnschool 20250108.81517.853__py3-none-any.whl → 20250109.80531.837__py3-none-any.whl

fnschool/__init__.py

@@ -29,7 +29,7 @@ from fnschool.user import *
 from fnschool.config import *
 
 
-__version__ = "20250108.81517.853"
+__version__ = "20250109.80531.837"
 
 
 # The end.

fnschool/canteen/spreadsheet/base.py

@@ -147,9 +147,10 @@ class Base:
 
         return bill_year
 
-    def update_food_sheet_year(self, sheet):
+    def update_food_sheet_year(self, sheet, year=None):
         wb = sheet.parent
-        bill_year = self.get_bill_year(wb)
+        bill_year = year or self.get_bill_year(wb)
+        bill_year = str(bill_year)
         csheet = sheet
         for row_index in range(1, csheet.max_row + 1):
             cell0_value = str(csheet.cell(row_index, 1).value).replace(" ", "")

fnschool/canteen/spreadsheet/food.py

@@ -641,7 +641,7 @@ class Food(Base):
             self.update_inventories(sheet)
 
             self.format(sheet)
-            self.update_food_sheet_year(sheet)
+            self.update_food_sheet_year(sheet, year)
             print_info(_("Sheet '%s' was updated.") % sheet.title)
 
         wb[self.sheet_name].sheet_state = "hidden"

fnschool/entry.py

@@ -16,12 +16,15 @@ entry_name = "entry.py"
 def get_entries():
     entries = [
         ".".join(
-            os.path.splitext(p.relative_to(module_dpath.parent.as_posix()))[
+            os.path.splitext(
+                p.relative_to(module_dpath.parent.as_posix()).as_posix()
+            )[
                 0
             ].split("/")
         )
         for p in module_dpath.glob(f"*/{entry_name}")
     ]
+    print(entries)
     return entries
 
 

{fnschool-20250108.81517.853.dist-info → fnschool-20250109.80531.837.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: fnschool
-Version: 20250108.81517.853
+Version: 20250109.80531.837
 Summary: Just some school related scripts, without any ambition.
 Author-email: larryw3i <larryw3i@163.com>, Larry Wei <larryw3i@126.com>, Larry W3i <larryw3i@yeah.net>
 Maintainer-email: larryw3i <larryw3i@163.com>, Larry Wei <larryw3i@126.com>

{fnschool-20250108.81517.853.dist-info → fnschool-20250109.80531.837.dist-info}/RECORD

@@ -1,8 +1,8 @@
-fnschool/__init__.py,sha256=0NZjfZ-K-D3h95cCYD8DYWGBpOHabN4Sths-qfmcuRE,702
+fnschool/__init__.py,sha256=Pmq2mN2mO6f1CZoCJqNNUcx1Wk02xpcl4135c6NHjmI,702
 fnschool/__main__.py,sha256=oGh9O_iIErV4v8AggpUwrakCVfCfcm1HDOysOr9L6ro,235
 fnschool/app.py,sha256=DxfVStj4s-v-56WjJcTpObc7zruw00GK_hJWSePDsIE,5301
 fnschool/config.py,sha256=ut6QTRska_PvU1REJt3KmLkVxS8Vjj-uuq0B6MFU70U,1175
-fnschool/entry.py,sha256=sXyj61M5pkgpuNdp-BpdvUbdvINfhU6YFtnZkJqiYnI,1430
+fnschool/entry.py,sha256=r7Hvix0e5eC12QzJnCgWZqDE0vYed6kr7N-SjF3DFjA,1490
 fnschool/external.py,sha256=RCE-1xL0ZHRdj72pHTcPOVKAww4TtUBB22Lz1Fb5jOQ,1894
 fnschool/inoutput.py,sha256=NkT2rTtD9lQs0SrmlIF2TeanElhEiIEE4slMRbHzsJo,2091
 fnschool/language.py,sha256=2XCG5tvp_Z66hG05qInHPqcOHE5qjZ0tdmFDjj82ewU,824
@@ -34,12 +34,12 @@ fnschool/canteen/data/bill.xlsx,sha256=6PaeLAc0mn8gvie4oeqwonm1o0HA3nTMKmz80I0Nb
 fnschool/canteen/data/consuming.xlsx,sha256=gfshtLXWZGOlUWSkuIuI3kpcIdtBb67hADqeOtI5LOg,47446
 fnschool/canteen/data/purchase_list.xlsx,sha256=U14BZWTsN4b-J0qwCBVbBKm3t-Hyv5GcbztLyez2Iuk,16095
 fnschool/canteen/spreadsheet/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-fnschool/canteen/spreadsheet/base.py,sha256=ikeYR17wajSTAoneXVQrYBX-BiRdd0VFuGup2cFUZE8,6334
+fnschool/canteen/spreadsheet/base.py,sha256=_6iRdUJtI2B9WsM1nJ61CNP2NzAyc5AW5OcfNGBGC34,6388
 fnschool/canteen/spreadsheet/consuming.py,sha256=olEWj7nkvUIpd_vo4VKKVLsAjJ08dzjBBeNkXkxEDsU,11019
 fnschool/canteen/spreadsheet/consumingsum.py,sha256=TaSWS9bY1p4LnwlXRDxKZSKAxZ90U6wOo--p7Y-6FUE,2303
 fnschool/canteen/spreadsheet/cover.py,sha256=R71ChxnBVYXM5PB2eCPbNglMXv3cHMtTC-zVrw-wz_c,1878
 fnschool/canteen/spreadsheet/ctspreadsheet.py,sha256=yRz-cYMfHl97Udsm1m7juJjF1NduEri7u9GtTjDGrag,10424
-fnschool/canteen/spreadsheet/food.py,sha256=ndPkDds5iFXFWQuDpAysPoXxDZtRllXGuzeD0Qsx8Ug,25231
+fnschool/canteen/spreadsheet/food.py,sha256=BKdb1bg6E7UZw9vFsGGYTFWFaru-5c2UzzKa8H5mRKo,25237
 fnschool/canteen/spreadsheet/inventory.py,sha256=4YQeV5r31GEoqESLbEUddLwdEoiDxJOrltDMQeeOw64,12992
 fnschool/canteen/spreadsheet/merging.py,sha256=smKVK1Go6m4kNWc8a1BFin_yP9ccjiT0xXpSD0r_dLk,10955
 fnschool/canteen/spreadsheet/preconsuming.py,sha256=AYeXay3Rq3k-HIaTOSY5XqxXpDYggM6PrreNThGOP5Q,11414
@@ -70,9 +70,9 @@ fnschool/locales/zh_CN/LC_MESSAGES/fnschool.mo,sha256=kiWFce9J90sDES-LVtnV528PkP
 fnschool/locales/zh_HK/LC_MESSAGES/fnschool.mo,sha256=LIkwykEwzZo3FOcbPfNhiCp3Eb0Io7LNrWcYNcT_bVU,454
 fnschool/locales/zh_SG/LC_MESSAGES/fnschool.mo,sha256=m9eWOXQFgvCkJQviab0O3fMFzHcTfSLhY9-VPpnfVAI,454
 fnschool/locales/zh_TW/LC_MESSAGES/fnschool.mo,sha256=mH6DlWIQVbR18YrbMUNI951vj8eLa3ZE_DHBOpWvFu8,454
-fnschool-20250108.81517.853.dist-info/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
-fnschool-20250108.81517.853.dist-info/METADATA,sha256=5s-dT0HhgRa4jAFfvmTduWrxnQrpL6Z83tPCy4vIT_8,13640
-fnschool-20250108.81517.853.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-fnschool-20250108.81517.853.dist-info/entry_points.txt,sha256=XKudeSpooEfGtZrthDxc7wwIaKDA_SPz_dciI3YMsnI,99
-fnschool-20250108.81517.853.dist-info/top_level.txt,sha256=1mt3yGbyMzI2A8F9tn4FtkU1eMSYnigdp9BwVWmvtng,9
-fnschool-20250108.81517.853.dist-info/RECORD,,
+fnschool-20250109.80531.837.dist-info/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
+fnschool-20250109.80531.837.dist-info/METADATA,sha256=1_KR6FPFH2cxTtskPxvTFLgY-y3o9VKOEVy7VcnZr9w,13640
+fnschool-20250109.80531.837.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+fnschool-20250109.80531.837.dist-info/entry_points.txt,sha256=XKudeSpooEfGtZrthDxc7wwIaKDA_SPz_dciI3YMsnI,99
+fnschool-20250109.80531.837.dist-info/top_level.txt,sha256=1mt3yGbyMzI2A8F9tn4FtkU1eMSYnigdp9BwVWmvtng,9
+fnschool-20250109.80531.837.dist-info/RECORD,,

{fnschool-20250108.81517.853.dist-info → fnschool-20250109.80531.837.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.7.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any