guopengcheng/ahserver_g
1
0
Fork 0
Code Pull Requests Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2022-05-20 20:03:54 +08:00
parent 1ddea57261
commit 13d402dd25
4 changed files with 9 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ahserver/configuredServer.py
View File

@ -7,6 +7,7 @@ from aiohttp import web
from appPublic.folderUtils import ProgramPath from appPublic.folderUtils import ProgramPath
from appPublic.background import Background from appPublic.background import Background
from appPublic.jsonConfig import getConfig from appPublic.jsonConfig import getConfig
from appPublic.i18n import getI18N
from sqlor.dbpools import DBPools from sqlor.dbpools import DBPools
@ -29,6 +30,7 @@ class ConfiguredServer:
if len(sys.argv) > 1: if len(sys.argv) > 1:
workdir = sys.argv[1] workdir = sys.argv[1]
config = getConfig(workdir,{'workdir':workdir,'ProgramPath':pp}) config = getConfig(workdir,{'workdir':workdir,'ProgramPath':pp})
i18n = getI18N(path=workdir)
if config.databases: if config.databases:
DBPools(config.databases) DBPools(config.databases)
initEnv() initEnv()

2
ahserver/processorResource.py
View File

@ -27,7 +27,7 @@ from aiohttp.web_response import Response, StreamResponse
from aiohttp.web_routedef import AbstractRouteDef from aiohttp.web_routedef import AbstractRouteDef
from appPublic.jsonConfig import getConfig from appPublic.jsonConfig import getConfig
from appPublic.MiniI18N import getI18N from appPublic.i18n import getI18N
from appPublic.dictObject import DictObject, multiDict2Dict from appPublic.dictObject import DictObject, multiDict2Dict
from appPublic.timecost import TimeCost from appPublic.timecost import TimeCost
from appPublic.timeUtils import timestampstr from appPublic.timeUtils import timestampstr

1
doodah/doodah_s.py
View File

@ -37,6 +37,7 @@ rf.register('getI18nMapping', getI18nMapping)
p = os.getcwd() p = os.getcwd()
if len(sys.argv) > 1: if len(sys.argv) > 1:
p = sys.argv[1] p = sys.argv[1]
print('p=', p)
server = ConfiguredServer(auth_klass=MyAuthAPI,workdir=p) server = ConfiguredServer(auth_klass=MyAuthAPI,workdir=p)
load_plugins(p) load_plugins(p)
server.run() server.run()

90
doodah/doodah_s.spec
View File

@ -1,100 +1,22 @@
# -*- mode: python ; coding: utf-8 -*- # -*- mode: python ; coding: utf-8 -*-
block_cipher = None block_cipher = None
exs=[
"FLAC",
"Ogg",
"Opus",
"OpusFile",
"SDL2",
"SDL2_image",
"SDL2_mixer",
"SDL2_ttf",
"caio",
"cv2",
"ffpyplayer",
"kivy",
"kiwisolver",
"libSDL2-2.0.0.dylib",
"libSDL2_mixer-2.0.0.dylib",
"libass.9.dylib",
"libavcodec.58.54.100.dylib",
"libavcodec.58.91.100.dylib",
"libavdevice.58.10.100.dylib",
"libavfilter.7.85.100.dylib",
"libavformat.58.29.100.dylib",
"libavformat.58.45.100.dylib",
"libavresample.4.0.0.dylib",
"libavutil.56.31.100.dylib",
"libavutil.56.51.100.dylib",
"libbluray.2.dylib",
"libfreetype.6.dylib",
"libfribidi.0.dylib",
"libmp3lame.0.dylib",
"libmpdec.3.dylib",
"libogg.0.dylib",
"libopenblas.0.dylib",
"libopus.0.dylib",
"libvorbis.0.dylib",
"libvorbisenc.2.dylib",
"libvorbisfile.3.dylib",
"libwebp.7.dylib",
"libwebpdemux.2.dylib",
"libwebpmux.3.dylib",
"libx264.160.dylib",
"libx265.192.dylib",
"matplotlib",
"mpg123",
"multidict",
"numba",
"numpy",
"objc",
"pandas",
"psutil",
"scipy"
]
a = Analysis(['doodah_s.py'], a = Analysis(['doodah_s.py'],
pathex=['/Volumes/home/ymq/pydev/github/ahserver/doodah'], pathex=['/home/ymq/pydev/github/ahserver/doodah'],
binaries=[], binaries=[],
datas=[], datas=[],
hiddenimports=[ hiddenimports=[],
"multidict"
],
hookspath=[], hookspath=[],
hooksconfig={},
runtime_hooks=[], runtime_hooks=[],
excludes=[ excludes=[],
"FLAC",
"Ogg",
"Opus",
"OpusFile",
"SDL2",
"SDL2_image",
"SDL2_mixer",
"SDL2_ttf",
"cv2",
"ffpyplayer",
"kivy",
"matplotlib",
"mpg123",
"numba",
"numpy",
"objc",
"pandas",
"psutil",
"scipy"
],
win_no_prefer_redirects=False, win_no_prefer_redirects=False,
win_private_assemblies=False, win_private_assemblies=False,
cipher=block_cipher, cipher=block_cipher,
noarchive=False) noarchive=False)
pyz = PYZ(a.pure, a.zipped_data, pyz = PYZ(a.pure, a.zipped_data,
cipher=block_cipher) cipher=block_cipher)
exe = EXE(pyz, exe = EXE(pyz,
a.scripts, a.scripts,
a.binaries, a.binaries,
@ -108,8 +30,4 @@ exe = EXE(pyz,
upx=True, upx=True,
upx_exclude=[], upx_exclude=[],
runtime_tmpdir=None, runtime_tmpdir=None,
console=True, console=True )
disable_windowed_traceback=False,
target_arch=None,
codesign_identity=None,
entitlements_file=None )