baqu2213 commited on
Commit
f06ef42
1 Parent(s): 1990259

Upload 2 files

Browse files
Danbooru Prompt Selector/TEST2024/prompt_selector_auto_1212_testv8.exe CHANGED
@@ -1,3 +1,3 @@
1
  version https://git-lfs.github.com/spec/v1
2
- oid sha256:b8ab112de60fa7d57f42c61a5ecea0dcd94df21dcd30e27c016bdfe98e389a01
3
- size 150997702
 
1
  version https://git-lfs.github.com/spec/v1
2
+ oid sha256:d4f0efdf3596dba68f9eaf6e13c6210303365e3d450b0dcf11e606a1f7713ee2
3
+ size 150997740
Danbooru Prompt Selector/TEST2024/prompt_selector_auto_1212_testv8.py CHANGED
@@ -489,7 +489,8 @@ def random_function():
489
 
490
  if cached_rows:
491
  if toggle_prompt_var.get() and last_selected_row_keywords:
492
- random_row_keywords = text_output.get("1.0", "end-1c").split(',')
 
493
  #random_row_keywords[-1].strip()
494
  #if random_row_keywords[0]=='': random_row_keywords = last_selected_row_keywords
495
  text_output.delete('1.0', tk.END)
@@ -524,7 +525,7 @@ def random_function():
524
 
525
  # entry_text_keywords의 모든 키워드를 temp_first_keywords에 추가
526
  for et_kw in entry_text_keywords:
527
- if ('boy' in et_kw or 'girl' in et_kw) or (' '+et_kw not in random_row_keywords and ' '+et_kw not in random_row_keywords):
528
  temp_first_keywords.append(et_kw)
529
 
530
  # 'boy' 키워드 처리
@@ -555,20 +556,22 @@ def random_function():
555
  random_row_keywords.remove(previous_wildcard_character)
556
  elif(previous_wildcard_character is not None):
557
  split_previous_wildcard_character = previous_wildcard_character.split(',')
 
558
  for _keyword in split_previous_wildcard_character:
559
  if _keyword in random_row_keywords:
560
  random_row_keywords.remove(_keyword)
561
- if " "+_keyword in random_row_keywords:
562
- random_row_keywords.remove(" "+_keyword)
563
  previous_wildcard_character = get_random_keyword('character')
564
  girl_keywords.append(previous_wildcard_character)
565
  if(wildcard_var.get() == 1):
566
  print('previous : ',previous_wildcard_artist, 'type : ', type(previous_wildcard_artist))
567
- if previous_wildcard_artist is not None and " "+previous_wildcard_artist in random_row_keywords:
568
- random_row_keywords.remove(" "+previous_wildcard_artist)
569
  elif(previous_wildcard_artist is not None):
570
  split_previous_wildcard_artist = previous_wildcard_artist.split(',')
571
- split_previous_wildcard_artist[0] = " "+split_previous_wildcard_artist[0]
 
572
  for _keyword in split_previous_wildcard_artist:
573
  if _keyword in random_row_keywords:
574
  random_row_keywords.remove(_keyword)
@@ -670,9 +673,9 @@ def random_function():
670
  random_row_keywords.remove(pattern)
671
 
672
  if entry_fixed_prompt_after.get():
673
- entry_after_text = entry_fixed_prompt_after.get().strip().split(',')
674
  for at_kw in entry_after_text:
675
- if at_kw not in random_row_keywords and ' '+at_kw not in random_row_keywords:
676
  random_row_keywords.append(at_kw)
677
 
678
  rm_copyright = []
 
489
 
490
  if cached_rows:
491
  if toggle_prompt_var.get() and last_selected_row_keywords:
492
+ random_row_keywords = [keyword.strip() for keyword in text_output.get("1.0", "end-1c").split(',')]
493
+ random_row_keywords = [keyword.strip() for keyword in text_output.get("1.0", "end-1c").split(',')]
494
  #random_row_keywords[-1].strip()
495
  #if random_row_keywords[0]=='': random_row_keywords = last_selected_row_keywords
496
  text_output.delete('1.0', tk.END)
 
525
 
526
  # entry_text_keywords의 모든 키워드를 temp_first_keywords에 추가
527
  for et_kw in entry_text_keywords:
528
+ if ('boy' in et_kw or 'girl' in et_kw) or (et_kw not in random_row_keywords and et_kw not in random_row_keywords):
529
  temp_first_keywords.append(et_kw)
530
 
531
  # 'boy' 키워드 처리
 
556
  random_row_keywords.remove(previous_wildcard_character)
557
  elif(previous_wildcard_character is not None):
558
  split_previous_wildcard_character = previous_wildcard_character.split(',')
559
+ split_previous_wildcard_character = [keyword.strip() for keyword in split_previous_wildcard_character]
560
  for _keyword in split_previous_wildcard_character:
561
  if _keyword in random_row_keywords:
562
  random_row_keywords.remove(_keyword)
563
+ if _keyword in random_row_keywords:
564
+ random_row_keywords.remove(_keyword)
565
  previous_wildcard_character = get_random_keyword('character')
566
  girl_keywords.append(previous_wildcard_character)
567
  if(wildcard_var.get() == 1):
568
  print('previous : ',previous_wildcard_artist, 'type : ', type(previous_wildcard_artist))
569
+ if previous_wildcard_artist is not None and previous_wildcard_artist in random_row_keywords:
570
+ random_row_keywords.remove(previous_wildcard_artist)
571
  elif(previous_wildcard_artist is not None):
572
  split_previous_wildcard_artist = previous_wildcard_artist.split(',')
573
+ split_previous_wildcard_artist = [keyword.strip() for keyword in split_previous_wildcard_artist]
574
+ split_previous_wildcard_artist[0] = split_previous_wildcard_artist[0]
575
  for _keyword in split_previous_wildcard_artist:
576
  if _keyword in random_row_keywords:
577
  random_row_keywords.remove(_keyword)
 
673
  random_row_keywords.remove(pattern)
674
 
675
  if entry_fixed_prompt_after.get():
676
+ entry_after_text = [keyword.strip() for keyword in entry_fixed_prompt_after.get().split(',')]
677
  for at_kw in entry_after_text:
678
+ if at_kw not in random_row_keywords and at_kw not in random_row_keywords:
679
  random_row_keywords.append(at_kw)
680
 
681
  rm_copyright = []