diff --git a/Menu/GameShell/21_Warehouse/image_download_process_page.go b/Menu/GameShell/21_Warehouse/image_download_process_page.go index 760059b..f98e6f6 100644 --- a/Menu/GameShell/21_Warehouse/image_download_process_page.go +++ b/Menu/GameShell/21_Warehouse/image_download_process_page.go @@ -6,7 +6,7 @@ import ( gotime "time" "strings" "path" - + "path/filepath" //"encoding/json" "github.com/veandco/go-sdl2/ttf" @@ -22,11 +22,6 @@ import ( "github.com/cuu/grab" ) -type WareHouseIndex struct { - List []map[string]string `json:"list"` -} - - type ImageDownloadProcessPage struct { UI.Page @@ -100,7 +95,7 @@ func (self *ImageDownloadProcessPage) OnLoadCb() { if len(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) if UI.FileExists(local_menu_file) { @@ -160,13 +155,13 @@ L: if len(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) } dl_file := path.Join("/tmp",filename) - if UI.IsDirectory( path.Base(local_menu_file) ) == false { - merr := os.MkdirAll( path.Base(local_menu_file), os.ModePerm) + if UI.IsDirectory( filepath.Dir(local_menu_file) ) == false { + merr := os.MkdirAll( filepath.Dir(local_menu_file), os.ModePerm) if merr != nil { panic(merr) } diff --git a/Menu/GameShell/21_Warehouse/load_house_page.go b/Menu/GameShell/21_Warehouse/load_house_page.go index 2c133b2..462b7a0 100644 --- a/Menu/GameShell/21_Warehouse/load_house_page.go +++ b/Menu/GameShell/21_Warehouse/load_house_page.go @@ -21,6 +21,10 @@ import ( "github.com/cuu/grab" ) +type WareHouseIndex struct { + List []map[string]string `json:"list"` +} + type LoadHousePage struct { UI.Page ListFontObj *ttf.Font diff --git a/Menu/GameShell/21_Warehouse/ware_house_page.go b/Menu/GameShell/21_Warehouse/ware_house_page.go index 0d7ea62..b1872f9 100644 --- a/Menu/GameShell/21_Warehouse/ware_house_page.go +++ b/Menu/GameShell/21_Warehouse/ware_house_page.go @@ -373,7 +373,7 @@ func (self *WareHouse) Init() { self.Keyboard.FootMsg = [5]string{"Nav.","Add","ABC","Backspace","Enter"} self.Keyboard.Screen = self.Screen self.Keyboard.Init() - self.Keyboard.SetPassword("github.com/cuu/warehouse") + self.Keyboard.SetPassword("github.com/clockworkpi/warehouse") self.Keyboard.Caller = self self.PreviewPage = NewImageDownloadProcessPage()