diff --git a/DJAGEN/branches/mustafa_branch/djagen/collector/configini.py b/DJAGEN/branches/mustafa_branch/djagen/collector/configini.py index af4f7ee..af77005 100755 --- a/DJAGEN/branches/mustafa_branch/djagen/collector/configini.py +++ b/DJAGEN/branches/mustafa_branch/djagen/collector/configini.py @@ -13,6 +13,8 @@ class Handler: self.id = id self.tmp_entries_ini = os.path.join(settings.MAIN_PATH, 'tmp_ini', 'tmp_entries.ini') + + self.config_header_ini = os.path.join(settings.MAIN_PATH, 'gezegen', 'config_header.ini') self.config_entries_ini = os.path.join(settings.MAIN_PATH, 'gezegen', 'config_entries.ini') @@ -23,11 +25,17 @@ class Handler: if not author.is_approved: return False - self.name = author.author_name + ' ' + author.author_surname + self.name = author.author_name + self.surname = author.author_surname self.face = author.author_face self.url = author.channel_url - labels = {author.label_personal:'Personal', author.label_lkd: 'LKD', author.label_community: 'Community', author.label_eng: 'Eng'} + labels = { + author.label_personal:'Personal', + author.label_lkd: 'LKD', + author.label_community: 'Community', + author.label_eng: 'Eng', + } label_li = [k for k,v in labels.iteritems() if v==1] self.author_labels = " ".join(label_li) @@ -40,12 +48,17 @@ class Handler: config_entries = open(self.config_entries_ini) tmp_entries = open(self.tmp_entries_ini, 'w') + config_header = open(self.config_header_ini) Config = ConfigParser.ConfigParser() Config.read(self.config_entries_ini) sections = Config.sections() - + header = config_header.read() + config_header.close() + tmp_entries.write(header) for section in sections: + if (section == 'Planet'): + continue config_name = Config.get(section, 'name') config_label = Config.get(section, 'label') @@ -62,6 +75,7 @@ class Handler: url = self.url face = self.face name = self.name + surname = self.surname label = self.author_labels id = self.id @@ -70,11 +84,13 @@ class Handler: url = config_url face = config_face name = config_name + surname = config_name label = config_label id = config_id - s = url + '\n' + s = '['+url+']' + '\n' s += 'name = ' + name + '\n' + s += 'surname = ' + surname + '\n' s += 'label = ' + label + '\n' if face: s += 'face = ' + face + '\n' @@ -84,10 +100,3 @@ class Handler: tmp_entries.close() - - - - - - - diff --git a/DJAGEN/branches/mustafa_branch/djagen/gezegen/planet.py b/DJAGEN/branches/mustafa_branch/djagen/gezegen/planet.py index 49bbd20..a6efa9c 100755 --- a/DJAGEN/branches/mustafa_branch/djagen/gezegen/planet.py +++ b/DJAGEN/branches/mustafa_branch/djagen/gezegen/planet.py @@ -170,6 +170,8 @@ def main(): my_planet.run(planet_name, planet_link, template_files, offline) handler_instance = PlanetHandler(my_planet) handler_instance.run() + my_planet.generate_all_files(template_files, planet_name, + planet_link, planet_feed, owner_name, owner_email) #my_planet.generate_all_files(template_files, planet_name,