6 Commits

Author SHA1 Message Date
YourKalamity
2a7bfd934e Fix failing unlaunch link 2021-02-09 12:11:56 +00:00
YourKalamity
f09059791d Merge branch 'master' of https://github.com/YourKalamity/lazy-dsi-file-downloader 2021-01-07 21:00:21 +00:00
YourKalamity
9b42582d79 Fix small bug thanks NinjaCheetah 2021-01-07 20:59:42 +00:00
Kalam :p
604ba5afa0 Update issue templates 2020-12-21 12:19:17 +00:00
YourKalamity
3466ef5b35 Change default DSi version 2020-12-20 12:28:23 +00:00
Kalam :p
6df97b1e32 Update executables.yml 2020-12-19 23:42:10 +00:00
3 changed files with 43 additions and 5 deletions

32
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@@ -0,0 +1,32 @@
---
name: Bug report
about: Create a report to help us improve
title: "[BUG] - "
labels: bug
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Python version [if using Python]
**Additional context**
Add any other context about the problem here.

View File

@@ -83,7 +83,7 @@ jobs:
run: echo ::set-output name=tag::${GITHUB_REF#refs/*/} run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
- name: Create executable - name: Create executable
run: | run: |
pyinstaller --onefile --add-data "colour.py:." --add-data "tkmacosx:tkmacosx" --add-data "Darwin:Darwin" --add-data "certifi:certifi" --add-data "requests:requests" --add-data "urllib3:urllib3" --add-data "lazy.ico:." --add-data "chardet:chardet" --icon "lazy.ico" --console --name "lazy-dsi-file-downloader-${{ steps.vars.outputs.tag }}-macOS" main.py pyinstaller --onefile --add-data "colour.py:." --add-data "tkmacosx:tkmacosx" --add-data "Darwin:Darwin" --add-binary "Darwin/7za:Darwin" --add-data "certifi:certifi" --add-data "requests:requests" --add-data "urllib3:urllib3" --add-data "lazy.ico:." --add-data "chardet:chardet" --icon "lazy.ico" --console --name "lazy-dsi-file-downloader-${{ steps.vars.outputs.tag }}-macOS" main.py
cd dist cd dist
chmod +x lazy-dsi-file-downloader-${{ steps.vars.outputs.tag }}-macOS chmod +x lazy-dsi-file-downloader-${{ steps.vars.outputs.tag }}-macOS
zip ../lazy-dsi-file-downloader-${{ steps.vars.outputs.tag }}-macOS.zip lazy-dsi-file-downloader-${{ steps.vars.outputs.tag }}-macOS zip ../lazy-dsi-file-downloader-${{ steps.vars.outputs.tag }}-macOS.zip lazy-dsi-file-downloader-${{ steps.vars.outputs.tag }}-macOS

14
main.py
View File

@@ -43,7 +43,8 @@ def downloadFile(link, destination):
downloadLocation = destination + fileName downloadLocation = destination + fileName
open(downloadLocation, 'wb').write(r.content) open(downloadLocation, 'wb').write(r.content)
return downloadLocation return downloadLocation
except ConnectionError: except ConnectionError as e:
print(e)
print("File not available, skipping...") print("File not available, skipping...")
return None return None
@@ -243,14 +244,13 @@ def start():
if unlaunchNeeded == 1 : if unlaunchNeeded == 1 :
#Download Unlaunch #Download Unlaunch
url = "https://problemkaputt.de/unlaunch.zip" url = "https://web.archive.org/web/20210207235625if_/https://problemkaputt.de/unlaunch.zip"
outputbox("Downloading Unlaunch\n") outputbox("Downloading Unlaunch\n")
unlaunchLocation = downloadFile(url, cwdtemp) unlaunchLocation = downloadFile(url, cwdtemp)
if unlaunchLocation != None: if unlaunchLocation != None:
print("Unlaunch Downloaded") print("Unlaunch Downloaded")
outputbox("Unlaunch Downloaded\n") outputbox("Unlaunch Downloaded\n")
lineCounter = lineCounter + 1 lineCounter = lineCounter + 1
#Extract Unlaunch #Extract Unlaunch
unzipper(unlaunchLocation,directory) unzipper(unlaunchLocation,directory)
@@ -467,6 +467,10 @@ def summonWindow1():
selector["menu"].config(bg=buttonColour,fg=foregroundColour,font=(buttonFont)) selector["menu"].config(bg=buttonColour,fg=foregroundColour,font=(buttonFont))
selector.grid(column=0,row=5,sticky="w") selector.grid(column=0,row=5,sticky="w")
if platform.system() == "Darwin":
macOS_hiddentext = tkinter.Label(topFrame, text = "(Click the area above this text\n if you can't see the drop down menu) ",fg=foregroundColour,font=(bodyFont))
macOS_hiddentext.grid(column=0,row=6, sticky="w")
backButton = Button(bottomFrame,text="Back", font=(buttonFont),fg=foregroundColour,bg=backButtonColour,command=lambda: [topFrame.destroy(),bottomFrame.destroy(),summonWindow0()], width=button_width) backButton = Button(bottomFrame,text="Back", font=(buttonFont),fg=foregroundColour,bg=backButtonColour,command=lambda: [topFrame.destroy(),bottomFrame.destroy(),summonWindow0()], width=button_width)
backButton.pack(side=tkinter.LEFT) backButton.pack(side=tkinter.LEFT)
nextButton = Button(bottomFrame, text="Next",width=button_width, fg=foregroundColour,bg=nextButtonColour, font=(buttonFont),command=lambda:[topFrame.destroy(),bottomFrame.destroy(),summonWindow2()]) nextButton = Button(bottomFrame, text="Next",width=button_width, fg=foregroundColour,bg=nextButtonColour, font=(buttonFont),command=lambda:[topFrame.destroy(),bottomFrame.destroy(),summonWindow2()])
@@ -593,6 +597,8 @@ if __name__ == "__main__":
print("This program will ONLY work on Python 3 and above") print("This program will ONLY work on Python 3 and above")
sys.exit() sys.exit()
os.chdir(os.path.dirname(os.path.abspath(sys.argv[0])))
root = tkinter.Tk() root = tkinter.Tk()
window = tkinter.Toplevel(root) window = tkinter.Toplevel(root)
root.withdraw() root.withdraw()
@@ -607,7 +613,7 @@ if __name__ == "__main__":
#TKinter Vars #TKinter Vars
downloadmemorypit = tkinter.IntVar(value=1) downloadmemorypit = tkinter.IntVar(value=1)
firmwareVersion = tkinter.StringVar() firmwareVersion = tkinter.StringVar()
firmwareVersion.set(dsiVersions[0]) firmwareVersion.set(dsiVersions[1])
downloadtwlmenu = tkinter.IntVar(value=1) downloadtwlmenu = tkinter.IntVar(value=1)
downloaddumptool = tkinter.IntVar(value=1) downloaddumptool = tkinter.IntVar(value=1)
unlaunch = tkinter.IntVar(value=0) unlaunch = tkinter.IntVar(value=0)