github/Fabric
1
1
Fork 0
mirror of https://github.com/danielmiessler/Fabric.git synced 2026-02-13 15:34:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feat/rest-api

Browse Source
This commit is contained in:
Eugen Eisler
2024-10-12 23:06:29 +03:00
committed by GitHub
parent d7683e4c39 525f972d22
commit 686d039392
9 changed files with 133 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cli/cli.go
View File

@@ -152,8 +152,12 @@ func Cli(version string) (err error) {
if !currentFlags.YouTubeComments || currentFlags.YouTubeTranscript {
var transcript string
var language = "en"
if currentFlags.Language != "" {
language = currentFlags.Language
if currentFlags.Language != "" || fabric.DefaultLanguage.Value != "" {
if currentFlags.Language != "" {
language = currentFlags.Language
} else {
language = fabric.DefaultLanguage.Value
}
}
if transcript, err = fabric.YouTube.GrabTranscript(videoId, language); err != nil {
return
@@ -214,7 +218,11 @@ func Cli(version string) (err error) {
}
var session *fs.Session
if session, err = chatter.Send(currentFlags.BuildChatRequest(strings.Join(os.Args[1:], " ")), currentFlags.BuildChatOptions()); err != nil {
chatReq := currentFlags.BuildChatRequest(strings.Join(os.Args[1:], " "))
if chatReq.Language == "" {
chatReq.Language = fabric.DefaultLanguage.Value
}
if session, err = chatter.Send(chatReq, currentFlags.BuildChatOptions()); err != nil {
return
}
@@ -262,8 +270,6 @@ func Setup(db *fs.Db, skipUpdatePatterns bool) (ret *core.Fabric, err error) {
func SetupVendor(db *fs.Db, vendorName string) (ret *core.Fabric, err error) {
ret = core.NewFabricForSetup(db)
if err = ret.SetupVendor(vendorName); err != nil {
return
}
err = ret.SetupVendor(vendorName)
return
}