p2p bugs...

client/main.py

@@ -34,7 +34,7 @@ import requests,json
 from kivy.storage.jsonstore import JsonStore
 from kivy.core.window import Window
 from kivy.core.text import LabelBase
-import shutil
+import shutil,sys
 from kivy.uix.image import Image
 from p2p import p2p,crypto,api
 
@@ -247,11 +247,11 @@ class MainApp(MDApp):
         
         
     
-    def post(self, content='', media_uid=None):
+    def post(self, content='', file_id=None):
         timestamp=time.time()
-        jsond = {'content':str(content),'media_uid':media_uid,
+        jsond = {'content':str(content),'file_id':file_id,
                  'author':self.username, 'timestamp':timestamp}
-            
+        # log('posting:',jsond,sys.getsizeof(json.dumps(jsond)))
         res=self.api.post(jsond)
         if 'success' in res:
             self.root.change_screen('feed')

client/p2p/api.py

@@ -58,6 +58,7 @@ class Api(object):
                 key = key_or_keys
                 res = await node.get(key)
 
+            node.stop()
             return res
             
         return asyncio.run(_get())
@@ -68,6 +69,7 @@ class Api(object):
         if type(res)==list:
             return [None if x is None else json.loads(x) for x in res]
         else:
+            log('RES!!!',res)
             return None if res is None else json.loads(res)
 
     def set(self,key_or_keys,value_or_values):
@@ -93,7 +95,7 @@ class Api(object):
             else:
                 key = key_or_keys
                 value = value_or_values
-                res = await node.set(key,value)
+                res = await node.set(key,value) #'this is a test')
 
             node.stop()
             return res
@@ -101,6 +103,7 @@ class Api(object):
 
     def set_json(self,key,value):
         value_json = jsonify(value)
+        log('OH NO!',sys.getsizeof(value_json))
         return self.set(key,value_json)
 
     def has(self,key):

client/p2p/p2p.py

@@ -23,7 +23,7 @@ class HalfForgetfulStorage(ForgetfulStorage):
                 self.data=pickle.load(f)
 
 
-        # print('loaded:',self.data)
+        #print('>> loaded %s keys' % len(self.data))
 
         #self.data = pickle.open('sto.dat','rb') #,writeback=True)
         # self.data = self.store.get('OrderedDict',OrderedDict())
@@ -60,13 +60,14 @@ def start_first_node():
     handler.setFormatter(formatter)
     log = logging.getLogger('kademlia')
     log.addHandler(handler)
-    log.setLevel(logging.DEBUG)
+    log.setLevel(logging.INFO)
 
     loop = asyncio.get_event_loop()
     loop.set_debug(True)
 
 
-    shelf = HalfForgetfulStorage()
+    # shelf = HalfForgetfulStorage()
+    shelf = None
 
     server = Server(storage=shelf)
     loop.run_until_complete(server.listen(8468))

client/screens/post/post.py

@@ -191,17 +191,19 @@ class PostScreen(ProtectedScreen):
             return
 
         # log('?????????????????'+self.media_uid)
-        if not hasattr(self,'media_uid') and self.upload_button.selection:
-            log('REUPLOADING')
-            self.upload()
-
-        def do_post():
-            media_uid = self.media_uid if hasattr(self,'media_uid') else None
-            self.app.post(content=content, media_uid=media_uid) #, logger=logger)
-            self.close_dialog()
+        # if not hasattr(self,'img_id') and self.upload_button.selection:
+        #     log('REUPLOADING')
+        #     self.upload()
+
+        # def do_post():
+        #     media_uid = self.media_uid if hasattr(self,'media_uid') else None
+        #     self.app.post(content=content, media_uid=media_uid) #, logger=logger)
+        #     self.close_dialog()
         
-        self.open_dialog('posting')
-        Thread(target=do_post).start()
+        # self.open_dialog('posting')
+        # Thread(target=do_post).start()
+        file_id = self.img_id if hasattr(self,'img_id') else None
+        self.app.post(content=content, file_id=file_id)
         
 
 # class ViewPostScreen(ProtectedScreen):