master
marxzuckerburg 4 years ago
parent c3967d444e
commit 8298f401d9

@ -7,7 +7,7 @@ from .cli.artcode import *
import os,sys import os,sys
from collections import defaultdict from collections import defaultdict
from base64 import b64encode,b64decode from base64 import b64encode,b64decode
import ujson as json import json
import binascii,asyncio import binascii,asyncio
from pprint import pprint from pprint import pprint

@ -210,6 +210,12 @@ class CryptList(Crypt): # like inbox
# res = self.db.lpush(self.keyname,val_x) # res = self.db.lpush(self.keyname,val_x)
# res = self.db.command('rpush',self.keyname,val_x) # res = self.db.command('rpush',self.keyname,val_x)
oldval = self.db.get(self.keyname) oldval = self.db.get(self.keyname)
if oldval:
newval = oldval + [val_x]
else:
newval = [val_x]
res=self.db.set(self.keyname, newval)
self.log('-->',res) self.log('-->',res)
return res return res
@ -217,13 +223,20 @@ class CryptList(Crypt): # like inbox
self.log('<--val',val) self.log('<--val',val)
if type(val)==list: return [self.prepend(x) for x in val] if type(val)==list: return [self.prepend(x) for x in val]
val_x = self.package_val(val) val_x = self.package_val(val)
res = self.db.command('lpush',self.keyname,val_x) # res = self.db.command('lpush',self.keyname,val_x)
oldval = self.db.get(self.keyname)
if oldval:
newval = [val_x] + oldval
else:
newval = [val_x]
res=self.db.set(self.keyname, newval)
self.log('-->',res) self.log('-->',res)
return res return res
@property @property
def values(self): def values(self):
l = self.db.command('lrange',self.keyname, '0', '-1') #l = self.db.command('lrange',self.keyname, '0', '-1')
l=self.db.get(self.keyname)
self.log('<-- l',l) self.log('<-- l',l)
if not l: return [] if not l: return []
vals = [self.unpackage_val(x) for x in l] vals = [self.unpackage_val(x) for x in l]
@ -234,8 +247,10 @@ class CryptList(Crypt): # like inbox
self.log('<--',val) self.log('<--',val)
if type(val)==list: return [self.remove(x) for x in val] if type(val)==list: return [self.remove(x) for x in val]
val_x = self.package_val(val) val_x = self.package_val(val)
self.db.command('lrem',self.keyname,'0',val_x) #self.db.command('lrem',self.keyname,'0',val_x)
l = self.db.get(self.keyname)
l = [x for x in l if x!=val_x]
self.db.set(self.keyname,l)

@ -307,8 +307,8 @@ def hasher(dat,secret=None):
from base64 import b64encode,b64decode from base64 import b64encode,b64decode
import ujson as json
import pickle import pickle
import json
def package_for_transmission(data_json): def package_for_transmission(data_json):
# print('package_for_transmission.data_json =',data_json) # print('package_for_transmission.data_json =',data_json)

@ -60,7 +60,6 @@ toml==0.10.1
torpy==1.1.3 torpy==1.1.3
typed-ast typed-ast
u-msgpack-python==2.7.0 u-msgpack-python==2.7.0
ujson
urllib3==1.25.10 urllib3==1.25.10
utm==0.6.0 utm==0.6.0
watchdog==0.10.3 watchdog==0.10.3

Loading…
Cancel
Save