From edbb8286146920583087080809f6e904ca856cc9 Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Thu, 25 Aug 2022 10:18:33 +0200 Subject: [proxy] make package version info page also display other versions; fix&improve some aspects of package loading and dependency recomputing --- src/hydrilla/proxy/state_impl/repos.py | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) (limited to 'src/hydrilla/proxy/state_impl/repos.py') diff --git a/src/hydrilla/proxy/state_impl/repos.py b/src/hydrilla/proxy/state_impl/repos.py index d4fbbce..346e113 100644 --- a/src/hydrilla/proxy/state_impl/repos.py +++ b/src/hydrilla/proxy/state_impl/repos.py @@ -202,17 +202,11 @@ class ConcreteRepoRef(st.RepoRef): cursor.execute( ''' SELECT - iv.definition, r.name, ri.iteration + definition, repo, repo_iteration FROM - mapping_statuses AS ms - JOIN item_versions AS iv - ON ms.active_version_id = iv.item_version_id - JOIN repo_iterations AS ri - USING (repo_iteration_id) - JOIN repos AS r - USING (repo_id) + item_versions_extra WHERE - ms.required + active = 'R'; ''' ) @@ -288,18 +282,6 @@ class ConcreteRepoRef(st.RepoRef): self.state.rebuild_structures() - cursor.execute( - ''' - UPDATE - repos - SET - last_refreshed = STRFTIME('%s', 'NOW') - WHERE - repo_id = ?; - ''', - (self.id,) - ) - return ConcreteRepoIterationRef(str(new_iteration_id), self.state) def get_display_info(self) -> st.RepoDisplayInfo: @@ -332,7 +314,7 @@ class ConcreteRepoStore(st.RepoStore): state: base.HaketiloStateWithFields def get(self, id: str) -> st.RepoRef: - return ConcreteRepoRef(id, self.state) + return ConcreteRepoRef(str(int(id)), self.state) def add(self, name: str, url: str) -> st.RepoRef: name = name.strip() @@ -360,8 +342,8 @@ class ConcreteRepoStore(st.RepoStore): cursor.execute( ''' - INSERT INTO repos(name, url, deleted, next_iteration) - VALUES (?, ?, FALSE, 1) + INSERT INTO repos(name, url) + VALUES (?, ?) ON CONFLICT (name) DO UPDATE SET name = excluded.name, -- cgit v1.2.3