fix download and delee code to be more reliable

vgmoose · vgmoose · commit affe7b7574be · 2016-06-12T20:26:05.000-04:00
hardcode for local address
diff --git a/hbas.elf b/hbas.elf
diff --git a/hbas_dbg.elf b/hbas_dbg.elf
diff --git a/src/gui/GuiFrame.cpp b/src/gui/GuiFrame.cpp
@@ -43,15 +43,15 @@ GuiFrame::~GuiFrame()
 	closing(this);
 
 	if(parent)
-		parent->remove(this);
+		parent->removeE(this);
 }
 
 void GuiFrame::append(GuiElement* e)
 {
 	if (e == NULL)
 		return;
 
-	remove(e);
+	removeE(e);
 	elements.push_back(e);
 	e->setParent(this);
 }
@@ -61,12 +61,12 @@ void GuiFrame::insert(GuiElement* e, u32 index)
 	if (e == NULL || (index >= elements.size()))
 		return;
 
-	remove(e);
+	removeE(e);
 	elements.insert(elements.begin()+index, e);
 	e->setParent(this);
 }
 
-void GuiFrame::remove(GuiElement* e)
+void GuiFrame::removeE(GuiElement* e)
 {
 	if (e == NULL)
 		return;
diff --git a/src/gui/GuiFrame.h b/src/gui/GuiFrame.h
@@ -42,11 +42,11 @@ class GuiFrame : public GuiElement
 		void insert(GuiElement* e, u32 i);
 		//!Removes the specified GuiElement from the GuiFrame
 		//!\param e GuiElement to be removed
-		void remove(GuiElement* e);
+		void removeE(GuiElement* e);
 		//!Removes all GuiElements
 		void removeAll();
 		//!Bring element to front of the window
-		void bringToFront(GuiElement *e) { remove(e); append(e); }
+		void bringToFront(GuiElement *e) { removeE(e); append(e); }
 		//!Returns the GuiElement at the specified index
 		//!\param index The index of the element
 		//!\return A pointer to the element at the index, NULL on error (eg: out of bounds)
diff --git a/src/menu/HomebrewLaunchWindow.cpp b/src/menu/HomebrewLaunchWindow.cpp
@@ -117,7 +117,7 @@ HomebrewLaunchWindow::HomebrewLaunchWindow(homebrewButton & thisButton)
     loadBtn.setImage(&loadImg);
     loadBtn.setLabel(&loadBtnLabel);
     loadBtn.setAlignment(ALIGN_CENTER | ALIGN_MIDDLE);
-    loadBtn.setPosition(-200, -310);
+    loadBtn.setPosition(-600, -310);
     loadBtn.setTrigger(&touchTrigger);
     loadBtn.setTrigger(&wpadTouchTrigger);
     loadBtn.setEffectGrow();
@@ -136,7 +136,7 @@ HomebrewLaunchWindow::HomebrewLaunchWindow(homebrewButton & thisButton)
     delBtn.setEffectGrow();
     delBtn.setSoundClick(buttonClickSound);
     delBtn.clicked.connect(this, &HomebrewLaunchWindow::OnDeleteButtonClick);
-//    append(&delBtn);
+    append(&delBtn);
 
     backImg.setScale(scaleFactor);
     backBtn.setSize(scaleFactor * backImg.getWidth(), scaleFactor * backImg.getHeight());
@@ -169,7 +169,7 @@ void HomebrewLaunchWindow::OnOpenEffectFinish(GuiElement *element)
 void HomebrewLaunchWindow::OnCloseEffectFinish(GuiElement *element)
 {
     //! remove element from draw list and push to delete queue
-    remove(element);
+    removeE(element);
     AsyncDeleter::pushForDelete(element);
 
     backBtn.clearState(GuiElement::STATE_DISABLED);
@@ -195,9 +195,15 @@ void HomebrewLaunchWindow::OnFileLoadFinish(GuiElement *element, const std::stri
 
 void HomebrewLaunchWindow::OnDeleteButtonClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger)
 {
-    std::string path = "/apps/"+selectedButton.shortname+"/"+selectedButton.binary;
-    std::string sdPath = "sd:/wiiu"+path;
-    rename("sdPath", "sd:/.Trashes/oiuwroiuewr");
+    std::string removePath = selectedButton.dirPath;
+    // if the remove path is the whole directory, stop!
+    if (!removePath.compare(std::string("sd:/wiiu/apps")) || !removePath.compare(std::string("sd:/wiiu/apps/")))
+        return;
+
+    DirList dirList(removePath, 0, DirList::Files | DirList::CheckSubfolders);
+    for (int x=0; x<dirList.GetFilecount(); x++)
+        remove(dirList.GetFilepath(x));
+    rmdir(removePath.c_str());
 }
 
 void HomebrewLaunchWindow::OnLoadButtonClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger)
@@ -209,9 +215,10 @@ void HomebrewLaunchWindow::OnLoadButtonClick(GuiButton *button, const GuiControl
     std::string path = "/apps/"+selectedButton.shortname;
     std::string sdPath = "sd:/wiiu"+path;
     CreateSubfolder(sdPath.c_str());
-    FileDownloader::getFile("http://wiiubru.com/appstore"+path+"/"+selectedButton.binary, sdPath+"/"+selectedButton.binary, 0);
-    FileDownloader::getFile("http://wiiubru.com/appstore"+path+"/meta.xml", sdPath+"/meta.xml", 0);
-    FileDownloader::getFile("http://wiiubru.com/appstore"+path+"/icon.png", sdPath+"/icon.png", 0);
+    std::string repoUrl = "http://192.168.1.104:8000";
+    FileDownloader::getFile(repoUrl+path+"/"+selectedButton.binary, sdPath+"/"+selectedButton.binary, 0);
+    FileDownloader::getFile(repoUrl+path+"/meta.xml", sdPath+"/meta.xml", 0);
+    FileDownloader::getFile(repoUrl+path+"/icon.png", sdPath+"/icon.png", 0);
 
 
 //    struct SYSBrowserArgsIn args = {};
diff --git a/src/menu/HomebrewWindow.cpp b/src/menu/HomebrewWindow.cpp
@@ -123,7 +123,7 @@ HomebrewWindow::HomebrewWindow(int w, int h)
         HomebrewXML metaXml;
 
         bool xmlReadSuccess = metaXml.LoadHomebrewXMLData((homebrewPath + "/meta.xml").c_str());
-
+        
         const char *cpName = xmlReadSuccess ? metaXml.GetName() : homebrewButtons[idx].execPath.c_str();
         const char *cpDescription = xmlReadSuccess ? metaXml.GetShortDescription() : "";
 
@@ -171,7 +171,8 @@ HomebrewWindow::HomebrewWindow(int w, int h)
         		
         // download app list from wiiubru
         std::string fileContents;
-        std::string targetUrl = std::string("http://wiiubru.com/appstore/directory.yaml");
+        std::string repoUrl = "http://192.168.1.104:8000";
+        std::string targetUrl = std::string(repoUrl+"/directory.yaml");
         FileDownloader::getFile(targetUrl, fileContents);
         std::istringstream f(fileContents);
 
@@ -221,7 +222,7 @@ HomebrewWindow::HomebrewWindow(int w, int h)
             homebrewButtons[idx].binary = binary;
             // download app list from wiiubru
             std::string targetIcon;
-            std::string targetIconUrl = std::string("http://wiiubru.com/appstore/apps/" + shortname + "/icon.png");
+            std::string targetIconUrl = std::string(repoUrl+"/apps/" + shortname + "/icon.png");
             FileDownloader::getFile(targetIconUrl, targetIcon);
 
     //        if(targetIcon != NULL)
@@ -346,7 +347,7 @@ void HomebrewWindow::OnOpenEffectFinish(GuiElement *element)
 void HomebrewWindow::OnCloseEffectFinish(GuiElement *element)
 {
     //! remove element from draw list and push to delete queue
-    remove(element);
+    removeE(element);
     AsyncDeleter::pushForDelete(element);
 
     for(u32 i = 0; i < homebrewButtons.size(); i++)
@@ -401,7 +402,7 @@ void HomebrewWindow::OnLeftArrowClick(GuiButton *button, const GuiController *co
         targetLeftPosition = -listOffset * getWidth();
 
         if(listOffset == 0)
-            remove(&arrowLeftButton);
+            removeE(&arrowLeftButton);
         append(&arrowRightButton);
     }
 }
@@ -414,7 +415,7 @@ void HomebrewWindow::OnRightArrowClick(GuiButton *button, const GuiController *c
         targetLeftPosition = -listOffset * getWidth();
 
         if(((listOffset + 1) * MAX_BUTTONS_ON_PAGE) >= (int)homebrewButtons.size())
-            remove(&arrowRightButton);
+            removeE(&arrowRightButton);
 
         append(&arrowLeftButton);
     }
diff --git a/src/menu/MainWindow.cpp b/src/menu/MainWindow.cpp
@@ -48,18 +48,18 @@ MainWindow::MainWindow(int w, int h)
 
 MainWindow::~MainWindow()
 {
-    remove(&homebrewWindow);
-    remove(&bgImageColor);
+    removeE(&homebrewWindow);
+    removeE(&bgImageColor);
 
     while(!tvElements.empty())
     {
         delete tvElements[0];
-        remove(tvElements[0]);
+        removeE(tvElements[0]);
     }
     while(!drcElements.empty())
     {
         delete drcElements[0];
-        remove(drcElements[0]);
+        removeE(drcElements[0]);
     }
     for(int i = 0; i < 4; i++)
     {
diff --git a/src/menu/MainWindow.h b/src/menu/MainWindow.h
@@ -99,7 +99,7 @@ class MainWindow : public sigslot::has_slots<>
         }
     }
 
-    void remove(GuiElement *e)
+    void removeE(GuiElement *e)
     {
         removeTv(e);
         removeDrc(e);

Original file line number	Diff line number	Diff line change
`@@ -43,15 +43,15 @@ GuiFrame::~GuiFrame()`
`43`	`43`	`closing(this);`
`44`	`44`
`45`	`45`	`if(parent)`
`46`		`- parent->remove(this);`
	`46`	`+ parent->removeE(this);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`void GuiFrame::append(GuiElement* e)`
`50`	`50`	`{`
`51`	`51`	`if (e == NULL)`
`52`	`52`	`return;`
`53`	`53`
`54`		`- remove(e);`
	`54`	`+ removeE(e);`
`55`	`55`	`elements.push_back(e);`
`56`	`56`	`e->setParent(this);`
`57`	`57`	`}`
`@@ -61,12 +61,12 @@ void GuiFrame::insert(GuiElement* e, u32 index)`
`61`	`61`	`if (e == NULL \|\| (index >= elements.size()))`
`62`	`62`	`return;`
`63`	`63`
`64`		`- remove(e);`
	`64`	`+ removeE(e);`
`65`	`65`	`elements.insert(elements.begin()+index, e);`
`66`	`66`	`e->setParent(this);`
`67`	`67`	`}`
`68`	`68`
`69`		`-void GuiFrame::remove(GuiElement* e)`
	`69`	`+void GuiFrame::removeE(GuiElement* e)`
`70`	`70`	`{`
`71`	`71`	`if (e == NULL)`
`72`	`72`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -48,18 +48,18 @@ MainWindow::MainWindow(int w, int h)`
`48`	`48`
`49`	`49`	`MainWindow::~MainWindow()`
`50`	`50`	`{`
`51`		`- remove(&homebrewWindow);`
`52`		`- remove(&bgImageColor);`
	`51`	`+ removeE(&homebrewWindow);`
	`52`	`+ removeE(&bgImageColor);`
`53`	`53`
`54`	`54`	`while(!tvElements.empty())`
`55`	`55`	`{`
`56`	`56`	`delete tvElements[0];`
`57`		`- remove(tvElements[0]);`
	`57`	`+ removeE(tvElements[0]);`
`58`	`58`	`}`
`59`	`59`	`while(!drcElements.empty())`
`60`	`60`	`{`
`61`	`61`	`delete drcElements[0];`
`62`		`- remove(drcElements[0]);`
	`62`	`+ removeE(drcElements[0]);`
`63`	`63`	`}`
`64`	`64`	`for(int i = 0; i < 4; i++)`
`65`	`65`	`{`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ class MainWindow : public sigslot::has_slots<>`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`102`		`- void remove(GuiElement *e)`
	`102`	`+ void removeE(GuiElement *e)`
`103`	`103`	`{`
`104`	`104`	`removeTv(e);`
`105`	`105`	`removeDrc(e);`