From 4ebc80ff5c9eee281a6d8daeaf7a337b875b3c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= Date: Sat, 17 Aug 2013 03:01:11 +0200 Subject: [PATCH] split out the pony restriction logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/ponysay.py | 104 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 71 insertions(+), 33 deletions(-) diff --git a/src/ponysay.py b/src/ponysay.py index 249aba22..9f0d23aa 100755 --- a/src/ponysay.py +++ b/src/ponysay.py @@ -473,39 +473,11 @@ class Ponysay(): oldponies = {} self.__getAllPonies(standard, extra, oldponies, quoters): - ## Apply metadata restriction - if self.restriction is not None: - logic = Metadata.makeRestrictionLogic(self.restriction) - ponies = {} - for ponydir in ponydirs: - for pony in Metadata.restrictedPonies(ponydir, logic): - if (pony in oldponies) and not (pony in ponies): - ponies[pony] = ponydir + pony + '.pony' - if len(ponies) > 0: - oldponies = ponies - - ## Apply dimension restriction - ponies = {} - (termh, termw) = gettermsize() - for ponydir in ponydirs: - (fitw, fith) = (None, None) - if os.path.exists(ponydir + 'widths'): - fitw = set() - with open(ponydir + 'widths', 'rb') as file: - Metadata.getFitting(fitw, termw, file) - if os.path.exists(ponydir + ('onlyheights' if self.ponyonly else 'heights')): - fith = set() - with open(ponydir + ('onlyheights' if self.ponyonly else 'heights'), 'rb') as file: - Metadata.getFitting(fith, termh, file) - for ponyfile in oldponies.values(): - if ponyfile.startswith(ponydir): - pony = ponyfile[len(ponydir) : -5] - if (fitw is None) or (pony in fitw): - if (fith is None) or (pony in fith): - ponies[pony] = ponyfile + ## Apply restriction + ponies = self.__applyRestriction(oldponies, ponydirs) ## Select one pony and set all information - names = list((oldponies if len(ponies) == 0 else ponies).keys()) + names = list(ponies.keys()) if len(names) == 0: printerr('All the ponies are missing, call the Princess!') exit(249) @@ -547,7 +519,7 @@ class Ponysay(): @param standard:bool Whether to include standard ponies @parma extra:bool Whether to include extra ponies - @param collection:dict Collection of already found ponies, and collection for new ponies + @param collection:dict Collection of already found ponies, and collection for new ponies, maps to the pony file @param quoters:set? Ponies to limit to, or `None` to include all ponies ''' if standard: @@ -561,7 +533,7 @@ class Ponysay(): Get ponies for a set of directories @param directories:list Directories with ponies - @param collection:dict Collection of already found ponies, and collection for new ponies + @param collection:dict Collection of already found ponies, and collection for new ponies, maps to the pony file @param quoters:set? Ponies to limit to, or `None` to include all ponies ''' for ponydir in directories: @@ -572,6 +544,72 @@ class Ponysay(): collection[pony] = ponydir + ponyfile + def __applyRestriction(self, oldponies, ponydirs): + ''' + Restrict ponies + + @param oldponies:dict Collection of original ponies, maps to pony file + @param ponydirs:list List of pony directories + @return :dict Map from restricted ponies to pony files + ''' + ## Apply metadata restriction + if self.restriction is not None: + ponies = {} + self.__applyMetadataRestriction(ponies, oldponies, ponydirs) + if len(ponies) > 0: + oldponies = ponies + + ## Apply dimension restriction + ponies = {} + self.__applyDimensionRestriction(ponies, oldponies, ponydirs) + if len(ponies) > 0: + oldponies = ponies + + return oldponies + + + def __applyMetadataRestriction(self, ponies, oldponies, ponydirs): + ''' + Restrict to ponies by metadata + + @param ponies:dict Collection to fill with restricted ponies, mapped to pony file + @param oldponies:dict Collection of original ponies, maps to pony file + @param ponydirs:list List of pony directories + ''' + logic = Metadata.makeRestrictionLogic(self.restriction) + for ponydir in ponydirs: + for pony in Metadata.restrictedPonies(ponydir, logic): + if (pony in oldponies) and not (pony in ponies): + ponies[pony] = ponydir + pony + '.pony' + + + def __applyDimensionRestriction(self, ponies, oldponies, ponydirs): + ''' + Restrict to ponies by dimension + + @param ponies:dict Collection to fill with restricted ponies, mapped to pony file + @param oldponies:dict Collection of original ponies, maps to pony file + @param ponydirs:list List of pony directories + ''' + (termh, termw) = gettermsize() + for ponydir in ponydirs: + (fitw, fith) = (None, None) + if os.path.exists(ponydir + 'widths'): + fitw = set() + with open(ponydir + 'widths', 'rb') as file: + Metadata.getFitting(fitw, termw, file) + if os.path.exists(ponydir + ('onlyheights' if self.ponyonly else 'heights')): + fith = set() + with open(ponydir + ('onlyheights' if self.ponyonly else 'heights'), 'rb') as file: + Metadata.getFitting(fith, termh, file) + for ponyfile in oldponies.values(): + if ponyfile.startswith(ponydir): + pony = ponyfile[len(ponydir) : -5] + if (fitw is None) or (pony in fitw): + if (fith is None) or (pony in fith): + ponies[pony] = ponyfile + + def __getQuote(self, pony, file): ''' Select a quote for a pony