@@ -150,6 +150,7 @@ def query_activities(self, start_time, end_time):
150150 msg = deserialise_message (msg )
151151 meta = json .loads (meta .pairs [0 ].second )
152152 activities .append ((msg , meta ))
153+ rospy .logwarn (" Found {} messages" .format (len (activities )))
153154 return activities
154155
155156 def query_activities_days (self , days = 7 ):
@@ -181,9 +182,11 @@ def make_aibo_activities_raw(self, activities):
181182 for activities in activities :
182183 rospy .loginfo ("Found {} activities" .format (len (activities )))
183184 activities_raw = []
185+ input_topics = []
184186 for msg , meta in activities :
185187 state = None
186188 timestamp = datetime .datetime .fromtimestamp (meta ['timestamp' ]// 1000000000 , JST )
189+ input_topics .append (meta ['input_topic' ])
187190 # rospy.logwarn("{} {}".format(timestamp, meta['input_topic']))
188191 if meta ['stored_type' ] == 'aibo_driver/StringStatus' :
189192 if msg .status in ['' , 'none' ]:
@@ -210,7 +213,10 @@ def make_aibo_activities_raw(self, activities):
210213 # create activities_raw
211214 for s in state :
212215 activities_raw .append ((timestamp , s ))
213- diary_activities_raw .append (activities_raw )
216+ if len (activities_raw ) > 0 :
217+ rospy .loginfo (" {} {}" .format (activities_raw [0 ][0 ], activities_raw [- 1 ][0 ]))
218+ rospy .loginfo (" {}" .format ({key : input_topics .count (key ) for key in set (input_topics )}))
219+ diary_activities_raw .append (activities_raw )
214220 ##
215221 return diary_activities_raw ## (timestamp, event)
216222
@@ -275,6 +281,7 @@ def make_image_activities_raw(self, activities):
275281 def make_activity (self , activities = None ):
276282 if not activities :
277283 activities = self .query_activities_days ()
284+
278285 diary_activities_raw = self .make_aibo_activities_raw (activities ) ## (timestamp, event)
279286
280287 # check today
0 commit comments