From c4459866c8f2c9c73d1ae8eb83abb7ad9d14c255 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Sun, 18 Feb 2024 18:48:43 +0100
Subject: [PATCH] revert encoding stuff for UIDs, just use plain <prefix>-<id>

---
 scopes/storage/common.py   | 1 -
 scopes/storage/tracking.py | 4 +---
 tests/test_storage.py      | 9 +++------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/scopes/storage/common.py b/scopes/storage/common.py
index 6e32844..89f6673 100644
--- a/scopes/storage/common.py
+++ b/scopes/storage/common.py
@@ -42,7 +42,6 @@ class Storage(object):
         self.containers[container.itemFactory.prefix] = container
 
     def getItem(self, uid):
-        uid = base64.urlsafe_b64decode(uid[1:]).decode()
         prefix, id = uid.split('-')
         id = int(id)
         container = self.containers.get(prefix)
diff --git a/scopes/storage/tracking.py b/scopes/storage/tracking.py
index 184c21a..4c0ea38 100644
--- a/scopes/storage/tracking.py
+++ b/scopes/storage/tracking.py
@@ -48,9 +48,7 @@ class Track(object):
     def uid(self):
         if self.trackId is None:
             return None
-        raw = ('%s-%d' % (self.prefix, self.trackId)).encode()
-        return 'b' + base64.urlsafe_b64encode(raw).decode()
-        #return '%s-%d' % (self.prefix, self.trackId)
+        return '%s-%d' % (self.prefix, self.trackId)
 
 
 @registerContainerClass
diff --git a/tests/test_storage.py b/tests/test_storage.py
index 452345d..97390e5 100644
--- a/tests/test_storage.py
+++ b/tests/test_storage.py
@@ -54,16 +54,13 @@ class Test(unittest.TestCase):
                             data=dict(activity='concept'))
         trid02 = tracks.upsert(tr02)
         self.assertEqual(trid02, 31)
-        self.assertEqual(tr02.uid, 'bcmVjLTMx')
-        #self.assertEqual(tr02.uid, 'rec-31')
+        self.assertEqual(tr02.uid, 'rec-31')
         tr02.trackId = trid01
         trid021 = tracks.upsert(tr02)
         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('bcmVjLTMx')
+        tr03 = storage.getItem('rec-31')
         self.assertEqual(tr03.trackId, 31)
 
         n = tracks.remove(31)