robotframework-logxml2chunks 1.1.4__tar.gz → 1.1.6__tar.gz

{robotframework_logxml2chunks-1.1.4 → robotframework_logxml2chunks-1.1.6}/LogXML2Chunks/LogXML2Chunks.py

@@ -266,7 +266,11 @@ class LogXML2Chunks:
             idx_match = re.match(r'^(\d+)_', filename)
             idx = int(idx_match.group(1)) if idx_match else 0
             
-            # Check if corresponding log file exists
+            # Check if corresponding log file exists.
+            # Both XML and HTML use the same double-underscore convention:
+            #   1_GUI_TBD__Update_Role_..._t1.xml
+            #   1_GUI_TBD__Update_Role_..._t1_log.html
+            # so the log filename is simply stem + '_log.html'.
             log_filepath = None
             xml_path = Path(xml_filepath)
             log_filename = xml_path.stem + '_log.html'
@@ -278,6 +282,9 @@ class LogXML2Chunks:
             checksum_data = f"{test_name}{test_doc}".encode('utf-8')
             checksum = hashlib.md5(checksum_data).hexdigest()
 
+            elements_path = filename.split('__')
+            full_prefix = '_'.join(elements_path[0].split('_')[1:]) if len(elements_path) > 1 else None
+
             # Build result dictionary
             result = {
                 'index': idx,
@@ -290,8 +297,9 @@ class LogXML2Chunks:
                 'source': test_source,
                 'xml_file': str(xml_filepath),
                 'checksum': checksum,
-                'success': True
-            }            
+                'success': True,
+                'full_prefix': full_prefix
+            }
 
             # Add log file if it exists
             if log_filepath:
@@ -450,28 +458,27 @@ class LogXML2Chunks:
         for idx, (suite, test) in enumerate(test_cases, 1):
             test_name = test.get('name')
             test_id = test.get('id')
+
+            # Create a safe filename (with prefix if available)
+            safe_name = test_name.replace(' ', '_').replace('/', '_').replace('\\', '_')
             
-            # Setup prefix for filenames based on configuration
-            if self.filename_prefix_static:
-                prefix = self.filename_prefix_static
+            if self.filename_prefix_pattern and self.filename_prefix_static:
+                prefix = f"{self._extract_filename_prefix(test, suite, root)}_{self.filename_prefix_static}"
+            elif self.filename_prefix_static:
+                prefix = self.filename_prefix_static                
             elif self.filename_prefix_pattern:
-                # Extract filename prefix (if pattern is configured)
                 prefix = self._extract_filename_prefix(test, suite, root)
             else:
                 prefix = None
 
-            # Create a safe filename (with prefix if available)
-            safe_name = test_name.replace(' ', '_').replace('/', '_').replace('\\', '_')
-            if prefix:
-                xml_filename = f"{idx}_{prefix}_{safe_name}_{test_id}.xml"
-            else:
-                xml_filename = f"{idx}_{safe_name}_{test_id}.xml"
-            xml_filepath = output_path / xml_filename
-
             if prefix:
                 self._debug_print(f"\n[{idx}/{len(test_cases)}] Processing: {test_name} (Prefix: {prefix})")
+                xml_filename = f"{idx}_{prefix}__{safe_name}_{test_id}.xml"
             else:
                 self._debug_print(f"\n[{idx}/{len(test_cases)}] Processing: {test_name}")
+                xml_filename = f"{idx}__{safe_name}_{test_id}.xml"
+                
+            xml_filepath = output_path / xml_filename
 
             # Create a new XML document with only this test case
             new_root = ET.Element('robot', root.attrib)
@@ -546,11 +553,14 @@ class LogXML2Chunks:
 
             self._debug_print(f"  ✓ Created XML: {xml_filepath}")
 
-            # Generate HTML report using rebot
+            # Generate HTML report using rebot.
+            # Use the same double-underscore separator as the XML filename so that
+            # get_data_from_chunk() can reliably locate the log by replacing '__' → '_'
+            # in the XML stem and appending '_log.html'.
             if prefix:
-                log_filename = f"{idx}_{prefix}_{safe_name}_{test_id}_log.html"
+                log_filename = f"{idx}_{prefix}__{safe_name}_{test_id}_log.html"
             else:
-                log_filename = f"{idx}_{safe_name}_{test_id}_log.html"
+                log_filename = f"{idx}__{safe_name}_{test_id}_log.html"
             log_filepath = output_path / log_filename
 
             try:

{robotframework_logxml2chunks-1.1.4/robotframework_logxml2chunks.egg-info → robotframework_logxml2chunks-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: robotframework-logxml2chunks
-Version: 1.1.4
+Version: 1.1.6
 Summary: Extract individual test cases from Robot Framework output.xml into separate chunks
 Home-page: https://github.com/ajadach/robotframework-LogXML2Chunks
 Author: Artur Jadach

{robotframework_logxml2chunks-1.1.4 → robotframework_logxml2chunks-1.1.6/robotframework_logxml2chunks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: robotframework-logxml2chunks
-Version: 1.1.4
+Version: 1.1.6
 Summary: Extract individual test cases from Robot Framework output.xml into separate chunks
 Home-page: https://github.com/ajadach/robotframework-LogXML2Chunks
 Author: Artur Jadach

{robotframework_logxml2chunks-1.1.4 → robotframework_logxml2chunks-1.1.6}/setup.py

@@ -10,7 +10,7 @@ long_description = (this_directory / "README.md").read_text(encoding='utf-8')
 
 setup(
     name='robotframework-logxml2chunks',
-    version='1.1.4',
+    version='1.1.6',
     author='Artur Jadach',
     author_email='artur.k.ziolkowski@example.com',
     description='Extract individual test cases from Robot Framework output.xml into separate chunks',