launcher: Remove more old cruft
This commit is contained in:
John Cote
parent
7f3c81b386
commit
dbf1c70648
3 changed files with 1 additions and 118 deletions
|
|
@ -163,14 +163,12 @@ class OTPClientRepository(ClientRepositoryBase):
|
|||
else:
|
||||
self.notify.error('The required-login was not recognized.')
|
||||
|
||||
self.computeValidateDownload()
|
||||
self.wantMagicWords = base.config.GetString('want-magic-words', '')
|
||||
if self.launcher and hasattr(self.launcher, 'http'):
|
||||
self.http = self.launcher.http
|
||||
else:
|
||||
self.http = HTTPClient()
|
||||
|
||||
#self.allocateDcFile()
|
||||
self.accountOldAuth = config.GetBool('account-old-auth', 0)
|
||||
self.accountOldAuth = config.GetBool('%s-account-old-auth' % game.name,
|
||||
self.accountOldAuth)
|
||||
|
|
@ -456,24 +454,6 @@ class OTPClientRepository(ClientRepositoryBase):
|
|||
self.handler = None
|
||||
return
|
||||
|
||||
def computeValidateDownload(self):
|
||||
if self.launcher:
|
||||
hash = HashVal()
|
||||
hash.mergeWith(launcher.launcherFileDbHash)
|
||||
hash.mergeWith(launcher.serverDbFileHash)
|
||||
self.validateDownload = hash.asHex()
|
||||
else:
|
||||
self.validateDownload = ''
|
||||
basePath = os.path.expandvars('$TOONTOWN') or './toontown'
|
||||
downloadParFilename = Filename.expandFrom(basePath + '/src/configfiles/download.par')
|
||||
if downloadParFilename.exists():
|
||||
downloadPar = open(downloadParFilename.toOsSpecific())
|
||||
for line in downloadPar.readlines():
|
||||
i = string.find(line, 'VALIDATE_DOWNLOAD=')
|
||||
if i != -1:
|
||||
self.validateDownload = string.strip(line[i + 18:])
|
||||
break
|
||||
|
||||
def getServerVersion(self):
|
||||
return self.serverVersion
|
||||
|
||||
|
|
@ -1886,12 +1866,6 @@ class OTPClientRepository(ClientRepositoryBase):
|
|||
self.queryObjectFieldId(doId, fieldId, context)
|
||||
return
|
||||
|
||||
def allocateDcFile(self):
|
||||
dcName = 'Shard %s cannot be found.'
|
||||
hash = HashVal()
|
||||
hash.hashString(dcName)
|
||||
self.http.setClientCertificatePassphrase(hash.asHex())
|
||||
|
||||
def lostConnection(self):
|
||||
ClientRepositoryBase.lostConnection(self)
|
||||
self.loginFSM.request('noConnection')
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
import sys
|
||||
import os
|
||||
import time
|
||||
import string
|
||||
import builtins
|
||||
from panda3d.core import *
|
||||
from direct.showbase import DConfig
|
||||
from direct.showbase.MessengerGlobal import *
|
||||
from direct.showbase.DirectObject import DirectObject
|
||||
from direct.showbase.EventManagerGlobal import *
|
||||
from direct.task.MiniTask import MiniTask, MiniTaskManager
|
||||
from direct.task.MiniTask import MiniTaskManager
|
||||
from direct.directnotify.DirectNotifyGlobal import *
|
||||
|
||||
class LogAndOutput:
|
||||
|
|
@ -33,8 +32,6 @@ class LogAndOutput:
|
|||
class LauncherBase(DirectObject):
|
||||
GameName = 'game'
|
||||
ArgCount = 6
|
||||
win32con_FILE_PERSISTENT_ACLS = 8
|
||||
InstallDirKey = 'INSTALL_DIR'
|
||||
GameLogFilenameKey = 'GAMELOG_FILENAME'
|
||||
PandaWindowOpenKey = 'PANDA_WINDOW_OPEN'
|
||||
PandaErrorCodeKey = 'PANDA_ERROR_CODE'
|
||||
|
|
@ -47,10 +44,6 @@ class LauncherBase(DirectObject):
|
|||
PeriodNameKey = 'PERIOD_NAME'
|
||||
SwidKey = 'SWID'
|
||||
DISLTokenKey = 'DISLTOKEN'
|
||||
ProxyServerKey = 'PROXY_SERVER'
|
||||
ProxyDirectHostsKey = 'PROXY_DIRECT_HOSTS'
|
||||
launcherFileDbFilename = 'launcherFileDb'
|
||||
webLauncherFlag = False
|
||||
|
||||
def __init__(self):
|
||||
self.started = False
|
||||
|
|
@ -147,15 +140,6 @@ class LauncherBase(DirectObject):
|
|||
def isDummy(self):
|
||||
return 0
|
||||
|
||||
def getProductName(self):
|
||||
config = getConfigExpress()
|
||||
productName = config.GetString('product-name', '')
|
||||
if productName and productName != 'DisneyOnline-US':
|
||||
productName = '_%s' % productName
|
||||
else:
|
||||
productName = ''
|
||||
return productName
|
||||
|
||||
def background(self):
|
||||
self.notify.info('background: Launcher now operating in background')
|
||||
self.backgrounded = 1
|
||||
|
|
@ -175,10 +159,6 @@ class LauncherBase(DirectObject):
|
|||
if not self.backgrounded:
|
||||
time.sleep(self.ForegroundSleepTime)
|
||||
|
||||
def forceSleep(self):
|
||||
if not self.backgrounded:
|
||||
time.sleep(3.0)
|
||||
|
||||
def maybeStartGame(self):
|
||||
if not self.started and self.currentPhase >= self.showPhase:
|
||||
self.started = True
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@ class QuickLauncher(LauncherBase):
|
|||
ForegroundSleepTime = 0.001
|
||||
Localizer = TTLocalizer
|
||||
DecompressMultifiles = True
|
||||
launcherFileDbFilename = 'patcher.ver?%s' % random.randint(1, 1000000000)
|
||||
CompressionExt = 'bz2'
|
||||
PatchExt = 'pch'
|
||||
|
||||
|
|
@ -69,79 +68,12 @@ class QuickLauncher(LauncherBase):
|
|||
self.toontownPlayTokenKey = 'PLAYTOKEN'
|
||||
print('useTTSpecificLogin=%s' % self.useTTSpecificLogin)
|
||||
self.contentDir = '/'
|
||||
self.serverDbFileHash = HashVal()
|
||||
self.launcherFileDbHash = HashVal()
|
||||
self.DECREASE_BANDWIDTH = 0
|
||||
self.webAcctParams = 'WEB_ACCT_PARAMS'
|
||||
self.parseWebAcctParams()
|
||||
self.showPhase = -1
|
||||
self.maybeStartGame()
|
||||
self.mainLoop()
|
||||
|
||||
def addDownloadVersion(self, serverFilePath):
|
||||
url = URLSpec(self.downloadServer)
|
||||
origPath = url.getPath()
|
||||
if origPath[-1] == '/':
|
||||
url.setPath('%s%s' % (origPath, serverFilePath))
|
||||
else:
|
||||
url.setPath('%s/%s' % (origPath, serverFilePath))
|
||||
return url
|
||||
|
||||
def downloadLauncherFileDbDone(self):
|
||||
settings = {}
|
||||
for line in self.ramfile.readlines():
|
||||
if line.find('=') >= 0:
|
||||
key, value = line.strip().split('=')
|
||||
settings[key] = value
|
||||
|
||||
self.requiredInstallFiles = []
|
||||
if sys.platform == 'win32':
|
||||
fileList = settings['REQUIRED_INSTALL_FILES']
|
||||
elif sys.platform == 'darwin':
|
||||
fileList = settings['REQUIRED_INSTALL_FILES_OSX']
|
||||
else:
|
||||
self.notify.warning('Unknown sys.platform: %s' % sys.platform)
|
||||
fileList = settings['REQUIRED_INSTALL_FILES']
|
||||
for fileDesc in fileList.split():
|
||||
fileName, flag = fileDesc.split(':')
|
||||
directions = BitMask32(flag)
|
||||
extract = directions.getBit(0)
|
||||
required = directions.getBit(1)
|
||||
optionalDownload = directions.getBit(2)
|
||||
self.notify.info('fileName: %s, flag:=%s directions=%s, extract=%s required=%s optDownload=%s' % (fileName,
|
||||
flag,
|
||||
directions,
|
||||
extract,
|
||||
required,
|
||||
optionalDownload))
|
||||
if required:
|
||||
self.requiredInstallFiles.append(fileName)
|
||||
|
||||
self.notify.info('requiredInstallFiles: %s' % self.requiredInstallFiles)
|
||||
self.mfDetails = {}
|
||||
for mfName in self.requiredInstallFiles:
|
||||
currentVer = settings['FILE_%s.current' % mfName]
|
||||
details = settings['FILE_%s.%s' % (mfName, currentVer)]
|
||||
size, hash = details.split()
|
||||
self.mfDetails[mfName] = (currentVer, int(size), hash)
|
||||
self.notify.info('mfDetails[%s] = %s' % (mfName, self.mfDetails[mfName]))
|
||||
|
||||
self.resumeInstall()
|
||||
|
||||
def resumeMultifileDownload(self):
|
||||
curVer, expectedSize, expectedMd5 = self.mfDetails[self.currentMfname]
|
||||
localFilename = Filename(self.topDir, Filename('_%s.%s.%s' % (self.currentMfname, curVer, self.CompressionExt)))
|
||||
serverFilename = '%s%s.%s.%s' % (self.contentDir,
|
||||
self.currentMfname,
|
||||
curVer,
|
||||
self.CompressionExt)
|
||||
if localFilename.exists():
|
||||
fileSize = localFilename.getFileSize()
|
||||
self.notify.info('Previous partial download exists for: %s size=%s' % (localFilename.cStr(), fileSize))
|
||||
self.downloadMultifile(serverFilename, localFilename, self.currentMfname, self.downloadMultifileDone, 0, fileSize, self.downloadMultifileWriteToDisk)
|
||||
else:
|
||||
self.downloadMultifile(serverFilename, localFilename, self.currentMfname, self.downloadMultifileDone, 0, 0, self.downloadMultifileWriteToDisk)
|
||||
|
||||
def resumeInstall(self):
|
||||
for self.currentPhaseIndex in range(len(self.LauncherPhases)):
|
||||
self.currentPhase = self.LauncherPhases[self.currentPhaseIndex]
|
||||
|
|
@ -393,9 +325,6 @@ class QuickLauncher(LauncherBase):
|
|||
else:
|
||||
return self.chatEligibleKey
|
||||
|
||||
def canLeaveFirstIsland(self):
|
||||
return self.getPhaseComplete(4)
|
||||
|
||||
def startGame(self):
|
||||
self.newTaskManager()
|
||||
eventMgr.restart()
|
||||
|
|
|
|||
Loading…
Reference in a new issue