jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

utils/checkpackagelib: CommentsMenusPackagesOrder: change the type of variable 'level'

Browse Source 
Change the type of variable "level" to make it a class member.
It will be used not only locally.

Signed-off-by: Jerzy Grzegorek <jerzy.m.grzegorek@gmail.com>
Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Reviewed-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
[Thomas: initialize self.level in the before() method, as suggested by
Ricardo]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Jerzy Grzegorek 2019-09-03 23:13:25 +02:00 committed by Thomas Petazzoni
parent dd99dc5763
commit 6748e42ace
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
utils/checkpackagelib/lib_config.py
View File

@ -67,6 +67,7 @@ class CommentsMenusPackagesOrder(_CheckFunction):
def before(self): def before(self):
self.state = "" self.state = ""
self.level = 0
def get_level(self): def get_level(self):
return len(self.state.split('-')) - 1 return len(self.state.split('-')) - 1
@ -93,12 +94,12 @@ class CommentsMenusPackagesOrder(_CheckFunction):
elif text.startswith("menu"): elif text.startswith("menu"):
self.state += "-menu" self.state += "-menu"
level = self.get_level() self.level = self.get_level()
try: try:
self.menu_of_packages[level] = text[:-1] self.menu_of_packages[self.level] = text[:-1]
self.package[level] = "" self.package[self.level] = ""
self.print_package_warning[level] = True self.print_package_warning[self.level] = True
except IndexError: except IndexError:
self.menu_of_packages.append(text[:-1]) self.menu_of_packages.append(text[:-1])
self.package.append("") self.package.append("")
@ -115,16 +116,16 @@ class CommentsMenusPackagesOrder(_CheckFunction):
self.state = self.state[:-5] self.state = self.state[:-5]
elif source_line: elif source_line:
level = self.get_level() self.level = self.get_level()
new_package = source_line.group(1) new_package = source_line.group(1)
# We order _ before A, so replace it with . # We order _ before A, so replace it with .
new_package_ord = new_package.replace('_', '.') new_package_ord = new_package.replace('_', '.')
if self.package[level] != "" and \ if self.package[self.level] != "" and \
self.print_package_warning[level] and \ self.print_package_warning[self.level] and \
new_package_ord < self.package[level]: new_package_ord < self.package[self.level]:
self.print_package_warning[level] = False self.print_package_warning[self.level] = False
prefix = "{}:{}: ".format(self.filename, lineno) prefix = "{}:{}: ".format(self.filename, lineno)
spaces = " " * len(prefix) spaces = " " * len(prefix)
return ["{prefix}Packages in: {menu},\n" return ["{prefix}Packages in: {menu},\n"
@ -132,11 +133,11 @@ class CommentsMenusPackagesOrder(_CheckFunction):
"{spaces}correct order: '-', '_', digits, capitals, lowercase;\n" "{spaces}correct order: '-', '_', digits, capitals, lowercase;\n"
"{spaces}first incorrect package: {package}" "{spaces}first incorrect package: {package}"
.format(prefix=prefix, spaces=spaces, .format(prefix=prefix, spaces=spaces,
menu=self.menu_of_packages[level], menu=self.menu_of_packages[self.level],
package=new_package), package=new_package),
text] text]
self.package[level] = new_package_ord self.package[self.level] = new_package_ord
class HelpText(_CheckFunction): class HelpText(_CheckFunction):