cco/py-scopes
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2master

Browse source
This commit is contained in:
Helmut Merz 2024-03-10 19:47:19 +01:00
commit bf2d8a1e99
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scopes/storage/tracking.py
View file

@ -81,9 +81,15 @@ class Container(object):
self.table = self.getTable() self.table = self.getTable()
def get(self, trackId): def get(self, trackId):
stmt = self.table.select().where(self.table.c.trackid == trackId) stmt = self.table.select().where(self.table.c.trackid == int(trackId))
return self.makeTrack(self.session.execute(stmt).first()) return self.makeTrack(self.session.execute(stmt).first())
def __getitem__(self, trackId):
tr = self.get(trackId)
if tr is None:
raise KeyError(trackId)
return tr
def query(self, **crit): def query(self, **crit):
stmt = self.table.select().where( stmt = self.table.select().where(
and_(*self.setupWhere(crit))).order_by(self.table.c.trackid) and_(*self.setupWhere(crit))).order_by(self.table.c.trackid)

3
scopes/tests.py
View file

@ -34,7 +34,8 @@ class Test(unittest.TestCase):
trid01 = tracks.save(tr01) trid01 = tracks.save(tr01)
self.assertTrue(trid01 > 0) self.assertTrue(trid01 > 0)
tr01a = tracks.get(trid01) #tr01a = tracks.get(trid01)
tr01a = tracks['%07i' % trid01]
self.assertEqual(tr01a.head, tr01.head) self.assertEqual(tr01a.head, tr01.head)
self.assertEqual(tr01a.trackId, trid01) self.assertEqual(tr01a.trackId, trid01)
self.assertEqual(tr01a.data.get('activity'), 'testing') self.assertEqual(tr01a.data.get('activity'), 'testing')