Skip to content

Commit

Permalink
更新说明：
Browse files Browse the repository at this point in the history 
1.修复阿里云海外地区无法使用问题
2.支持日语
3.支持输出双语的TXT文件
  • Loading branch information
@wxbool
wxbool committed Apr 26, 2020
1 parent 22029c4 commit 519ec7e
Show file tree
Hide file tree
Showing 6 changed files with 192 additions and 61 deletions.
84 changes: 69 additions & 15 deletions app/aliyun/engine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,24 @@ package aliyun
import (
"encoding/json"
"errors"
"fmt"
"github.com/aliyun/alibaba-cloud-sdk-go/sdk"
"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
"strconv"
"time"
)

const (
ALIYUN_CLOUND_REGION_CHA = 1 //中国
ALIYUN_CLOUND_REGION_INT = 2 //海外
)

//阿里云语音识别引擎
type AliyunClound struct {
AccessKeyId string
AccessKeySecret string
AppKey string
Region int
}


Expand All @@ -38,19 +45,35 @@ type AliyunAudioWord struct {
}


// 地域ID，常量内容，请勿改变
const REGION_ID string = "cn-shanghai"
const ENDPOINT_NAME string = "cn-shanghai"
const PRODUCT string = "nls-filetrans"
const DOMAIN string = "filetrans.cn-shanghai.aliyuncs.com"
const API_VERSION string = "2018-08-17"
// 定义常量
const REGION_ID_REGION_INT string = "ap-southeast-1"
const ENDPOINT_NAME_REGION_INT string = "ap-southeast-1"
const PRODUCT_REGION_INT string = "nls-filetrans"
const DOMAIN_REGION_INT string = "filetrans.ap-southeast-1.aliyuncs.com"
const API_VERSION_REGION_INT string = "2019-08-23"

const REGION_ID_REGION_CHA string = "cn-shanghai"
const ENDPOINT_NAME_REGION_CHA string = "cn-shanghai"
const PRODUCT_REGION_CHA string = "nls-filetrans"
const DOMAIN_REGION_CHA string = "filetrans.cn-shanghai.aliyuncs.com"
const API_VERSION_REGION_CHA string = "2018-08-17"


const POST_REQUEST_ACTION string = "SubmitTask"
const GET_REQUEST_ACTION string = "GetTaskResult"
// 请求参数key
const KEY_APP_KEY string = "appkey"
const KEY_FILE_LINK string = "file_link"
const KEY_VERSION string = "version"
const KEY_ENABLE_WORDS string = "enable_words"
//是否启用统一后处理，默认值为 false
const ENABLE_UNIFY_POST string = "enable_unify_post"
//是否打开ITN，中文数字将转为阿拉伯数字输出，默认值为 false
//开启时需要设置version为”4.0”， enable_unify_post 必须为 true
const ENABLE_INVERSE_TEXT_NORMALIZATION string = "enable_inverse_text_normalization"
//如需启用后处理模型，默认值为 chinese，开启时需要设置version为”4.0”，
//enable_unify_post 必须为 true，可选值为 english
const UNIFY_POST_MODEL_NAME string = "unify_post_model_name"
// 响应参数key
const KEY_TASK string = "Task"
const KEY_TASK_ID string = "TaskId"
Expand All @@ -65,26 +88,37 @@ const STATUS_QUEUEING string = "QUEUEING"
//发起录音文件识别
//接口文档 https://help.aliyun.com/document_detail/90727.html?spm=a2c4g.11186623.6.581.691af6ebYsUkd1
func (c AliyunClound) NewAudioFile(fileLink string) (string , *sdk.Client , error) {
client, err := sdk.NewClientWithAccessKey(REGION_ID, c.AccessKeyId, c.AccessKeySecret)
regionId, domain, apiVersion, product := c.GetApiVariable()

fmt.Println( regionId, domain, apiVersion, product , c.Region )

client, err := sdk.NewClientWithAccessKey(regionId, c.AccessKeyId, c.AccessKeySecret)
if err != nil {
return "" , client , err
}
client.SetConnectTimeout(time.Second * 20)

postRequest := requests.NewCommonRequest()
postRequest.Domain = DOMAIN
postRequest.Version = API_VERSION
postRequest.Product = PRODUCT
postRequest.Domain = domain
postRequest.Version = apiVersion
postRequest.Product = product
postRequest.ApiName = POST_REQUEST_ACTION
postRequest.Method = "POST"


mapTask := make(map[string]string)
mapTask[KEY_APP_KEY] = c.AppKey
mapTask[KEY_FILE_LINK] = fileLink
// 新接入请使用4.0版本，已接入(默认2.0)如需维持现状，请注释掉该参数设置
mapTask[KEY_VERSION] = "4.0"
// 设置是否输出词信息，默认为false，开启时需要设置version为4.0
mapTask[KEY_ENABLE_WORDS] = "true"

//启用统一后处理
//mapTask[ENABLE_UNIFY_POST] = "true"
//mapTask[ENABLE_INVERSE_TEXT_NORMALIZATION] = "true"
//mapTask[UNIFY_POST_MODEL_NAME] = "chinese"

// to json
task, err := json.Marshal(mapTask)
if err != nil {
Expand Down Expand Up @@ -125,10 +159,12 @@ func (c AliyunClound) NewAudioFile(fileLink string) (string , *sdk.Client , erro
//获取录音文件识别结果
//接口文档 https://help.aliyun.com/document_detail/90727.html?spm=a2c4g.11186623.6.581.691af6ebYsUkd1
func (c AliyunClound) GetAudioFileResult(taskId string , client *sdk.Client , callback func(result []byte)) error {
_, domain, apiVersion, product := c.GetApiVariable()

getRequest := requests.NewCommonRequest()
getRequest.Domain = DOMAIN
getRequest.Version = API_VERSION
getRequest.Product = PRODUCT
getRequest.Domain = domain
getRequest.Version = apiVersion
getRequest.Product = product
getRequest.ApiName = GET_REQUEST_ACTION
getRequest.Method = "GET"
getRequest.QueryParams[KEY_TASK_ID] = taskId
Expand Down Expand Up @@ -172,11 +208,29 @@ func (c AliyunClound) GetAudioFileResult(taskId string , client *sdk.Client , ca
}



//获取API常量
func (c AliyunClound) GetApiVariable () (regionId string , domain string , apiVersion string , product string) {
if c.Region == 0 || c.Region == ALIYUN_CLOUND_REGION_CHA {
regionId = REGION_ID_REGION_CHA
domain = DOMAIN_REGION_CHA
apiVersion = API_VERSION_REGION_CHA
product = PRODUCT_REGION_CHA
} else if c.Region == ALIYUN_CLOUND_REGION_INT {
regionId = REGION_ID_REGION_INT
domain = DOMAIN_REGION_INT
apiVersion = API_VERSION_REGION_INT
product = PRODUCT_REGION_INT
}
return
}

//获取错误信息
func (c AliyunClound) GetErrorStatusTextMessage (statusText string) string {
var code map[string]string = map[string]string{
"USER_BIZDURATION_QUOTA_EXCEED":"单日免费额度超出限制",
"FILE_DOWNLOAD_FAILED":"文件访问失败，请检查OSS存储空间访问权限",
"REQUEST_APPKEY_UNREGISTERED":"阿里云智能语音项目未创建/无访问权限。请检查语音引擎Appkey是否填写错误；如果是海外地区，在软件创建语音引擎时，服务区域需要选择“海外”",
"USER_BIZDURATION_QUOTA_EXCEED":"单日2小时识别免费额度超出限制",
"FILE_DOWNLOAD_FAILED":"文件访问失败，请检查OSS存储空间访问权限。请将OSS存储空间设置为“公共读”",
"FILE_TOO_LARGE":"音频文件超出512MB",
"FILE_PARSE_FAILED":"音频文件解析失败，请检查音频文件是否有损坏",
"UNSUPPORTED_SAMPLE_RATE":"采样率不匹配",
Expand Down
16 changes: 15 additions & 1 deletion app/data.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,12 +303,26 @@ type AliyunEngineListCache struct {
Engine [] *AliyunEngineCache
}

//引擎选项
//语音引擎选项
type EngineSelects struct {
Id int
Name string
}

//阿里云语音引擎区域选项
type AliyunEngineRegionSelects struct {
Id int
Name string
}

//获取 阿里云语音引擎区域选项列表
func GetAliyunEngineRegionOptionSelects() []*BaiduAuthTypeSelects {
return []*BaiduAuthTypeSelects{
&BaiduAuthTypeSelects{Id:aliyun.ALIYUN_CLOUND_REGION_CHA , Name:"中国"},
&BaiduAuthTypeSelects{Id:aliyun.ALIYUN_CLOUND_REGION_INT , Name:"海外"},
}
}

//获取 引擎选项列表
func (speechEng *SpeechEngineAppStruct) GetEngineOptionsSelects() []*EngineSelects {
engines := make([]*EngineSelects , 0)
Expand Down
13 changes: 13 additions & 0 deletions app/event.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"path"
"path/filepath"
"strings"
"videosrt/app/aliyun"
"videosrt/app/tool"
"videosrt/app/translate"
)
Expand Down Expand Up @@ -146,6 +147,8 @@ func(mw *MyMainWindow) RunSpeechEngineSetingDialog(owner walk.Form , confirmCall

engine = new(AliyunEngineCache)

engine.Region = aliyun.ALIYUN_CLOUND_REGION_CHA //默认值

Dialog{
AssignTo: &dlg,
Title: "新建语音引擎",
Expand Down Expand Up @@ -191,6 +194,16 @@ func(mw *MyMainWindow) RunSpeechEngineSetingDialog(owner walk.Form , confirmCall
Text: Bind("AccessKeySecret"),
},

Label{
Text: "服务区域：",
},
ComboBox{
Value: Bind("Region", SelRequired{}),
BindingMember: "Id",
DisplayMember: "Name",
Model: GetAliyunEngineRegionOptionSelects(),
},

Label{
ColumnSpan: 2,
Text: "说明：\r\n“语音识别” 目前使用的是阿里云语音服务商，请填写相关的引擎配置。",
Expand Down
65 changes: 45 additions & 20 deletions app/srt.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package app

import (
"bytes"
"errors"
"fmt"
"os"
Expand Down Expand Up @@ -270,41 +271,65 @@ func (app *SrtTranslateApp) SrtOutputFile(file string , srtRows []*SrtRows , out
_,_ = fd.WriteString("[ar:]\r\n[ti:]\r\n[al:]\r\n[by:]\r\n")
}

//主字幕
bilingualAsc := app.TranslateCfg.OutputMainSubtitleInputLanguage

index := 0

//普通文本容器
var txtOutputContent bytes.Buffer
var txtTransalteOutputContent bytes.Buffer

for _ , data := range srtRows {
var linestr string

//拼接文本
if outputType == OUTPUT_SRT {
if app.TranslateCfg.TranslateSwitch {
if app.TranslateCfg.BilingualSubtitleSwitch {
linestr = MakeSubtitleText(index , data.TimeStartMilliSecond , data.TimeEndMilliSecond , data.Text , data.TranslateText , true , bilingualAsc)
//字幕、歌词文件处理
if outputType == OUTPUT_SRT || outputType == OUTPUT_LRC {
//拼接
if outputType == OUTPUT_SRT {
if app.TranslateCfg.TranslateSwitch {
if app.TranslateCfg.BilingualSubtitleSwitch {
linestr = MakeSubtitleText(index , data.TimeStartMilliSecond , data.TimeEndMilliSecond , data.Text , data.TranslateText , true , bilingualAsc)
} else {
linestr = MakeSubtitleText(index , data.TimeStartMilliSecond , data.TimeEndMilliSecond , data.TranslateText , "" , false , true)
}
} else {
linestr = MakeSubtitleText(index , data.TimeStartMilliSecond , data.TimeEndMilliSecond , data.TranslateText , "" , false , true)
linestr = MakeSubtitleText(index , data.TimeStartMilliSecond , data.TimeEndMilliSecond , data.Text , "" , false , true)
}
} else if outputType == OUTPUT_LRC {
if app.TranslateCfg.TranslateSwitch {
linestr = MakeMusicLrcText(index , data.TimeStartMilliSecond , data.TimeEndMilliSecond , data.TranslateText)
} else {
linestr = MakeMusicLrcText(index , data.TimeStartMilliSecond , data.TimeEndMilliSecond , data.Text)
}
} else {
linestr = MakeSubtitleText(index , data.TimeStartMilliSecond , data.TimeEndMilliSecond , data.Text , "" , false , true)
}
} else if outputType == OUTPUT_STRING {
if app.TranslateCfg.TranslateSwitch {
linestr = MakeText(index , data.TimeStartMilliSecond , data.TimeEndMilliSecond , data.TranslateText)
} else {
linestr = MakeText(index , data.TimeStartMilliSecond , data.TimeEndMilliSecond , data.Text)

//写入行
if _, e = fd.WriteString(linestr);e != nil {
panic("写入文件失败：" + e.Error())
}
} else if outputType == OUTPUT_LRC {
} else if outputType == OUTPUT_STRING {
//普通文本处理
txtOutputContent.WriteString(data.Text)
txtOutputContent.WriteString("\r\n")

if app.TranslateCfg.TranslateSwitch {
linestr = MakeMusicLrcText(index , data.TimeStartMilliSecond , data.TimeEndMilliSecond , data.TranslateText)
} else {
linestr = MakeMusicLrcText(index , data.TimeStartMilliSecond , data.TimeEndMilliSecond , data.Text)
txtTransalteOutputContent.WriteString(data.TranslateText)
txtTransalteOutputContent.WriteString("\r\n")
}
}

if _, e = fd.WriteString(linestr);e != nil {
index++
}

//写入文本文件
if outputType == OUTPUT_STRING {
txtOutputContent.WriteString("\r\n\r\n\r\n\r\n\r\n")
if _, e = fd.WriteString(txtOutputContent.String());e != nil {
panic("写入文件失败：" + e.Error())
}
if _, e = fd.WriteString(txtTransalteOutputContent.String());e != nil {
panic("写入文件失败：" + e.Error())
}
index++
}
}

Expand Down
Loading

0 comments on commit 519ec7e

Please sign in to comment.