further fixed bugs

randumbizer.py

@@ -60,13 +60,16 @@ class ContentGenerator:
         counts = {"girl": 0, "boy": 0, "other": 0}
         characters = []
         sources = []
-        seen_sources = set()  # To track duplicates while preserving order
+        seen_sources = set()
 
         for line in lines:
             splits = line.split(", ")
+
+            # Remove "no humans" first if present
             if "no humans" in splits:
                 splits.remove("no humans")
 
+            # Determine character type early
             char_type = splits[0] if splits[0] in ["1girl", "1boy", "1other"] else "other"
             if char_type == "1girl":
                 counts["girl"] += 1
@@ -78,18 +81,35 @@ class ContentGenerator:
                 counts["other"] += 1
                 char_type = "other"
 
-            source_idx = 2 if char_type in ["girl", "boy", "other"] else 1
-            if source_idx < len(splits):
-                source = splits[source_idx]
-                if source not in seen_sources:  # Only add if not seen before
-                    sources.append(source)
-                    seen_sources.add(source)
-                splits.pop(source_idx)
-            splits[0] = char_type
-            characters.append(", ".join(splits))
+            # Handle source and character name based on type
+            if char_type in ["girl", "boy"]:  # Standard format: 1girl/boy, name, source
+                if len(splits) > 2:
+                    source = splits[2]
+                    char_name = splits[1]
+                    tags = splits[3:]
+                else:
+                    source = ""
+                    char_name = splits[1] if len(splits) > 1 else ""
+                    tags = []
+            else:  # Other format: name, source
+                char_name = splits[0]  # Keep the original name
+                source = splits[1] if len(splits) > 1 else ""
+                tags = splits[2:] if len(splits) > 2 else []
+
+            # Add source to sources list
+            if source and source not in seen_sources:
+                sources.append(source)
+                seen_sources.add(source)
+
+            # Construct character entry
+            character_entry = [char_type]
+            if char_name:
+                character_entry.append(char_name)
+            character_entry.extend(tags)
+            characters.append(", ".join(character_entry))
 
         count_str = ", ".join(
-            f"{count}{key}{'s' if count > 1 else ''}" 
+            f"{count}{key}{'s' if count > 1 else ''}"
             for key, count in counts.items() if count > 0
         ) + (", " + ", ".join(sources) if sources else "")
         result = f"{count_str}, {artists} | " + " | ".join(characters)
@@ -109,7 +129,6 @@ class ContentGenerator:
 
 def main():
     generator = ContentGenerator()
-    # Immediate random output on start
     generator.process_default()
     
     while True:
@@ -120,18 +139,15 @@ def main():
         elif user_input == "c":
             generator.get_anime_screenshot()
         elif user_input and user_input[0].isdigit():
-            # Check if input is just a number from 1-6
             if user_input in ["1", "2", "3", "4", "5", "6"]:
                 num = int(user_input)
                 generator.process_character_lines(num)
-            # Check if there's a space after the number for tags
             elif " " in user_input:
                 parts = user_input.split(maxsplit=1)
                 num = min(int(parts[0]), 6)
                 tags = [tag.strip() for tag in parts[1].split(',')]
                 generator.process_character_lines(num, tags)
             else:
-                # Treat entire input as search term if no space and not just 1-6
                 generator.process_default(user_input)
         else:
             generator.process_default(user_input if user_input else None)