admin commited on
Commit
40fefc5
Β·
1 Parent(s): f111044

try to fix mode

Browse files
Files changed (1) hide show
  1. app.py +8 -4
app.py CHANGED
@@ -210,15 +210,19 @@ def generate_music(
210
  if Q_val:
211
  tunes = tunes.replace(f"Q:{Q_val}\n", "")
212
 
 
 
 
 
 
213
  tunes = tunes.replace(f"A:{emo}\n", tempo)
214
  # fix mode:major/minor
215
  mode = "major" if emo == "Q1" or emo == "Q4" else "minor"
216
- K_val = get_abc_key_val(tunes)
217
- if mode == "major" and K_val and "m" in K_val:
218
  tunes = tunes.replace(f"\nK:{K_val}\n", f"\nK:{K_val.split('m')[0]}\n")
219
 
220
- elif mode == "minor" and K_val and not "m" in K_val:
221
- tunes = tunes.replace(f"\nK:{K_val}\n", f"\nK:{K_val.lower()}min\n")
222
 
223
  print("Generation time: {:.2f} seconds".format(time.time() - start_time))
224
  timestamp = time.strftime("%a_%d_%b_%Y_%H_%M_%S", time.localtime())
 
210
  if Q_val:
211
  tunes = tunes.replace(f"Q:{Q_val}\n", "")
212
 
213
+ K_val = get_abc_key_val(tunes)
214
+ if K_val == "none":
215
+ K_val = "C"
216
+ tunes = tunes.replace("K:none\n", f"K:{K_val}\n")
217
+
218
  tunes = tunes.replace(f"A:{emo}\n", tempo)
219
  # fix mode:major/minor
220
  mode = "major" if emo == "Q1" or emo == "Q4" else "minor"
221
+ if (mode == "major") and ("m" in K_val):
 
222
  tunes = tunes.replace(f"\nK:{K_val}\n", f"\nK:{K_val.split('m')[0]}\n")
223
 
224
+ elif (mode == "minor") and (not "m" in K_val):
225
+ tunes = tunes.replace(f"\nK:{K_val}\n", f"\nK:{K_val.replace('dor', '')}min\n")
226
 
227
  print("Generation time: {:.2f} seconds".format(time.time() - start_time))
228
  timestamp = time.strftime("%a_%d_%b_%Y_%H_%M_%S", time.localtime())