bigeagle 11 gadi atpakaļ
vecāks
revīzija
45b2046dfb
2 mainītis faili ar 6 papildinājumiem un 10 dzēšanām
  1. 1 0
      .gitignore
  2. 5 10
      tunasync/tunasync.py

+ 1 - 0
.gitignore

@@ -55,3 +55,4 @@ target/
 
 *.swp
 *~
+/examples/tunasync.json

+ 5 - 10
tunasync/tunasync.py

@@ -233,13 +233,13 @@ class TUNASync(object):
 
     def _reload_mirrors(self, signum, frame, force=False):
         print("reload mirror configs, force restart: {}".format(force))
-        self._settings.read(self._config_file)
 
-        for section in filter(lambda s: s.startswith("mirror:"),
-                              self._settings.sections()):
+        with open(self._config_file) as f:
+            self._settings = toml.loads(f.read())
 
-            _, name = section.split(":")
-            newMirCfg = MirrorConfig(self, name, self._settings, section)
+        for mirror_opt in self._settings["mirrors"]:
+            name = mirror_opt["name"]
+            newMirCfg = MirrorConfig(self, mirror_opt)
 
             if name in self._mirrors:
                 if newMirCfg.compare(self._mirrors[name]):
@@ -265,10 +265,5 @@ class TUNASync(object):
                 print("New mirror: {}".format(name))
                 self.run_provider(name)
 
-    # def config(self, option):
-    #     if self._settings is None:
-    #         raise TUNASyncException("Config not inited")
-    #
-
 
 # vim: ts=4 sw=4 sts=4 expandtab