Skip to content

Commit

Permalink
v0.2.1
Browse files Browse the repository at this point in the history 
1. 根据sheet生成多个rpy
2. update gitignore
3. 移除多余的build文件
4. 增加协作开发文档
5. 重构解析逻辑
6. 增加菜单栏
7. 增加voice解析
  • Loading branch information
@LJxFFFF
LJxFFFF authored Sep 1, 2020
2 parents 9a15c03 + 3731f47 commit c106406
Show file tree
Hide file tree
Showing 30 changed files with 597 additions and 24,404 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/output
/.idea
*.pyc
*.pyc
/build
*.spec
17 changes: 17 additions & 0 deletions Collaboration.MD
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
## Git
- 基本操作教程：https://www.liaoxuefeng.com/wiki/896043488029600

### 开发流程：
- 从主分支将项目fork一份到自己的仓库
- 在本地将项目clone下来，并添加远程分支:
- 例子：
`git clone 项目地址`
`git remote add develop [email protected]:HaruhiFanClub/Excel2RpyScript.git`

- 完成功能开发之后，拉取主项目最新的改动：
`git pull --rebase develop develop`
- 在本地解决冲突之后将改动推到自己项目的分支：
`git push origin develop`
- 在github上提交pull request

- 以上流程仅供参考(慎用rebase命令)
33 changes: 0 additions & 33 deletions Excel2RpyScript.spec
View file

This file was deleted.

137 changes: 86 additions & 51 deletions app.py
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
#!/usr/bin/env python
#-*- coding:utf-8 -*-
# -*- coding:utf-8 -*-
import base64
from io import BytesIO
from tkinter import Tk, Text, PhotoImage, Canvas
import webbrowser
from tkinter import Tk, Text, PhotoImage, Menu, messagebox, END
from tkinter.messagebox import showerror, showinfo
from tkinter.ttk import Frame, Style, Entry, Combobox, Button, Label
from tkinter import filedialog

import requests

from const import CURRENT_VERSION
from corelib.exception import ConvertException, SaveFileException
from handler.converter import Converter
from handler.parser import Parser
from handler.writer import RpyFileWriter
from tools.image_data import *


class Application_ui(Frame):
#这个类仅实现界面生成功能，具体事件处理代码在子类Application中。
# 这个类仅实现界面生成功能，具体事件处理代码在子类Application中。

def __init__(self, master=None):
Frame.__init__(self, master)
Expand All @@ -28,58 +34,55 @@ def createWidgets(self):
self.background_label = Label(self.top, image=self.bkg_gif)
self.background_label.place(x=0, y=0, relwidth=1, relheight=1)

self.Text = Text(self.top, font=('宋体',9))
self.Text = Text(self.top, font=('宋体', 9))
self.Text.place(relx=0.066, rely=0.07, relwidth=0.869, relheight=0.563)

self.saveAddr = Entry(self.top, font=('宋体',9))
self.saveAddr = Entry(self.top, font=('宋体', 9))
self.saveAddr.place(relx=0.355, rely=0.84, relwidth=0.409, relheight=0.052)

self.ComboList = ['源文件目录','自定义目录']
self.Combo = Combobox(self.top, values=self.ComboList, font=('宋体',9), state='readonly')
self.ComboList = ['源文件目录', '自定义目录']
self.Combo = Combobox(self.top, values=self.ComboList, font=('宋体', 9), state='readonly')
self.Combo.place(relx=0.184, rely=0.84, relwidth=0.146, relheight=0.058)
self.Combo.set(self.ComboList[0])
self.Combo.bind('<<ComboboxSelected>>', self.comboEvent)

self.style.configure('InputButton.TButton',font=('宋体',9))
self.style.configure('InputButton.TButton', font=('宋体', 9))
self.InputButton = Button(self.top, text='浏览', command=self.InputButton_Cmd, style='InputButton.TButton')
self.InputButton.place(relx=0.184, rely=0.7, relwidth=0.133, relheight=0.073)

self.Haruhi_gif = PhotoImage(data=base64.b64decode(haruhi_gif_data))
self.style.configure('ConvertButton.TButton',font=('宋体',9))
self.ConvertButton = Button(self.top, image=self.Haruhi_gif, command=self.ConvertButton_Cmd, style='ConvertButton.TButton')
self.style.configure('ConvertButton.TButton', font=('宋体', 9))
self.ConvertButton = Button(self.top, image=self.Haruhi_gif, command=self.ConvertButton_Cmd,
style='ConvertButton.TButton')
self.ConvertButton.place(relx=0.788, rely=0.7, relwidth=0.146, relheight=0.236)

self.style.configure('OutputLabel.TLabel',anchor='w', font=('宋体',9))
self.style.configure('OutputLabel.TLabel', anchor='w', font=('宋体', 9))
self.OutputLabel = Label(self.top, text='保存目录：', style='OutputLabel.TLabel')
self.OutputLabel.place(relx=0.066, rely=0.84, relwidth=0.107, relheight=0.05)

self.style.configure('InputLabel.TLabel',anchor='w', font=('宋体',9))
self.style.configure('InputLabel.TLabel', anchor='w', font=('宋体', 9))
self.InputLabel = Label(self.top, text='输入设置：', style='InputLabel.TLabel')
self.InputLabel.place(relx=0.066, rely=0.723, relwidth=0.107, relheight=0.05)

menubar = Menu(self.top)
filemenu = Menu(menubar, tearoff=0) # tearoff意为下拉
menubar.add_cascade(label='帮助', menu=filemenu)
filemenu.add_command(label='视频教程', command=self.open_help_url)
filemenu.add_command(label='检查更新', command=self.check_for_update)

self.top.config(menu=menubar)

class Application(Application_ui):
#这个类实现具体的事件处理回调函数。界面生成代码在Application_ui中。
# 这个类实现具体的事件处理回调函数。界面生成代码在Application_ui中。

def __init__(self, master=None):
Application_ui.__init__(self, master)

def convert(self, input_path, output_path):
c = Converter(input_path)
texts = c.generate_rpy_elements()
try:
with open(output_path, 'w', encoding='utf-8') as f:
for k, v in c.role_name_mapping.items():
f.write(v.render() + "\n")
f.write("define narrator_nvl = Character(None, kind=nvl)\n")
f.write("define narrator_adv = Character(None, kind=adv)\n")
f.write("\nlabel start:\n")
for text in texts:
for t in text.triggers:
f.write(" "*4 + t.render() + "\n")
f.write((" "*4 + text.render() + "\n"))
except FileNotFoundError:
raise SaveFileException("保存目录不存在")
def convert(self, output_dir, res, role_name_mapping):
try:
RpyFileWriter.write_file(output_dir, res, role_name_mapping)
except FileNotFoundError:
raise SaveFileException("保存目录不存在")

def checkEqual(self, iterator):
iterator = iter(iterator)
Expand All @@ -93,13 +96,13 @@ def getFileName(self, path):
return path.split('/')[-1].split('.')[0]

def getTlist(self):
Tlist=self.Text.get('1.0', 'end').split('\n')
Tlist=[value.strip() for value in Tlist]
Tlist=[value for value in Tlist if value]
Tlist = self.Text.get('1.0', 'end').split('\n')
Tlist = [value.strip() for value in Tlist]
Tlist = [value for value in Tlist if value]
return Tlist

def getOriPath(self):
paths=list()
paths = list()
for path in self.getTlist():
paths.append('/'.join(path.split('/')[0:-1]))
if self.checkEqual(paths):
Expand All @@ -109,38 +112,70 @@ def getOriPath(self):
return ''

def comboEvent(self, *arg):
if self.Combo.get()=='源文件目录':
if self.saveAddr.get(): self.saveAddr.delete('0','end')
self.saveAddr.insert('0',self.getOriPath())
elif self.Combo.get()=='自定义目录':
if self.Combo.get() == '源文件目录':
if self.saveAddr.get():
self.saveAddr.delete('0', 'end')
self.saveAddr.insert('0', self.getOriPath())
elif self.Combo.get() == '自定义目录':
file_path = filedialog.askdirectory(title=u'保存文件到文件夹')
if self.saveAddr.get(): self.saveAddr.delete('0','end')
self.saveAddr.insert('0',file_path)
if self.saveAddr.get():
self.saveAddr.delete('0', 'end')
self.saveAddr.insert('0', file_path)

def InputButton_Cmd(self, event=None):
file_paths = filedialog.askopenfilenames(title=u'选择文件', filetypes=[("Excel-2007 file", "*.xlsx"),("Excel-2003 file", "*.xls"),("all","*.*")])
#print('打开文件：', file_paths)
file_paths = filedialog.askopenfilenames(title=u'选择文件',
filetypes=[("Excel-2007 file", "*.xlsx"), ("Excel-2003 file", "*.xls"),
("all", "*.*")])
for line in file_paths:
self.Text.insert('0.0',line+'\n')
self.Text.insert(END, line + '\n')
self.comboEvent()

def ConvertButton_Cmd(self, event=None):
success_flag = True
for path in self.getTlist():
try:
self.convert(path, self.saveAddr.get()+'/'+self.getFileName(path)+'.rpy')
try:
parser = Parser(path)
conveter = Converter(parser)
convert_results = conveter.generate_rpy_elements()
for res in convert_results:
self.convert(self.saveAddr.get(), res, conveter.role_name_mapping)
except ConvertException as err:
success_flag = False
showerror("转换错误", err.msg)
if success_flag:
showinfo("转换成功", "转换完成")
self.saveAddr.delete('0','end')
self.Text.delete('0.0','end')

self.saveAddr.delete('0', 'end')
self.Text.delete('0.0', 'end')

def open_url(self, url):
webbrowser.open(url, new=0)

def open_help_url(self, event=None):
self.open_url("https://www.bilibili.com/video/BV1gZ4y1K7Y9")

def check_for_update(self, event=None):
try:
resp = requests.get("https://api.github.com/repos/HaruhiFanClub/Excel2RpyScript/releases/latest", timeout=2).json()
except Exception as ex:
self.Text.insert(END, "检查更新失败：{}\n请直接到https://github.com/HaruhiFanClub/Excel2RpyScript/releases查看最新版本\n")
showinfo("网络连接失败", "\n检查新版本信息失败!\n".format(ex))
return
if resp['tag_name'] == CURRENT_VERSION:
showinfo("检测成功", "当前已经是最新版本!")
else:
confirm_download = self.showConfirmModal("检查到新版本", "当前版本：{0} 最新版本：{1}, 是否前往{2}下载？"
.format(CURRENT_VERSION, resp['tag_name'], resp['html_url']))
if confirm_download:
self.open_url(resp['html_url'])

def showConfirmModal(self, title, message):
return messagebox.askokcancel(title, message)

if __name__ == "__main__":
top = Tk()
# top.iconbitmap('sos.ico')
top.iconphoto(False, PhotoImage(data=base64.b64decode(haruhi_gif_data)))
Application(top).mainloop()
try: top.destroy()
except: pass
try:
top.destroy()
except:
pass
Loading

0 comments on commit c106406

Please sign in to comment.