config sourcē labojumi

sources/config.py

@@ -15,18 +15,21 @@ class Source(SourceBase):
     def __init__(self,country="lv",cfg_path=None, cfg_file=""):
         self.name = "config"
         self.country=country
+        self.lists = collections.OrderedDict()
+        self.titles = {}
         if not cfg_file: cfg_file = "streams.cfg"
         cur_directory = os.path.dirname(os.path.abspath(__file__))
         if not cfg_path: cfg_path = cur_directory
         self.cfg_path = cfg_path
-        self.cfg_file = cfg_file
+        self.set_streams_file(cfg_file)
+        print "streams_file=", self.streams_file
+        self.read_streams()
+
+    def set_streams_file(self, cfg_file):
         if not ("/" in cfg_file or "\\" in cfg_file):  # ja tikai faila nosaukums, tad meklē to source folderi
-            self.streams_file = os.path.join(cfg_path,cfg_file)
+            self.streams_file = os.path.join(self.cfg_path,cfg_file)
         else:
             self.streams_file = cfg_file
-        self.lists = collections.OrderedDict()
-        self.titles = {}
-        self.read_streams()
 
     def get_content(self, data):
         print "[config] get_content",data
@@ -46,7 +49,7 @@ class Source(SourceBase):
             try:
                 sf = urllib2.urlopen(self.streams_file, "r")
             except Exception as e:
-                raise Exception("Can not open streams file %s" % self.cfg_file)
+                raise Exception("Can not open streams file %s" % self.streams_file)
                 #print "Warning: can not open streams file %s, callback to default" % self.streams_file
                 #self.streams_file = os.path.join(self.cfg_path, "streams.cfg")
                 #sf = open(self.streams_file, "r")
@@ -117,8 +120,6 @@ class Source(SourceBase):
         else:
             f.close()
 
-
-
     def get_lists(self):
         return self.lists.keys()
 
@@ -154,7 +155,9 @@ class Source(SourceBase):
 
     def move_item(self, name, pos, pos2):
         # l.insert(newindex, l.pop(oldindex))
-        if pos2 < pos:
+        if pos2 == None:
+            self.lists[name].append(self.lists[name].pop(pos))
+        elif pos2 < pos:
             self.lists[name].insert(pos2, self.lists[name].pop(pos))
         elif pos2 > pos:
             self.lists[name].insert(pos2-1, self.lists[name].pop(pos))
@@ -162,6 +165,7 @@ class Source(SourceBase):
 if __name__ == "__main__":
 
     source = Source(cfg_file="ftp://user:Kaskade7@home.blue.lv/hdd/streams.cfg")
+    #source = Source(cfg_file="streams.cfg")
     source.read_streams()
     source.write_streams()
     import sys