Merge "Replace ~wipe by more selective ~reload"

README.rst

@@ -127,8 +127,8 @@ You have to be a channel operator (+o) to use admin commands.
 ~newday
   Removes now/next/location entries, to be run at the start of a new day
 
-~wipe
-  Resets the database entirely (removes all defined tracks and topics)
+~reload
+  Resets the database entirely (reloads from configuration)
 
 
 Local testing

ptgbot/bot.py

@@ -163,8 +163,8 @@ class PTGBot(irc.bot.SingleServerIRCBot):
                 return
             words = msg.split()
             command = words[0][1:].lower()
-            if command == 'wipe':
-                self.data.wipe()
+            if command == 'reload':
+                self.data.reload()
             elif command == 'newday':
                 self.data.new_day_cleanup()
             elif command == 'list':

ptgbot/db.py

@@ -167,8 +167,9 @@ class PTGDataBase():
         self.data['location'] = {}
         self.save()
 
-    def wipe(self):
+    def reload(self):
         self.data = copy.deepcopy(self.BASE)
+        self.load_data_from_config()
         self.save()
 
     def save(self):