Add class struct

2 files changed, 28 insertions, 13 deletions

diff --git a/client.py b/client.py
index 768d9b3..0459530 100644
--- a/client.py
+++ b/client.py
@@ -2,18 +2,33 @@ from unipath import FSPath as Path
 
 DATA_DIR = Path(__file__).absolute().ancestor(1).child('data')
 
-sequences = {}
 
-with open(DATA_DIR.child('data.txt'), 'r') as f:
-    data = f.read()
-    sequence_data, composition_data = data.split('\n===\n')
+class LightLoopClient(object):
+    def __init__(self):
+        self.sequences = {}
+        self.compostion = []
+        self.init_data()
 
-    for sequence in sequence_data.split('#')[1:]:
-        lines = sequence.split('\n')
-        name, sequence_data = lines[0].strip(), filter(lambda x: x != '', lines[1:]).split()
-        sequences[name] = sequence_data
+    def init_data(self):
+        with open(DATA_DIR.child('data.txt'), 'r') as f:
+            data = f.read()
+            sequence_data, composition_data = data.split('\n===\n')
 
-    composition = composition_data.split('\n')[1:]
+            for sequence in sequence_data.split('#')[1:]:
+                lines = sequence.split('\n')
+                name, sequence_data = lines[0].strip(), filter(lambda x: x != '', lines[1:])
+                self.sequences[name] = sequence_data
 
-    print composition
-    print sequences
+            self.composition = composition_data.split('\n')[1:]
+
+    def print_data(self):
+        print self.sequences
+        print self.composition
+
+    def loop(self):
+        self.print_data()
+            
+
+if __name__ == '__main__':
+    client = LightLoopClient()
+    client.loop()
diff --git a/templates/home.html b/templates/home.html
index ae0a933..eda6e82 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -72,13 +72,13 @@
                     <textarea id="composition-area" cols="80" rows="20"></textarea>
                     <h4>Composition Format</h4>
                     <pre>
-# composition
+# composition_100
 blinking,blinking,off,off
 on,on,blinking,on
 on,off,fade,fade
 
                     </pre>
-                    <p>Rules: all rows same length of sequences</p>
+                    <p>Rules: name must include tempo, all rows same length of sequences</p>
                 </div>
             </div>
         </div>