@@ -88,93 +88,46 @@ def is_valid(target):
8888 else :
8989 return False
9090
91+
92+ def load_template_data (bot , filename , data_dict ):
93+ data_dict .clear ()
94+ with codecs .open (os .path .join (bot .data_dir , filename ), encoding = "utf-8" ) as f :
95+ data_dict .update (json .load (f ))
96+
97+
9198@hook .on_start ()
9299def load_foods (bot ):
93100 """
94101 :type bot: cloudbot.bot.CloudBot
95102 """
96- global sandwich_data , taco_data , coffee_data , noodles_data , muffin_data , scone_data , rice_data , \
97- tea_data , keto_data , beer_data , cheese_data , pancake_data , chicken_data , \
98- icecream_data , brekkie_data , doobie_data , pizza_data , chocolate_data , pasta_data , \
99- nugget_data , cereal_data , pie_data , sushi_data , steak_data , milkshake_data , kebab_data
100-
101- with codecs .open (os .path .join (bot .data_dir , "sandwich.json" ), encoding = "utf-8" ) as f :
102- sandwich_data = json .load (f )
103-
104- with codecs .open (os .path .join (bot .data_dir , "taco.json" ), encoding = "utf-8" ) as f :
105- taco_data = json .load (f )
106-
107- with codecs .open (os .path .join (bot .data_dir , "coffee.json" ), encoding = "utf-8" ) as f :
108- coffee_data = json .load (f )
109-
110- with codecs .open (os .path .join (bot .data_dir , "noodles.json" ), encoding = "utf-8" ) as f :
111- noodles_data = json .load (f )
112-
113- with codecs .open (os .path .join (bot .data_dir , "muffin.json" ), encoding = "utf-8" ) as f :
114- muffin_data = json .load (f )
115-
116- with codecs .open (os .path .join (bot .data_dir , "scone.json" ), encoding = "utf-8" ) as f :
117- scone_data = json .load (f )
118-
119- with codecs .open (os .path .join (bot .data_dir , "rice.json" ), encoding = "utf-8" ) as f :
120- rice_data = json .load (f )
121-
122- with codecs .open (os .path .join (bot .data_dir , "tea.json" ), encoding = "utf-8" ) as f :
123- tea_data = json .load (f )
124-
125- with codecs .open (os .path .join (bot .data_dir , "keto.json" ), encoding = "utf-8" ) as f :
126- keto_data = json .load (f )
127-
128- with codecs .open (os .path .join (bot .data_dir , "beer.json" ), encoding = "utf-8" ) as f :
129- beer_data = json .load (f )
130-
131- with codecs .open (os .path .join (bot .data_dir , "cheese.json" ), encoding = "utf-8" ) as f :
132- cheese_data = json .load (f )
133-
134- with codecs .open (os .path .join (bot .data_dir , "pancake.json" ), encoding = "utf-8" ) as f :
135- pancake_data = json .load (f )
136-
137- with codecs .open (os .path .join (bot .data_dir , "chicken.json" ), encoding = "utf-8" ) as f :
138- chicken_data = json .load (f )
139-
140- with codecs .open (os .path .join (bot .data_dir , "nugget.json" ), encoding = "utf-8" ) as f :
141- nugget_data = json .load (f )
142-
143- with codecs .open (os .path .join (bot .data_dir , "pie.json" ), encoding = "utf-8" ) as f :
144- pie_data = json .load (f )
145-
146- with codecs .open (os .path .join (bot .data_dir , "brekkie.json" ), encoding = "utf-8" ) as f :
147- brekkie_data = json .load (f )
148-
149- with codecs .open (os .path .join (bot .data_dir , "icecream.json" ), encoding = "utf-8" ) as f :
150- icecream_data = json .load (f )
151-
152- with codecs .open (os .path .join (bot .data_dir , "doobie.json" ), encoding = "utf-8" ) as f :
153- doobie_data = json .load (f )
154-
155- with codecs .open (os .path .join (bot .data_dir , "pizza.json" ), encoding = "utf-8" ) as f :
156- pizza_data = json .load (f )
157-
158- with codecs .open (os .path .join (bot .data_dir , "chocolate.json" ), encoding = "utf-8" ) as f :
159- chocolate_data = json .load (f )
160-
161- with codecs .open (os .path .join (bot .data_dir , "pasta.json" ), encoding = "utf-8" ) as f :
162- pasta_data = json .load (f )
163-
164- with codecs .open (os .path .join (bot .data_dir , "cereal.json" ), encoding = "utf-8" ) as f :
165- cereal_data = json .load (f )
166-
167- with codecs .open (os .path .join (bot .data_dir , "sushi.json" ), encoding = "utf-8" ) as f :
168- sushi_data = json .load (f )
169-
170- with codecs .open (os .path .join (bot .data_dir , "steak.json" ), encoding = "utf-8" ) as f :
171- steak_data = json .load (f )
172103
173- with codecs .open (os .path .join (bot .data_dir , "milkshake.json" ), encoding = "utf-8" ) as f :
174- milkshake_data = json .load (f )
104+ load_template_data (bot , "sandwich.json" , sandwich_data )
105+ load_template_data (bot , "taco.json" , taco_data )
106+ load_template_data (bot , "coffee.json" , coffee_data )
107+ load_template_data (bot , "noodles.json" , noodles_data )
108+ load_template_data (bot , "muffin.json" , muffin_data )
109+ load_template_data (bot , "scone.json" , scone_data )
110+ load_template_data (bot , "rice.json" , rice_data )
111+ load_template_data (bot , "tea.json" , tea_data )
112+ load_template_data (bot , "keto.json" , keto_data )
113+ load_template_data (bot , "beer.json" , beer_data )
114+ load_template_data (bot , "cheese.json" , cheese_data )
115+ load_template_data (bot , "pancake.json" , pancake_data )
116+ load_template_data (bot , "chicken.json" , chicken_data )
117+ load_template_data (bot , "nugget.json" , nugget_data )
118+ load_template_data (bot , "pie.json" , pie_data )
119+ load_template_data (bot , "brekkie.json" , brekkie_data )
120+ load_template_data (bot , "icecream.json" , icecream_data )
121+ load_template_data (bot , "doobie.json" , doobie_data )
122+ load_template_data (bot , "pizza.json" , pizza_data )
123+ load_template_data (bot , "chocolate.json" , chocolate_data )
124+ load_template_data (bot , "pasta.json" , pasta_data )
125+ load_template_data (bot , "cereal.json" , cereal_data )
126+ load_template_data (bot , "sushi.json" , sushi_data )
127+ load_template_data (bot , "steak.json" , steak_data )
128+ load_template_data (bot , "milkshake.json" , milkshake_data )
129+ load_template_data (bot , "kebab.json" , kebab_data )
175130
176- with codecs .open (os .path .join (bot .data_dir , "kebab.json" ), encoding = "utf-8" ) as f :
177- kebab_data = json .load (f )
178131
179132@asyncio .coroutine
180133@hook .command
0 commit comments