Merge pull request #1897 from MTG/analysis_file_load

Don't check if a file exists before opening it

Author: ffont

sounds/models.py

@@ -1955,11 +1955,11 @@ def value_is_valid(value):
                 return not math.isinf(value) and not math.isnan(value)
             return True
 
-        if self.analysis_status == "OK" and \
-            'descriptors_map' in settings.ANALYZERS_CONFIGURATION.get(self.analyzer, {}):
+        analysis_configuration = settings.ANALYZERS_CONFIGURATION.get(self.analyzer, {})
+        if self.analysis_status == "OK" and 'descriptors_map' in analysis_configuration:
             analysis_results = self.get_analysis_data_from_file()
             if analysis_results:
-                descriptors_map = settings.ANALYZERS_CONFIGURATION[self.analyzer]['descriptors_map']
+                descriptors_map = analysis_configuration['descriptors_map']
                 analysis_data_for_db = {}
                 for file_descriptor_key_path, db_descriptor_key, _ in descriptors_map:
                     # TODO: here we could implement support for nested keys in the analysis file, maybe by accessing
@@ -1976,18 +1976,16 @@ def value_is_valid(value):
     def get_analysis_data_from_file(self):
         """Returns the analysis data as stored in file or returns empty dict if no file exists. It tries
         extensions .json and .yaml as these are the supported formats for analysis results"""
-        if os.path.exists(self.analysis_filepath_base + '.json'):
-            try:
-                with open(self.analysis_filepath_base + '.json') as f:
-                    return json.load(f)
-            except Exception:
-                pass
-        if os.path.exists(self.analysis_filepath_base + '.yaml'):
-            try:
-                with open(self.analysis_filepath_base + '.yaml') as f:
-                    return yaml.load(f, Loader=yaml.cyaml.CSafeLoader)
-            except Exception:
-                pass
+        try:
+            with open(self.analysis_filepath_base + '.json') as f:
+                return json.load(f)
+        except Exception:
+            pass
+        try:
+            with open(self.analysis_filepath_base + '.yaml') as f:
+                return yaml.load(f, Loader=yaml.cyaml.CSafeLoader)
+        except Exception:
+            pass
         return {}
 
     def get_analysis_data(self):

utils/search/backends/solr555pysolr.py

@@ -326,14 +326,14 @@ def convert_post_to_search_engine_document(self, post):
             "has_posts": False if post.thread.num_posts == 0 else True
         }
         return document
-    
+
     def get_dynamic_fields_map(self):
         if hasattr(self, '_dynamic_fields_map'):
             return self._dynamic_fields_map
         dynamic_fields_map = {}
         for analyzer, analyzer_data in settings.ANALYZERS_CONFIGURATION.items():
             if 'descriptors_map' in analyzer_data:
-                descriptors_map = settings.ANALYZERS_CONFIGURATION[analyzer]['descriptors_map']
+                descriptors_map = analyzer_data['descriptors_map']
                 for _, db_descriptor_key, descriptor_type in descriptors_map:
                     if descriptor_type is not None:
                         dynamic_fields_map[db_descriptor_key] = '{}{}'.format(