jl94x4 / ColleXions

# --- END NEW HELPER FUNCTION ---

def select_from_categories(categories_config, all_collections, exclusion_set, remaining_slots, regex_patterns):

    """Selects items from categories based on config (version from user script)."""

    # This function now relies on the exclusion_set passed in, which includes recently pinned NON-SPECIAL items

    collections_to_pin = []

    config_dict = categories_config if isinstance(categories_config, dict) else {}

    always_call = config_dict.pop('always_call', True)

    category_items = config_dict.items()

    processed_titles_in_this_step = set()

    for category, collection_names in category_items:

        if remaining_slots <= 0: break

        if not isinstance(collection_names, list): continue

        potential_pins = [

            c for c in all_collections

            if getattr(c, 'title', None) in collection_names

            and getattr(c, 'title', None) not in exclusion_set # Checks against combined exclusions

            and not is_regex_excluded(getattr(c, 'title', ''), regex_patterns)

            and getattr(c, 'title', None) not in processed_titles_in_this_step

        ]

        if potential_pins:

            if always_call or random.choice([True, False]):

                selected = random.choice(potential_pins)

                collections_to_pin.append(selected)

                processed_titles_in_this_step.add(selected.title)

                exclusion_set.add(selected.title) # Add to exclusion for this cycle

                logging.info(f"Added '{selected.title}' from category '{category}'")

                remaining_slots -= 1

    if isinstance(categories_config, dict): categories_config['always_call'] = always_call

    return collections_to_pin, remaining_slots

def fill_with_random_collections(random_collections_pool, remaining_slots):

# --- END NEW HELPER FUNCTION ---

def select_from_categories(categories_config, all_collections, exclusion_set, remaining_slots, regex_patterns):

    """Selects items from categories based on config (version from user script)."""

    # This function now relies on the exclusion_set passed in, which includes recently pinned NON-SPECIAL items

    collections_to_pin = []

    config_dict = categories_config if isinstance(categories_config, dict) else {}

    always_call = config_dict.pop('always_call', True)

    category_items = config_dict.items()

    processed_titles_in_this_step = set()

    for category, collection_names in category_items:

        if remaining_slots <= 0: break

        if not isinstance(collection_names, list): continue

        potential_pins = [

            c for c in all_collections

            if getattr(c, 'title', None) in collection_names

            and getattr(c, 'title', None) not in exclusion_set # Checks against combined exclusions

            and not is_regex_excluded(getattr(c, 'title', ''), regex_patterns)

            and getattr(c, 'title', None) not in processed_titles_in_this_step

        ]

        if potential_pins:

            if always_call or random.choice([True, False]):

                selected = random.choice(potential_pins)

                collections_to_pin.append(selected)

                processed_titles_in_this_step.add(selected.title)

                exclusion_set.add(selected.title) # Add to exclusion for this cycle

                logging.info(f"Added '{selected.title}' from category '{category}'")

                remaining_slots -= 1

    if isinstance(categories_config, dict): categories_config['always_call'] = always_call

    return collections_to_pin, remaining_slots

def fill_with_random_collections(random_collections_pool, remaining_slots):