dazed/DazedTL
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix newline issue in tyrano

Browse source
This commit is contained in:
Dazed 2023-11-02 18:01:27 -05:00
parent 75c3cea86c
commit 300c9031aa
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/lune.py
View file

@ -25,7 +25,7 @@ APICOST = .002 # Depends on the model https://openai.com/pricing
PROMPT = Path('prompt.txt').read_text(encoding='utf-8')
THREADS = 20
LOCK = threading.Lock()
WIDTH = 75
WIDTH = 60
LISTWIDTH = 75
MAXHISTORY = 10
ESTIMATE = ''
@ -129,7 +129,6 @@ def translateText(data, pbar):
tokens = 0
speaker = ''
speakerFlag = False
currentGroup = []
syncIndex = 0
### Translation
@ -143,6 +142,7 @@ def translateText(data, pbar):
# Remove newlines
jaString = data[i]
jaString = jaString.replace('\\n', '')
jaString = jaString.replace('\n', '')
# Reset Speaker
@ -179,6 +179,11 @@ def translateText(data, pbar):
# Translate
finalJAString = data[i]
# Remove Textwrap
finalJAString = finalJAString.replace('\\n', ' ')
finalJAString = finalJAString.replace('\n', ' ')
if speaker != '':
response = translateGPT(f'{speaker}: {finalJAString}', 'Previous Text for Context: ' + ' '.join(textHistory), True)
else:
@ -201,8 +206,10 @@ def translateText(data, pbar):
currentGroup = []
# Textwrap
translatedText = textwrap.fill(translatedText, width=40)
translatedText = textwrap.fill(translatedText, width=WIDTH)
translatedText = translatedText.replace(',\n', ', \n')
translatedText = translatedText.replace('\n', '\\n')
translatedText = translatedText.replace(',\\n', ', \\n')
# Set Data
data[i] = translatedText + '\n'

9
modules/tyrano.py
View file

@ -123,6 +123,9 @@ def translateTyrano(data, pbar):
if syncIndex > i:
i = syncIndex
if '… …… ………[pcm]' in data[i]:
print('test')
# Speaker
if '[ns]' in data[i]:
matchList = re.findall(r'\[ns\](.+?)\[', data[i])
@ -160,7 +163,7 @@ def translateTyrano(data, pbar):
data[i] = translatedText
# Lines
matchList = re.findall(r'(.+?)\[r\]$', data[i])
matchList = re.findall(r'(.+?)\[r\]', data[i])
if len(matchList) > 0:
matchList[0] = matchList[0].replace('「', '')
matchList[0] = matchList[0].replace('」', '')
@ -264,7 +267,7 @@ def translateTyrano(data, pbar):
speaker = ''
# pcm Line
matchList = re.findall(r'(.+?)\[pcm\]$', data[i])
matchList = re.findall(r'(.+?)\[pcm\]', data[i])
if len(matchList) > 0:
matchList[0] = matchList[0].replace('「', '')
matchList[0] = matchList[0].replace('」', '')
@ -339,7 +342,7 @@ def translateTyrano(data, pbar):
translatedText = translatedText.replace('\n', '[r]')
# Set Backup
data[i] = translatedText.strip() + '[pcm]'
data[i] = translatedText.strip() + '[pcm]\n'
# Keep textHistory list at length maxHistory
if len(textHistory) > maxHistory: