stage_director

@@ -18,13 +18,14 @@ class Playlist:

     - each line is an entry or a stop point: <line> = <entry> | <stop point>

     - entries are played one after another

     - playing halts at stop points

-    - <entry> = <name> <whitespace> <duration>

-    - <stop point> = <name>

+    - <entry> = <name> <whitespace> <duration> <opt_comment>

+    - <stop point> = <name> <opt_comment>

     - <name> = [A-Za-Z0-9_]+

     - <duration> = ((<hours>:)?<minutes>:)?<seconds>

     - <hours> = [0-9]+

     - <minutes> = [0-9]+

-    - <seconds> = [0-9]+(.[0-9]+)"""

+    - <seconds> = [0-9]+(.[0-9]+)

+    - <opt_comment> = <whitespace> "#" <whitespace> <some text>"""

   def __init__(self):

     """create a new, empty playlist object"""

@@ -32,8 +33,8 @@ class Playlist:

                       # entry = dictionary { "type": "normal" or "stop"

                       #                      "name": string, name of entry

                       #                      "durtaion": float, in seconds }

-    self.reEntry = re.compile("^\s*([A-Za-z0-9_]+)\s+([0-9:.]+)\s*$")

-    self.reStop = re.compile("^\s*([A-Za-z0-9_]+)\s*$")

+    self.reEntry = re.compile("^\s*([A-Za-z0-9_]+)\s+([0-9:.]+)\s*(#\s*(.*))?$")

+    self.reStop = re.compile("^\s*([A-Za-z0-9_]+)\s*(#\s*(.*))?$")

   def read(self, filename):

     """read the playlist from filename, replacing the current playlist"""

@@ -45,17 +46,27 @@ class Playlist:

         if mEntry:

           name = mEntry.group(1)

           duration = time_fmt.str2sec(mEntry.group(2))

+          if mEntry.group(4) is not None:

+            comment = mEntry.group(4)

+          else:

+            comment = ""

           self.entries.append({"type":     "normal",

                                "name":     name,

-                               "duration": duration})

+                               "duration": duration,

+                               "comment":  comment})

           #print("DEBUG playlist entry normal %s %f" %

           #      (self.entries[-1]["name"], self.entries[-1]["duration"]))

         else:

           mStop = self.reStop.match(line)

           if mStop:

             name = mStop.group(1)

+            if mStop.group(3) is not None:

+              comment = mStop.group(3)

+            else:

+              comment = ""

             self.entries.append({"type": "stop",

-                                 "name": name})

+                                 "name": name,

+                                 "comment":  comment})

             #print("DEBUG playlist entry stop")

       f.close()

     except IOError:

@@ -70,9 +81,11 @@ class Playlist:

       if entry["type"] == "normal":

         name = entry["name"]

         duration = time_fmt.sec2str(entry["duration"])

+        comment = entry["comment"]

       else:

         name = entry["name"]

         duration = "STOP"

-      store.append([idx, Pango.Weight.NORMAL, name, duration])

+        comment = entry["comment"]

+      store.append([idx, Pango.Weight.NORMAL, name, duration, comment])

       idx = idx + 1

@@ -1,7 +1,7 @@

-Intro 1:00

-Robots 15:00

-Pause_A

-Future 1:2:3

+Intro 1:00 # intro comment

+Robots 15:00 # robot comment

+Pause_A # pause comment

+Future 1:2:3 # future comment

 This_is_a_very_long_name_with_a_very_long_duration 11:12:13.14

 some_entries 5:6

 to_make 7:8

@@ -7,8 +7,8 @@

     <property name="title" translatable="yes">About BlinkenArea Stage Director</property>

     <property name="type_hint">dialog</property>

     <property name="program_name">BlinkenArea Stage Director</property>

-    <property name="version">0.1.1</property>

-    <property name="copyright" translatable="yes">Copyright 2013-2014 Stefan Schuermans &lt;stefan@blinkenarea.org&gt;

+    <property name="version">0.1.2</property>

+    <property name="copyright" translatable="yes">Copyright 2013-2014 Stefan Schuermans &lt;stefan@schuermans.info&gt;

 Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

 a blinkenarea.org project - https://www.blinkenarea.org/</property>

     <property name="website">https://www.blinkenarea.org</property>

@@ -353,7 +353,18 @@ a blinkenarea.org project - https://www.blinkenarea.org/</property>

                       <attributes>

                         <attribute name="text">3</attribute>

                         <attribute name="weight">1</attribute>

-                        <attribute name="foreground-rgba">0</attribute>

+                      </attributes>

+                    </child>

+                  </object>

+                </child>

+                <child>

+                  <object class="GtkTreeViewColumn" id="PlaylistColumnComment">

+                    <property name="title" translatable="yes">Comment</property>

+                    <child>

+                      <object class="GtkCellRendererText" id="PlaylistCellRendererTextComment"/>

+                      <attributes>

+                        <attribute name="text">4</attribute>

+                        <attribute name="weight">1</attribute>

                       </attributes>

                     </child>

                   </object>

@@ -654,6 +665,8 @@ a blinkenarea.org project - https://www.blinkenarea.org/</property>

       <column type="gchararray"/>

       <!-- column-name Duration -->

       <column type="gchararray"/>

+      <!-- column-name Comment -->

+      <column type="gchararray"/>

     </columns>

   </object>

   <object class="GtkAdjustment" id="Position">