Remove fomod metadata handling

Author: Daniel Nunes

Mopy/bash/basher/gui_fomod.py

@@ -56,15 +56,11 @@ def __init__(self):
 
 class InstallerFomod(wiz.Wizard):
     def __init__(self, parent_window, installer, page_size, pos):
-        fomod_files = installer.fomod_files()
-        info_path = fomod_files[0]
-        if info_path is not None:
-            info_path = info_path.s
-        conf_path = fomod_files[1].s
+        fomod_file = installer.fomod_file().s
         data_path = bass.dirs['mods']
         ver = env.get_file_version(bass.dirs['app'].join(bush.game.exe).s)
         game_ver = u'.'.join([unicode(i) for i in ver])
-        self.parser = FomodInstaller(info_path, conf_path, dest=data_path,
+        self.parser = FomodInstaller(fomod_file, dest=data_path,
                                      game_version=game_ver)
         mod_name = self.parser.fomod_name
 

Mopy/bash/bosh/bain.py

@@ -195,7 +195,6 @@ def initDefault(self):
         # LowerDict mapping destinations (relative to Data/ directory) of files
         # in this installer to their size and crc - built in refreshDataSizeCrc
         self.ci_dest_sizeCrc = bolt.LowerDict()
-        self.has_fomod_info = False
         self.has_fomod_conf = False
         self.hasWizard = False
         self.hasBCF = False
@@ -604,7 +603,7 @@ def refreshDataSizeCrc(self, checkOBSE=False, splitExt=os.path.splitext):
         """
         type_    = self.type
         #--Init to empty
-        self.has_fomod_info = self.has_fomod_conf = False
+        self.has_fomod_conf = False
         self.hasWizard = self.hasBCF = self.hasReadme = False
         self.packageDoc = self.packagePic = None # = self.extras_dict['readMe']
         for attr in {'skipExtFiles','skipDirFiles','espms'}:
@@ -652,9 +651,7 @@ def refreshDataSizeCrc(self, checkOBSE=False, splitExt=os.path.splitext):
         root_path = self.extras_dict.get('root_path', u'')
         rootIdex = len(root_path)
         for full,size,crc in self.fileSizeCrcs:
-            if full.lower() == "fomod" + os.sep + "info.xml":
-                self.has_fomod_info = full
-            elif full.lower() == "fomod" + os.sep + "moduleconfig.xml":
+            if full.lower() == "fomod" + os.sep + "moduleconfig.xml":
                 self.has_fomod_conf = full
             fomod_dict = self.extras_dict.get('fomod_files_dict', {})
             if self.extras_dict.get('fomod_active', False) and full in fomod_dict.values():
@@ -1001,7 +998,7 @@ def open_readme(self): self._open_txt_file(self.hasReadme)
     def open_wizard(self): self._open_txt_file(self.hasWizard)
     def _open_txt_file(self, rel_path): raise AbstractError
     def wizard_file(self): raise AbstractError
-    def fomod_files(self): raise AbstractError
+    def fomod_file(self): raise AbstractError
 
     def __repr__(self):
         return self.__class__.__name__ + u"<" + repr(self.archive) + u">"
@@ -1296,12 +1293,10 @@ def wizard_file(self):
                 bolt.SubProgress(progress,0,0.9), recurse=True)
         return unpack_dir.join(self.hasWizard)
 
-    def fomod_files(self):
+    def fomod_file(self):
         with balt.Progress(_(u'Extracting fomod files...'), u'\n' + u' ' * 60,
                            abort=True) as progress:
             files_to_extract = [self.has_fomod_conf]
-            if self.has_fomod_info:
-                files_to_extract.append(self.has_fomod_info)
             files_to_extract.extend(x for (x, _s, _c) in self.fileSizeCrcs if
                                     x.lower().endswith((
                                         u'bmp', u'jpg', u'jpeg', u'png',
@@ -1311,11 +1306,7 @@ def fomod_files(self):
             unpack_dir = self.unpackToTemp(files_to_extract,
                                            bolt.SubProgress(progress, 0, 0.9),
                                            recurse=True)
-        if self.has_fomod_info:
-            return (unpack_dir.join(self.has_fomod_info),
-                    unpack_dir.join(self.has_fomod_conf))
-        else:
-            return None, unpack_dir.join(self.has_fomod_conf)
+        return unpack_dir.join(self.has_fomod_conf)
 
 #------------------------------------------------------------------------------
 class InstallerProject(Installer):
@@ -1519,13 +1510,8 @@ def _open_txt_file(self, rel_path):
     def wizard_file(self):
         return bass.dirs['installers'].join(self.archive, self.hasWizard)
 
-    def fomod_files(self):
-        if self.has_fomod_info:
-            info = bass.dirs['installers'].join(self.archive, self.has_fomod_info)
-        else:
-            info = None
-        conf = bass.dirs['installers'].join(self.archive, self.has_fomod_conf)
-        return info, conf
+    def fomod_file(self):
+        return bass.dirs['installers'].join(self.archive, self.has_fomod_conf)
 
 def projects_walk_cache(func): ##: HACK ! Profile
     """Decorator to make sure I dont leak self._dir_dirs_files project cache.

Mopy/bash/fomod.py

@@ -370,26 +370,10 @@ class FomodInstaller(object):
     after the installation process to keep track of flag and file changes,
     respectively.
     """
-    def __init__(self, info_path, conf_path, dest=None, game_version=None):
+    def __init__(self, conf_path, dest=None, game_version=None):
         # read metadata
         conf_tree = etree.parse(conf_path)
         self.fomod_name = conf_tree.findtext('moduleName', '').strip()
-        elem_image = conf_tree.find('moduleImage')
-        if elem_image is None:
-            self.fomod_image = ''
-        else:
-            self.fomod_image = elem_image.get('path', '')
-        if info_path is not None:  # info.xml is optional - has only metadata
-            info_tree = etree.parse(info_path)
-            self.fomod_author = info_tree.findtext('Author', '').strip()
-            self.fomod_version = info_tree.findtext('Version', '').strip()
-            self.fomod_description = info_tree.findtext('Description', '').strip()
-            self.fomod_website = info_tree.findtext('Website', '').strip()
-        else:
-            self.fomod_author = ""
-            self.fomod_version = ""
-            self.fomod_description = ""
-            self.fomod_website = ""
 
         # setup the installer
         self.gen = self._installer(conf_tree, dest, game_version)