Skip to content

Commit

Permalink
cli:fix: ignore cookie manager for linux
Browse files Browse the repository at this point in the history
  • Loading branch information
celestix committed Aug 2, 2024
1 parent af19974 commit a0f8379
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 20 deletions.
34 changes: 34 additions & 0 deletions cmd/cookieMan.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
//go:build !linux

package cmd

import (
"path/filepath"

"github.com/urfave/cli"
"github.com/warpdl/warpdl/cmd/common"
"github.com/warpdl/warpdl/pkg/credman"
"github.com/warpdl/warpdl/pkg/credman/keyring"
"github.com/warpdl/warpdl/pkg/warplib"
)

func getCookieManager(ctx *cli.Context) (*credman.CookieManager, error) {
kr := keyring.NewKeyring()
key, err := kr.GetKey()
if err != nil {
key, err = kr.SetKey()
if err != nil {
common.PrintRuntimeErr(ctx, "daemon", "keyring", err)
return nil, err
}
}

cookieFile := filepath.Join(warplib.ConfigDir, "cookies.warp")
cm, err := credman.NewCookieManager(cookieFile, key)
if err != nil {
common.PrintRuntimeErr(ctx, "daemon", "credman", err)
return nil, err
}
defer cm.Close()
return cm, nil
}
10 changes: 10 additions & 0 deletions cmd/cookieMan_linux.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package cmd

import (
"github.com/urfave/cli"
"github.com/warpdl/warpdl/pkg/credman"
)

func getCookieManager(*cli.Context) (*credman.CookieManager, error) {
return &credman.CookieManager{}, nil
}
22 changes: 2 additions & 20 deletions cmd/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,21 @@ package cmd

import (
"log"
"path/filepath"

"github.com/urfave/cli"
"github.com/warpdl/warpdl/cmd/common"
"github.com/warpdl/warpdl/internal/api"
"github.com/warpdl/warpdl/internal/extl"
"github.com/warpdl/warpdl/internal/server"
"github.com/warpdl/warpdl/pkg/credman"
"github.com/warpdl/warpdl/pkg/credman/keyring"
"github.com/warpdl/warpdl/pkg/warplib"
)

func daemon(ctx *cli.Context) error {
l := log.Default()

kr := keyring.NewKeyring()
key, err := kr.GetKey()
cm, err := getCookieManager(ctx)
if err != nil {
key, err = kr.SetKey()
if err != nil {
common.PrintRuntimeErr(ctx, "daemon", "keyring", err)
return nil
}
}

cookieFile := filepath.Join(warplib.ConfigDir, "cookies.warp")
cm, err := credman.NewCookieManager(cookieFile, key)
if err != nil {
common.PrintRuntimeErr(ctx, "daemon", "credman", err)
// nil because err has already been handled in getCookieManager function
return nil
}
defer cm.Close()

elEng, err := extl.NewEngine(l, cm, false)
if err != nil {
common.PrintRuntimeErr(ctx, "daemon", "extloader_engine", err)
Expand Down

0 comments on commit a0f8379

Please sign in to comment.