This commit is contained in:
cuu 2021-10-24 19:39:56 +08:00
parent 5cb318cd56
commit cb0b5eb293
3 changed files with 10 additions and 11 deletions

View File

@ -6,7 +6,7 @@ import (
gotime "time" gotime "time"
"strings" "strings"
"path" "path"
"path/filepath"
//"encoding/json" //"encoding/json"
"github.com/veandco/go-sdl2/ttf" "github.com/veandco/go-sdl2/ttf"
@ -22,11 +22,6 @@ import (
"github.com/cuu/grab" "github.com/cuu/grab"
) )
type WareHouseIndex struct {
List []map[string]string `json:"list"`
}
type ImageDownloadProcessPage struct { type ImageDownloadProcessPage struct {
UI.Page UI.Page
@ -100,7 +95,7 @@ func (self *ImageDownloadProcessPage) OnLoadCb() {
if len(local_dir) > 1 { if len(local_dir) > 1 {
menu_file := local_dir[1] menu_file := local_dir[1]
local_menu_file := fmt.Sprintf("%s/aria2downloads%s", local_menu_file := fmt.Sprintf(aria2dl_folder,
home_path,menu_file) home_path,menu_file)
if UI.FileExists(local_menu_file) { if UI.FileExists(local_menu_file) {
@ -160,13 +155,13 @@ L:
if len(local_dir) > 1 { if len(local_dir) > 1 {
menu_file = local_dir[1] menu_file = local_dir[1]
local_menu_file = fmt.Sprintf("%s/aria2downloads%s", local_menu_file = fmt.Sprintf(aria2dl_folder,
home_path,menu_file) home_path,menu_file)
} }
dl_file := path.Join("/tmp",filename) dl_file := path.Join("/tmp",filename)
if UI.IsDirectory( path.Base(local_menu_file) ) == false { if UI.IsDirectory( filepath.Dir(local_menu_file) ) == false {
merr := os.MkdirAll( path.Base(local_menu_file), os.ModePerm) merr := os.MkdirAll( filepath.Dir(local_menu_file), os.ModePerm)
if merr != nil { if merr != nil {
panic(merr) panic(merr)
} }

View File

@ -21,6 +21,10 @@ import (
"github.com/cuu/grab" "github.com/cuu/grab"
) )
type WareHouseIndex struct {
List []map[string]string `json:"list"`
}
type LoadHousePage struct { type LoadHousePage struct {
UI.Page UI.Page
ListFontObj *ttf.Font ListFontObj *ttf.Font

View File

@ -373,7 +373,7 @@ func (self *WareHouse) Init() {
self.Keyboard.FootMsg = [5]string{"Nav.","Add","ABC","Backspace","Enter"} self.Keyboard.FootMsg = [5]string{"Nav.","Add","ABC","Backspace","Enter"}
self.Keyboard.Screen = self.Screen self.Keyboard.Screen = self.Screen
self.Keyboard.Init() self.Keyboard.Init()
self.Keyboard.SetPassword("github.com/cuu/warehouse") self.Keyboard.SetPassword("github.com/clockworkpi/warehouse")
self.Keyboard.Caller = self self.Keyboard.Caller = self
self.PreviewPage = NewImageDownloadProcessPage() self.PreviewPage = NewImageDownloadProcessPage()