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

revert encoding stuff for UIDs, just use plain <prefix>-<id>

Browse source
This commit is contained in:
Helmut Merz 2024-02-18 18:48:43 +01:00
parent 32a13ebb64
commit c4459866c8
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scopes/storage/common.py
View file

@ -42,7 +42,6 @@ class Storage(object):
self.containers[container.itemFactory.prefix] = container self.containers[container.itemFactory.prefix] = container
def getItem(self, uid): def getItem(self, uid):
uid = base64.urlsafe_b64decode(uid[1:]).decode()
prefix, id = uid.split('-') prefix, id = uid.split('-')
id = int(id) id = int(id)
container = self.containers.get(prefix) container = self.containers.get(prefix)

4
scopes/storage/tracking.py
View file

@ -48,9 +48,7 @@ class Track(object):
def uid(self): def uid(self):
if self.trackId is None: if self.trackId is None:
return None return None
raw = ('%s-%d' % (self.prefix, self.trackId)).encode() return '%s-%d' % (self.prefix, self.trackId)
return 'b' + base64.urlsafe_b64encode(raw).decode()
#return '%s-%d' % (self.prefix, self.trackId)
@registerContainerClass @registerContainerClass

9
tests/test_storage.py
View file

@ -54,16 +54,13 @@ class Test(unittest.TestCase):
data=dict(activity='concept')) data=dict(activity='concept'))
trid02 = tracks.upsert(tr02) trid02 = tracks.upsert(tr02)
self.assertEqual(trid02, 31) self.assertEqual(trid02, 31)
self.assertEqual(tr02.uid, 'bcmVjLTMx') self.assertEqual(tr02.uid, 'rec-31')
#self.assertEqual(tr02.uid, 'rec-31')
tr02.trackId = trid01 tr02.trackId = trid01
trid021 = tracks.upsert(tr02) trid021 = tracks.upsert(tr02)
self.assertEqual(trid021, trid01) self.assertEqual(trid021, trid01)
self.assertEqual(tr02.uid, 'bcmVjLTE=') self.assertEqual(tr02.uid, 'rec-' + str(trid01))
#self.assertEqual(tr02.uid, 'rec-' + str(trid01))
#tr03 = storage.getItem(b'bcmVjLTE=') tr03 = storage.getItem('rec-31')
tr03 = storage.getItem('bcmVjLTMx')
self.assertEqual(tr03.trackId, 31) self.assertEqual(tr03.trackId, 31)
n = tracks.remove(31) n = tracks.remove(31)