From 0da0d2662aeac49875055884d9f0f1585fca1cf9 Mon Sep 17 00:00:00 2001 From: sukanka Date: Sat, 26 Nov 2022 00:24:21 +0800 Subject: [PATCH] dbmanager: update log --- updater/dbmanager.py | 9 ++++++++- updater/readme.md | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/updater/dbmanager.py b/updater/dbmanager.py index daa82aa..8e60e99 100755 --- a/updater/dbmanager.py +++ b/updater/dbmanager.py @@ -69,6 +69,9 @@ class PkgMeta(Base): self.bioc_ver = bioc_ver self.bioc_category = bioc_category + def __repr__(self) -> str: + return f"Name: {self.name},\nDesc: {self.desc},\nRepo: {self.repo},\nVersion: {self.bioc_ver},\nCategory: {self.bioc_category}" + def from_str(data, bioc_ver, bioc_cat): ''' @@ -218,12 +221,16 @@ def add_or_skip(session, table, pkgmeta): def add_or_update(session, table, pkgmeta): + def getmd5sum(desc): + return re.search(r"MD5sum: ([a-z0-9]+)\n", desc).group(1) if not pkgmeta: return if session.get(table, pkgmeta.name): - pkg = session.query(table).filter_by( name=pkgmeta.name).first() + if pkg.repo == 'CRAN' and getmd5sum(pkg.desc) != getmd5sum(pkgmeta.desc) and not (pkg.name in EXCLUDED_PKGS): + logging.warning( + f"Overwritting package: {pkg.name}\n old meta :{pkg}\n new meta: {pkgmeta} \n") pkg.desc = pkgmeta.desc pkg.repo = pkgmeta.repo pkg.bioc_ver = pkgmeta.bioc_ver diff --git a/updater/readme.md b/updater/readme.md index c62e40a..f0e106d 100644 --- a/updater/readme.md +++ b/updater/readme.md @@ -13,3 +13,4 @@ For usage, run with argument `-h`. - [ ] generate PKGBUILD for missing dependencies `depends_updater` - [x] merge `sync_meta_data` into `dbmanager` - [x] merge `pkg_archiver` into `dbmanager` +- [ ] support unarchiving CRAN pkgs automatically in `pkg_archiver`