anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

flake8.

Browse source
This commit is contained in:
Shlomi Fish 2017-04-17 02:02:18 +03:00
parent d77ef531ad
commit fc90baffa7
3 changed files with 113 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
pysollib/pysolaudio.py
View file

@ -75,7 +75,8 @@ class AbstractAudioClient:
if self._connectServer(): if self._connectServer():
self.connected = 1 self.connected = 1
except: except:
if traceback: traceback.print_exc() if traceback:
traceback.print_exc()
self.destroy() self.destroy()
# disconnect and stop server # disconnect and stop server
@ -92,7 +93,7 @@ class AbstractAudioClient:
# #
def playSample(self, name, priority=0, loop=0, volume=-1): def playSample(self, name, priority=0, loop=0, volume=-1):
##print 'AbstractAudioClient.playSample', name # print 'AbstractAudioClient.playSample', name
if self.audiodev is None or not self.app or not self.app.opt.sound: if self.audiodev is None or not self.app or not self.app.opt.sound:
return 0 return 0
if priority <= self.sample_priority and self.sample_loop: if priority <= self.sample_priority and self.sample_loop:
@ -106,7 +107,8 @@ class AbstractAudioClient:
self.sample_loop = loop self.sample_loop = loop
return 1 return 1
except: except:
if traceback: traceback.print_exc() if traceback:
traceback.print_exc()
return 0 return 0
def stopSamples(self): def stopSamples(self):
@ -115,7 +117,8 @@ class AbstractAudioClient:
try: try:
self._stopSamples() self._stopSamples()
except: except:
if traceback: traceback.print_exc() if traceback:
traceback.print_exc()
self.sample_priority = -1 self.sample_priority = -1
self.sample_loop = 0 self.sample_loop = 0
@ -125,7 +128,8 @@ class AbstractAudioClient:
try: try:
self._stopSamplesLoop() self._stopSamplesLoop()
except: except:
if traceback: traceback.print_exc() if traceback:
traceback.print_exc()
self.sample_priority = -1 self.sample_priority = -1
self.sample_loop = 0 self.sample_loop = 0
@ -176,16 +180,17 @@ class PysolSoundServerModuleClient(AbstractAudioClient):
def __init__(self): def __init__(self):
AbstractAudioClient.__init__(self) AbstractAudioClient.__init__(self)
import pysolsoundserver
def startServer(self): def startServer(self):
# use the module # use the module
try: try:
import pysolsoundserver
self.audiodev = pysolsoundserver self.audiodev = pysolsoundserver
self.audiodev.init() self.audiodev.init()
self.server = 1 self.server = 1
except: except:
if traceback: traceback.print_exc() if traceback:
traceback.print_exc()
self.server = None self.server = None
self.audiodev = None self.audiodev = None
@ -197,7 +202,7 @@ class PysolSoundServerModuleClient(AbstractAudioClient):
r = self.cmd("protocol 6") r = self.cmd("protocol 6")
if r != 0: if r != 0:
return 0 return 0
##self.cmd("debug 1") # self.cmd("debug 1")
return 1 return 1
# disconnect and stop server # disconnect and stop server
@ -209,7 +214,8 @@ class PysolSoundServerModuleClient(AbstractAudioClient):
# #
def _playSample(self, filename, priority, loop, volume): def _playSample(self, filename, priority, loop, volume):
self.cmd("playwav '%s' %d %d %d %d" % (filename, -1, priority, loop, volume)) self.cmd("playwav '%s' %d %d %d %d"
% (filename, -1, priority, loop, volume))
return 1 return 1
def _stopSamples(self): def _stopSamples(self):
@ -230,10 +236,13 @@ class PysolSoundServerModuleClient(AbstractAudioClient):
loop = 999999 loop = 999999
for music in music_list: for music in music_list:
if music.absname: if music.absname:
self.cmd("queuemus '%s' %d %d %d %d" % (music.absname, music.index, 0, loop, music.volume)) self.cmd("queuemus '%s' %d %d %d %d"
% (music.absname, music.index, 0, loop,
music.volume))
self.cmd("startqueue") self.cmd("startqueue")
except: except:
if traceback: traceback.print_exc() if traceback:
traceback.print_exc()
def playNextMusic(self): def playNextMusic(self):
self.cmd("nextmus") self.cmd("nextmus")
@ -249,7 +258,8 @@ class PysolSoundServerModuleClient(AbstractAudioClient):
self.cmd("setwavvol %d" % s) self.cmd("setwavvol %d" % s)
self.cmd("setmusvol %d" % m) self.cmd("setmusvol %d" % m)
except: except:
if traceback: traceback.print_exc() if traceback:
traceback.print_exc()
# ************************************************************************ # ************************************************************************
@ -276,11 +286,12 @@ class Win32AudioClient(AbstractAudioClient):
flags = flags | a.SND_LOOP flags = flags | a.SND_LOOP
if priority <= self.sample_priority: if priority <= self.sample_priority:
flags = flags | a.SND_NOSTOP flags = flags | a.SND_NOSTOP
###print filename, flags, priority # print filename, flags, priority
try: try:
a.PlaySound(filename, flags) a.PlaySound(filename, flags)
return 1 return 1
except: pass except:
pass
return 0 return 0
def _stopSamples(self): def _stopSamples(self):
@ -321,7 +332,8 @@ class OSSAudioServer:
self.play(filename, priority) self.play(filename, priority)
def _getParameters(self, filename): def _getParameters(self, filename):
import ossaudiodev, wave import ossaudiodev
import wave
w = wave.open(filename) w = wave.open(filename)
fmt = ossaudiodev.AFMT_U8 fmt = ossaudiodev.AFMT_U8
nch = w.getnchannels() nch = w.getnchannels()
@ -330,8 +342,8 @@ class OSSAudioServer:
return (frames, fmt, nch, rate) return (frames, fmt, nch, rate)
def playLoop(self, filename, priority=None): def playLoop(self, filename, priority=None):
##print '_playLoop:', filename # print '_playLoop:', filename
import ossaudiodev, wave import ossaudiodev
try: try:
# audiodev = self.audiodev # audiodev = self.audiodev
audiodev = ossaudiodev.open('w') audiodev = ossaudiodev.open('w')
@ -345,12 +357,13 @@ class OSSAudioServer:
# self.audiodev = ossaudiodev.open('w') # self.audiodev = ossaudiodev.open('w')
return 1 return 1
except: except:
if traceback: traceback.print_exc() if traceback:
traceback.print_exc()
return 0 return 0
def play(self, filename, priority): def play(self, filename, priority):
##print '_play:', filename # print '_play:', filename
import ossaudiodev, wave import ossaudiodev
try: try:
self._busy = True self._busy = True
# audiodev = self.audiodev # audiodev = self.audiodev
@ -365,7 +378,8 @@ class OSSAudioServer:
self._busy = False self._busy = False
return 1 return 1
except: except:
if traceback: traceback.print_exc() if traceback:
traceback.print_exc()
self._busy = False self._busy = False
return 0 return 0
@ -377,7 +391,7 @@ class OSSAudioClient(AbstractAudioClient):
def __init__(self): def __init__(self):
AbstractAudioClient.__init__(self) AbstractAudioClient.__init__(self)
import ossaudiodev, wave import ossaudiodev
self.audiodev = ossaudiodev self.audiodev = ossaudiodev
def startServer(self): def startServer(self):
@ -389,7 +403,7 @@ class OSSAudioClient(AbstractAudioClient):
server.mainLoop() server.mainLoop()
def _playSample(self, filename, priority, loop, volume): def _playSample(self, filename, priority, loop, volume):
##print '_playSample:', filename, loop # print '_playSample:', filename, loop
os.write(self.pout, '%s\0%s\0%s\0' % (filename, priority, loop)) os.write(self.pout, '%s\0%s\0%s\0' % (filename, priority, loop))
return 1 return 1
@ -413,10 +427,13 @@ class PyGameAudioClient(AbstractAudioClient):
def __init__(self): def __init__(self):
AbstractAudioClient.__init__(self) AbstractAudioClient.__init__(self)
import pygame.mixer, pygame.time import pygame.mixer
import pygame.time
if os.name == 'nt': if os.name == 'nt':
# for py2exe # for py2exe
import pygame.base, pygame.rwobject, pygame.mixer_music import pygame.base
import pygame.rwobject
import pygame.mixer_music
self.mixer = pygame.mixer self.mixer = pygame.mixer
self.time = pygame.time self.time = pygame.time
self.music = self.mixer.music self.music = self.mixer.music
@ -430,22 +447,22 @@ class PyGameAudioClient(AbstractAudioClient):
def connectServer(self, app): def connectServer(self, app):
AbstractAudioClient.connectServer(self, app) AbstractAudioClient.connectServer(self, app)
## http://www.pygame.org/docs/ref/mixer.html # http://www.pygame.org/docs/ref/mixer.html
## NOTE: there is currently a bug on some windows machines which # NOTE: there is currently a bug on some windows machines which
## makes sound play back 'scratchy'. There is not enough cpu in # makes sound play back 'scratchy'. There is not enough cpu in
## the sound thread to feed the buffer to the sound api. To get # the sound thread to feed the buffer to the sound api. To get
## around this you can increase the buffer size. However this # around this you can increase the buffer size. However this
## means that there is more of a delay between the time you ask to # means that there is more of a delay between the time you ask to
## play the sound and when it gets played. Try calling this before # play the sound and when it gets played. Try calling this before
## the pygame.init or pygame.mixer.init calls. # the pygame.init or pygame.mixer.init calls.
## pygame.mixer.pre_init(44100,-16,2, 1024 * 3) # pygame.mixer.pre_init(44100,-16,2, 1024 * 3)
# self.mixer.pre_init(44100, -16, 2, 1024 * 3) # self.mixer.pre_init(44100, -16, 2, 1024 * 3)
buff_size = self.app.opt.sound_sample_buffer_size buff_size = self.app.opt.sound_sample_buffer_size
self.mixer.pre_init(44100, -16, 2, 1024*buff_size) self.mixer.pre_init(44100, -16, 2, 1024*buff_size)
self.mixer.init() self.mixer.init()
def _playSample(self, filename, priority, loop, volume): def _playSample(self, filename, priority, loop, volume):
##print '_playSample:', filename, priority, loop, volume # print '_playSample:', filename, priority, loop, volume
if self.sound_channel and self.sound_channel.get_busy(): if self.sound_channel and self.sound_channel.get_busy():
if self.sound_priority >= priority: if self.sound_priority >= priority:
return 0 return 0
@ -457,7 +474,8 @@ class PyGameAudioClient(AbstractAudioClient):
self.sound.set_volume(vol) self.sound.set_volume(vol)
self.sound_channel = self.sound.play(loop) self.sound_channel = self.sound.play(loop)
except: except:
if traceback: traceback.print_exc() if traceback:
traceback.print_exc()
pass pass
self.sound_priority = priority self.sound_priority = priority
return 1 return 1
@ -469,7 +487,7 @@ class PyGameAudioClient(AbstractAudioClient):
self.sound_channel = None self.sound_channel = None
def _playMusicLoop(self): def _playMusicLoop(self):
##print '_playMusicLoop' # print '_playMusicLoop'
music_list = self.music_list music_list = self.music_list
if not music_list: if not music_list:
return return
@ -488,7 +506,7 @@ class PyGameAudioClient(AbstractAudioClient):
self._wait(200) self._wait(200)
self._wait(300) self._wait(300)
except: except:
##if traceback: traceback.print_exc() # if traceback: traceback.print_exc()
self._wait(1000) self._wait(1000)
def _destroy(self): def _destroy(self):
@ -502,7 +520,7 @@ class PyGameAudioClient(AbstractAudioClient):
self.time.wait(s) self.time.wait(s)
def playContinuousMusic(self, music_list): def playContinuousMusic(self, music_list):
##print 'playContinuousMusic' # print 'playContinuousMusic'
self.music_list = music_list self.music_list = music_list
# if self.audiodev is None or not self.app: # if self.audiodev is None or not self.app:
# return # return
@ -528,4 +546,3 @@ class PyGameAudioClient(AbstractAudioClient):
def playNextMusic(self): def playNextMusic(self):
if self.music: if self.music:
self.music.stop() self.music.stop()

57
pysollib/pysolrandom.py
View file

@ -23,22 +23,27 @@
# imports # imports
import sys, re, time import sys
import re
import time
import random import random
from pysollib.mygettext import _, n_
from pysollib.mfxutil import SubclassResponsibility from pysollib.mfxutil import SubclassResponsibility
if sys.version_info > (3,):
long = int
# ************************************************************************ # ************************************************************************
# * Abstract class for PySol Random number generator. # * Abstract class for PySol Random number generator.
# * # *
# * We use a seed of type long in the range [0, MAX_SEED]. # * We use a seed of type long in the range [0, MAX_SEED].
# ************************************************************************ # ************************************************************************
class BasicRandom: class BasicRandom:
# MAX_SEED = 0L # MAX_SEED = 0L
# MAX_SEED = 0xffffffffffffffffL # 64 bits # MAX_SEED = 0xffffffffffffffffL # 64 bits
MAX_SEED = 100000000000000000000L # 20 digits MAX_SEED = long('100000000000000000000') # 20 digits
ORIGIN_UNKNOWN = 0 ORIGIN_UNKNOWN = 0
ORIGIN_RANDOM = 1 ORIGIN_RANDOM = 1
@ -62,18 +67,18 @@ class BasicRandom:
raise SubclassResponsibility raise SubclassResponsibility
def copy(self): def copy(self):
random = self.__class__(0L) random = self.__class__(long(0))
random.__dict__.update(self.__dict__) random.__dict__.update(self.__dict__)
return random return random
def increaseSeed(self, seed): def increaseSeed(self, seed):
if seed < self.MAX_SEED: if seed < self.MAX_SEED:
return seed + 1L return seed + long(1)
return 0L return long(0)
def _getRandomSeed(self): def _getRandomSeed(self):
t = long(time.time() * 256.0) t = long(time.time() * 256.0)
t = (t ^ (t >> 24)) % (self.MAX_SEED + 1L) t = (t ^ (t >> 24)) % (self.MAX_SEED + long(1))
return t return t
def setSeedAsStr(self, new_s): def setSeedAsStr(self, new_s):
@ -129,6 +134,7 @@ class WHRandom(BasicRandom, random.WichmannHill):
# * Abstract class for LC Random number generators. # * Abstract class for LC Random number generators.
# ************************************************************************ # ************************************************************************
class MFXRandom(BasicRandom): class MFXRandom(BasicRandom):
def __init__(self, seed=None): def __init__(self, seed=None):
@ -146,8 +152,8 @@ class MFXRandom(BasicRandom):
def setSeed(self, seed): def setSeed(self, seed):
seed = long(seed) seed = long(seed)
if not (0L <= seed <= self.MAX_SEED): if not (0 <= seed <= self.MAX_SEED):
raise ValueError, "seed out of range" raise ValueError("seed out of range")
self.seed = seed self.seed = seed
return seed return seed
@ -190,8 +196,8 @@ class MFXRandom(BasicRandom):
class LCRandom64(MFXRandom): class LCRandom64(MFXRandom):
def random(self): def random(self):
self.seed = (self.seed*6364136223846793005L + 1L) & self.MAX_SEED self.seed = (self.seed*long('6364136223846793005') + 1) & self.MAX_SEED
return ((self.seed >> 21) & 0x7fffffffL) / 2147483648.0 return ((self.seed >> 21) & 0x7fffffff) / 2147483648.0
# ************************************************************************ # ************************************************************************
@ -201,7 +207,7 @@ class LCRandom64(MFXRandom):
# ************************************************************************ # ************************************************************************
class LCRandom31(MFXRandom): class LCRandom31(MFXRandom):
MAX_SEED = 0x1ffffffffL # 33 bits MAX_SEED = long('0x1ffffffff', 0) # 33 bits
def getSeedStr(self): def getSeedStr(self):
return "ms" + str(self.initial_seed) return "ms" + str(self.initial_seed)
@ -212,9 +218,10 @@ class LCRandom31(MFXRandom):
def setSeed(self, seed): def setSeed(self, seed):
seed = long(seed) seed = long(seed)
self.seed = seed self.seed = seed
if not (0L <= seed <= self.MAX_SEED): if not (0 <= seed <= self.MAX_SEED):
raise ValueError, "seed out of range" raise ValueError("seed out of range")
self.seedx = (seed if (seed < 0x100000000L) else (seed - 0x100000000L)) self.seedx = (seed if (seed < long('0x100000000', 0)) else
(seed - long('0x100000000', 0)))
return seed return seed
def _rando(self): def _rando(self):
@ -256,6 +263,7 @@ def _match_ms(s):
"""match an ms based seed string.""" """match an ms based seed string."""
return re.match(r"ms([0-9]+)\n?\Z", s) return re.match(r"ms([0-9]+)\n?\Z", s)
# construct Random from seed string # construct Random from seed string
def constructRandom(s): def constructRandom(s):
m = _match_ms(s) m = _match_ms(s)
@ -266,8 +274,9 @@ def constructRandom(s):
ret.setSeedAsStr(s) ret.setSeedAsStr(s)
return ret return ret
else: else:
raise ValueError, "ms seed out of range" raise ValueError("ms seed out of range")
s = re.sub(r"L$", "", str(s)) # cut off "L" from possible conversion to long # cut off "L" from possible conversion to long
s = re.sub(r"L$", "", str(s))
s = re.sub(r"[\s\#\-\_\.\,]", "", s.lower()) s = re.sub(r"[\s\#\-\_\.\,]", "", s.lower())
if not s: if not s:
return None return None
@ -276,7 +285,9 @@ def constructRandom(s):
return LCRandom31(seed) return LCRandom31(seed)
return PysolRandom(seed) return PysolRandom(seed)
MS_LONG_BIT = (1L << 1000)
MS_LONG_BIT = (long(1) << 1000)
def random__str2long(s): def random__str2long(s):
m = _match_ms(s) m = _match_ms(s)
@ -285,17 +296,17 @@ def random__str2long(s):
else: else:
return long(s) return long(s)
def random__long2str(l): def random__long2str(l):
if ((l & MS_LONG_BIT) != 0): if ((l & MS_LONG_BIT) != 0):
return "ms" + str(l & (~ MS_LONG_BIT)) return "ms" + str(l & (~ MS_LONG_BIT))
else: else:
return str(l) return str(l)
# test # test
if __name__ == '__main__': if __name__ == '__main__':
r = constructRandom('12345') r = constructRandom('12345')
print r.randint(0, 100) print(r.randint(0, 100))
print r.random() print(r.random())
print type(r) print(type(r))

3
tests/style/py-flake8.t
View file

@ -9,7 +9,8 @@ use Test::Differences qw( eq_or_diff );
use String::ShellQuote qw/ shell_quote /; use String::ShellQuote qw/ shell_quote /;
# my $cmd = shell_quote( 'flake8', '.' ); # my $cmd = shell_quote( 'flake8', '.' );
my $cmd = shell_quote( 'flake8', glob('./pysollib/[a-o]*.py') ); my $cmd = shell_quote( 'flake8',
grep { not($_ eq './pysollib/pysoltk.py') } glob('./pysollib/[a-p]*.py') );
# TEST # TEST
eq_or_diff( scalar(`$cmd`), '', "flake8 is happy with the code." ); eq_or_diff( scalar(`$cmd`), '', "flake8 is happy with the code." );