sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Entropy/TimeScheduled:

Browse Source 
- make possible to sleep before spawning the function
Entropy/EquoInterface:
- packageSetMatch: return empty tuple if no matches are found (instead of empty dict) when multiMatch is not enabled
- generate_dependency_tree(): add flat option, to return a yet ordered dependencies list (instead of a dict)
- generate_dependency_tree(): slightly update speed when creating the final dictionary
Entropy/phpBB3AuthInterface:
- make possible to disable the update of the session table
Entropy/UGCCacheInterface:
- get_package_downloads(): always return int


git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2744 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
lxnay
2008-12-09 13:12:31 +00:00
parent 5592ecfb84
commit 47c6252dc1
2 changed files with 52 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/entropy.py
+16 -12
View File
@@ -1945,7 +1945,7 @@ class EquoInterface(TextInterface):
def packageSetMatch(self, package_set, multiMatch = False, matchRepo = None, server_repos = [], serverInstance = None, search = False):
# support match in repository from shell
# atom@repo1,repo2,repo3
# set@repo1,repo2,repo3
package_set, repos = self.entropyTools.dep_get_match_in_repos(package_set)
if (matchRepo == None) and (repos != None):
matchRepo = repos
@@ -2002,7 +2002,7 @@ class EquoInterface(TextInterface):
break
if multiMatch: return set_data
if not set_data: return {}
if not set_data: return ()
return set_data.pop(0)
def repository_move_clear_cache(self, repoid = None):
@@ -2343,7 +2343,7 @@ class EquoInterface(TextInterface):
@input package: atomInfo (idpackage,reponame)
@output: dependency tree dictionary, plus status code
'''
def generate_dependency_tree(self, atomInfo, empty_deps = False, deep_deps = False, matchfilter = None):
def generate_dependency_tree(self, atomInfo, empty_deps = False, deep_deps = False, matchfilter = None, flat = False):
usefilter = False
if matchfilter != None:
@@ -2359,6 +2359,7 @@ class EquoInterface(TextInterface):
# special events
dependenciesNotFound = set()
conflicts = set()
flat_tree = []
mydep = (1,myatom)
mybuffer = self.entropyTools.lifobuffer()
@@ -2473,12 +2474,13 @@ class EquoInterface(TextInterface):
mydep = mybuffer.pop()
newdeptree = {}
for x in deptree:
key = x[0]
item = x[1]
for key,item in deptree:
if not newdeptree.has_key(key):
newdeptree[key] = set()
newdeptree[key].add(item)
if flat:
if item not in flat_tree:
flat_tree.append(item)
del deptree
if (dependenciesNotFound):
@@ -2489,9 +2491,7 @@ class EquoInterface(TextInterface):
# conflicts
newdeptree[0] = conflicts
treecache.clear()
matchcache.clear()
if flat: return flat_tree,0
return newdeptree,0 # note: newtree[0] contains possible conflicts
def _lookup_system_mask_repository_deps(self):
@@ -19926,6 +19926,7 @@ class phpBB3AuthInterface(DistributionAuthInterface,RemoteDbSkelInterface):
os.uname()[2],
)
self.TABLE_PREFIX = 'phpbb_'
self.do_update_session_table = True
def validate_username_regex(self, username):
allow_name_chars = self._get_config_value("allow_name_chars")
@@ -20653,7 +20654,7 @@ class phpbb3Authenticator(phpBB3AuthInterface,SocketAuthenticatorSkel):
# fill login_data with fake information
self.login_data = {'username': self.FAKE_USERNAME, 'password': 'look elsewhere, this is not a password', 'user_id': auth_id}
ip_address = session_data.get('ip_address')
if ip_address:
if ip_address and self.do_update_session_table:
self._update_session_table(auth_id, ip_address)
def docmd_login(self, arguments):
@@ -20691,7 +20692,7 @@ class phpbb3Authenticator(phpBB3AuthInterface,SocketAuthenticatorSkel):
self.HostInterface.sessions[self.session]['developer'] = is_dev
self.HostInterface.sessions[self.session]['moderator'] = is_mod
self.HostInterface.sessions[self.session]['user'] = is_user
if ip_address and uid:
if ip_address and uid and self.do_update_session_table:
self._update_session_table(uid, ip_address)
return True,user,uid,"ok"
return rc,user,None,"login failed"
@@ -26986,7 +26987,10 @@ class UGCCacheInterface:
return 0
elif not cache.has_key(pkgkey):
return 0
return cache[pkgkey]
try:
return int(cache[pkgkey])
except ValueError:
return 0
class UGCClientInterface:
libraries/entropyTools.py
+36 -15
View File
@@ -62,6 +62,7 @@ def is_user_in_entropy_group(uid = None):
return True
class TimeScheduled(threading.Thread):
def __init__(self, function, delay, dictData = {}):
threading.Thread.__init__(self)
self.function = function
@@ -69,28 +70,48 @@ class TimeScheduled(threading.Thread):
self.exc = SystemExit
self.data = dictData
self.accurate = True
self.delay_before = False
def run(self):
self.alive = 1
while self.alive:
if self.delay_before:
do_break = self.do_delay()
if do_break: break
if self.data:
self.function(self.data)
else:
self.function()
try:
if (self.delay > 5) and not self.accurate:
mydelay = int(self.delay)
broke = False
while mydelay:
if not self.alive:
broke = True
break
time.sleep(1)
mydelay -= 1
if broke: break
else:
time.sleep(self.delay)
except:
pass
if not self.delay_before:
do_break = self.do_delay()
if do_break: break
def do_delay(self):
try:
if (self.delay > 5) and not self.accurate:
mydelay = int(self.delay)
broke = False
while mydelay:
if not self.alive:
broke = True
break
time.sleep(1)
mydelay -= 1
if broke:
return True
else:
time.sleep(self.delay)
except:
pass
return False
def kill(self):
self.alive = 0