diff options
-rw-r--r-- | .SRCINFO | 23 | ||||
-rw-r--r-- | PKGBUILD | 105 | ||||
-rw-r--r-- | qt.conf | 2 | ||||
-rw-r--r-- | toontown-rewritten.desktop | 11 | ||||
-rw-r--r-- | toontown-rewritten.sh | 12 | ||||
-rwxr-xr-x | toontown.py | 56 |
6 files changed, 152 insertions, 57 deletions
@@ -1,23 +1,20 @@ -# Generated by mksrcinfo v8 -# Thu Feb 4 03:22:58 UTC 2016 pkgbase = toontown-rewritten pkgdesc = An MMO originally by Disney, rewritten. An account is needed to play. pkgver = 1.2.3 - pkgrel = 2 + pkgrel = 3 arch = x86_64 + license = custom + makedepends = ostree makedepends = git + makedepends = sed depends = qt5-base depends = openal - provides = toontown-rewritten - options = !strip - source = https://download.toontownrewritten.com/launcher/linux/TTRLinux-v1.2.3.tar.gz - source = qt.conf - source = toontown-rewritten.sh - source = toontown-rewritten.desktop - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP + depends = gendesk + depends = python + source = toontown-rewritten::git+https://github.com/Xytime/Xytime.github.io.git + source = toontown.py + md5sums = SKIP + md5sums = SKIP pkgname = toontown-rewritten @@ -1,27 +1,94 @@ -# Maintainer: Riley Trautman <asonix.dev@gmail.com> +#Maintainer: CrankySupertoon <crankysupertoon@gmail.com> +#For any Readers out here. Yes im extracting the flatpak. Dont ask pkgname=toontown-rewritten pkgver=1.2.3 -pkgrel=2 +pkgrel=3 +gitcommit="54fa8cb3feca7d1a00ac88a12afaa6524ce8c904" +ostreecommit="9119a18c449ddeb2304bac358157aa6cdbce0d1f706992b6b87396c51a5ff50b" pkgdesc="An MMO originally by Disney, rewritten. An account is needed to play." arch=("x86_64") -url="" -license=("") -depends=("qt5-base" "openal") -makedepends=("git") -provides=("$pkgname") -source=("https://download.toontownrewritten.com/launcher/linux/TTRLinux-v$pkgver.tar.gz" - "qt.conf" "toontown-rewritten.sh" "toontown-rewritten.desktop") -options=(!strip) -sha256sums=("SKIP" "SKIP" "SKIP" "SKIP") +license=("custom") +depends=("qt5-base" "openal" "gendesk" "python") +makedepends=("ostree" "git" "sed") +source=("toontown-rewritten::git+https://github.com/Xytime/Xytime.github.io.git" "toontown.py") +md5sums=('SKIP' 'SKIP') + +prepare() { + # Checkout Git Project to right version + cd "${srcdir}/${pkgname}" + git reset --hard ${gitcommit} + + # Extract toontown from the embeddded ostree repo + cd "${srcdir}/${pkgname}/flatpaks/" + rm -rfd ${ostreecommit} + ostree checkout --repo=repo -U ${ostreecommit} + + # Put Fixed Executable in right directory + cd "${srcdir}" + cp "toontown.py" "${srcdir}/${pkgname}/flatpaks/${ostreecommit}/files/lib/python3.7/site-packages/" + + # Fix Assets Directory + cd "${srcdir}/${pkgname}/flatpaks/${ostreecommit}/files/lib/python3.7/site-packages" + mkdir -p assets + mv "../../../share/ttassets/resources/"* "assets" + + # Cleanup Unwanted Data + cd "${srcdir}/${pkgname}/flatpaks/${ostreecommit}/files/lib/python3.7/site-packages" + rm -rf bsdiff4* certifi* chardet* idna-2* PyQt5* requests* sip* Toontown_Rewritten-123-py3.7.egg-info urllib* + + # Touch for init files + cd "${srcdir}/${pkgname}/flatpaks/${ostreecommit}/files/lib/python3.7/site-packages" + touch "__init__.py" + touch "fsm/__init__.py" + touch "gui/__init__.py" + touch "idna/__init__.py" + touch "launcher/__init__.py" + touch "patcher/__init__.py" + + # Fix Resources Path in Source + cd "${srcdir}/${pkgname}/flatpaks/${ostreecommit}/files/lib/python3.7/site-packages/gui" + sed -i 's/"\/", "app", "share", "ttassets"/"\/opt\/toontown-rewritten\"/g' frame.py + sed -i 's/resources/assets/g' frame.py + sed -i 's/resources/assets/g' buttons.py + + # Invoke using mono in a wrapper, since wine (if installed) would open it otherwise + cd "${srcdir}/${pkgname}" + cat > "${pkgname}" <<-EOT + #!/bin/sh + cd /opt/toontown-rewritten/ + /usr/bin/python3 toontown.py + EOT + + # Generate .desktop + cd "${srcdir}/${pkgname}" + gendesk --pkgname "Toontown Rewritten" --pkgdesc "${pkgdesc}" --icon ${pkgname} --exec "/usr/bin/${pkgname}" -n -f + mv "Toontown Rewritten.desktop" "${pkgname}.desktop" + + # Install Required PIP Modules + python3 -m pip install bsdiff4 +} package() { - mkdir -p "$pkgdir"/opt/toontown-rewritten - mkdir -p "$pkgdir"/usr/bin - mkdir -p "$pkgdir"/usr/share/applications - - install -m755 Toontown\ Rewritten/Launcher "$pkgdir"/opt/toontown-rewritten/Launcher - install qt.conf "$pkgdir"/opt/toontown-rewritten/qt.conf - install -m755 ../toontown-rewritten.sh "$pkgdir"/usr/bin/toontown-rewritten - install -m755 ../toontown-rewritten.desktop "$pkgdir"/usr/share/applications/toontown-rewritten.desktop + # install the main files. + install -d -m755 "${pkgdir}/opt/${pkgname}" + cp -Rr "${srcdir}/${pkgname}/flatpaks/${ostreecommit}/files/lib/python3.7/site-packages/"* "${pkgdir}/opt/${pkgname}" + + # desktop entry + install -D -m644 "${srcdir}/${pkgname}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + + # install the icon + install -d -m755 "${pkgdir}/usr/share/icons" + cp -Rr "${srcdir}/${pkgname}/flatpaks/${ostreecommit}/export/share/icons/hicolor/256x256/apps/xyz.xytime.Toontown.png" "${pkgdir}/usr/share/icons/${pkgname}.png" + + # fix file permissions - all files as 644 - directories as 755 + find "${pkgdir}/"{opt,usr} -type d -exec chmod 755 {} \; + find "${pkgdir}/"{opt,usr} -type f -exec chmod 644 {} \; + + # link the binary + install -d -m755 "${pkgdir}/usr/bin" + cp "${srcdir}/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}" + + # make sure the main binary has the right permissions + chmod +x "${pkgdir}/usr/bin/${pkgname}" } diff --git a/qt.conf b/qt.conf deleted file mode 100644 index 1f0867f9cc05..000000000000 --- a/qt.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Paths] -Libraries='' diff --git a/toontown-rewritten.desktop b/toontown-rewritten.desktop deleted file mode 100644 index 3b20757b9bff..000000000000 --- a/toontown-rewritten.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Toontown Rewritten -Comment=Play Toontown Rewritten -Keywords=Game;entertainment; -GenericName=Web Browser -Exec=toontown-rewritten -Icon=toontown -Terminal=false -StartupNotify=true -Type=Application -Categories=Game;Entertainment; diff --git a/toontown-rewritten.sh b/toontown-rewritten.sh deleted file mode 100644 index 855aa6e25029..000000000000 --- a/toontown-rewritten.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# Launch -mkdir -p ~/.toontown-rewritten -cd ~/.toontown-rewritten -exec /opt/toontown-rewritten/Launcher & -while [ ! -f TTREngine ] -do - sleep 2 -done - -chmod +x TTREngine diff --git a/toontown.py b/toontown.py new file mode 100755 index 000000000000..a9e010ccd20e --- /dev/null +++ b/toontown.py @@ -0,0 +1,56 @@ +from launcher.launcher import TTRLauncher +from gui.frame import LauncherFrame +from PyQt5.QtWidgets import QApplication +import multiprocessing +from launcher.launcher import localizer, messagetypes +import traceback +import sys +import os + +#Set our default path +if os.getenv("XDG_DATA_HOME") is not None: + if not os.path.exists(os.path.join(os.getenv("XDG_DATA_HOME"), "toontown-rewritten")): + os.makedirs(os.path.join(os.getenv("XDG_DATA_HOME"), "toontown-rewritten")) + os.chdir(os.path.join(os.getenv("XDG_DATA_HOME"), "toontown-rewritten")) +else: #Never thought i'd be here... + if not os.path.exists(os.path.join(os.path.expanduser("~"), ".ttr")): + os.makedirs(os.path.join(os.path.expanduser("~"), ".ttr")) + os.chdir(os.path.join(os.path.expanduser("~"), ".ttr")) + +#from shutil import copyfile +#Override default game settings for a better user experience +#By default, the fullscreen mode can span both monitors on Linux and it can be a hassle to fix it. +#if not os.path.exists("settings.json"): +# print("Installing default config...") +# copyfile("resources/settings.json", "settings.json") + +#Basically the exact same as the old launcher +class Process(multiprocessing.Process): + pass + +def run_launcher(guiToLauncher, launcherToGui): + launcher = TTRLauncher(input=guiToLauncher, output=launcherToGui) + try: + launcher.start() + except: + # We caught an exception! Let's write info to crash.txt and tell the GUI process. + eType, value, trace = sys.exc_info() + with open('crash.txt', 'w') as f: + f.write('%s: %s\n' % (eType.__name__, value)) + traceback.print_tb(trace, None, f) + launcherToGui.put((messagetypes.LAUNCHER_ERROR, localizer.ERR_UnknownTraceback, True)) + + +if __name__ == '__main__': # Needed for multiprocessing to not fail horrifically. Don't try to remove. + multiprocessing.freeze_support() # Needed on Windows for PyInstaller... + + guiToLauncher = multiprocessing.Queue() + launcherToGui = multiprocessing.Queue() + + launcherProcess = Process(target=run_launcher, name="Launcher-Thread", args=(guiToLauncher, launcherToGui)) + launcherProcess.daemon = True + launcherProcess.start() + + app = QApplication(sys.argv) + frame = LauncherFrame(localizer.GUI_WindowTitle, launcherToGui, guiToLauncher) + sys.exit(app.exec_()) |