diapo, preg con cb, absolutas

client/main.py

@@ -45,10 +45,13 @@ class Main(object):
             self.s.send(self.slides.prev())
 
     def toggle(self):
-		if self.mode == Mode.diapo:
-			self.mode = Mode.preg
-		else
-			self.mode = Mode.diapo
+        print("toggle")
+        if self.mode == Mode.diapo:
+            self.mode = Mode.preg
+            self.s.send(self.preg.cur())
+        else:
+            self.mode = Mode.diapo
+            self.s.send(self.slides.cur())
     def timerTick(self,data):
         print(data)
 

client/preguntas.py

@@ -1,5 +1,6 @@
 class Preg():
     def __init__(self):
+        self.data = "{'type'='preg', 'value'='%s', 'number'='%d', 'total'='%d'}"
         self.preg=[]
         self.cur_preg=0
 
@@ -10,12 +11,12 @@ class Preg():
         self.preg=[]
 
     def cur(self):
-        return self.preg[self.cur_preg]
+        return ( self.data % (self.preg[self.cur_preg], self.cur_preg+1, len(self.preg)))
 
     def prev(self):
         self.cur_preg=max(self.cur_preg-1, 0)
-        return self.preg[self.cur_preg]
+        return self.cur()
 
     def next(self):
         self.cur_preg=min(self.cur_preg+1, len(self.preg)-1)
-        return self.preg[self.cur_preg]
+        return self.cur()

client/slides.py

@@ -5,6 +5,7 @@ class Slides():
     def __init__(self,path):
         if os.path.isdir(path) != True:
             print("PATH is not a dir")
+        self.data = "{'type'='diapo', 'value'='%s', 'number'='%d', 'total'='%d'}"
         self.files=sorted(glob("%s/*.png" % path), key=self.key_func)
         for f in range(0,len(self.files)):
             self.files[f] = os.path.abspath(self.files[f])
@@ -14,12 +15,12 @@ class Slides():
         return int(os.path.split(x)[-1].rsplit('.', 1)[0])
 
     def cur(self):
-        return self.files[self.cur_diapo]
+        return ( self.data % (self.files[self.cur_diapo], self.cur_diapo+1, len(self.files)))
 
     def prev(self):
         self.cur_diapo=max(self.cur_diapo-1, 0)
-        return self.files[self.cur_diapo]
+        return self.cur()
 
     def next(self):
         self.cur_diapo=min(self.cur_diapo+1, len(self.files)-1)
-        return self.files[self.cur_diapo]
+        return self.cur()

client/sock.py

@@ -14,4 +14,3 @@ class Sock(threading.Thread):
     def send(self,obj):
         data = str.encode("eba/data:%s\n" % json.dumps(obj))
         self.sock.sendto(data, self.INFOBEAMER_ADDR)
-