vappman 0.9.1__py3-none-any.whl → 0.9.2__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. vappman/main.py +13 -1
  2. {vappman-0.9.1.dist-info → vappman-0.9.2.dist-info}/METADATA +1 -1
  3. vappman-0.9.2.dist-info/RECORD +9 -0
  4. vappman-0.9.1.dist-info/RECORD +0 -9
  5. {vappman-0.9.1.dist-info → vappman-0.9.2.dist-info}/LICENSE +0 -0
  6. {vappman-0.9.1.dist-info → vappman-0.9.2.dist-info}/WHEEL +0 -0
  7. {vappman-0.9.1.dist-info → vappman-0.9.2.dist-info}/entry_points.txt +0 -0
  8. {vappman-0.9.1.dist-info → vappman-0.9.2.dist-info}/top_level.txt +0 -0
vappman/main.py CHANGED
@@ -91,12 +91,24 @@ class Vappman:
91
91
  lines = result.stdout.splitlines()
92
92
  ansi_escape_pattern = re.compile(r'\x1B\[[0-?]*[ -/]*[@-~]')
93
93
  rv = {}
94
+ prev_wd1 = None
94
95
  for line in lines:
95
- line = ansi_escape_pattern.sub('', line).strip() # get clean text
96
+ line = ansi_escape_pattern.sub('', line) # get clean text
96
97
  if re.match(start, line):
98
+ line = line.strip()
97
99
  wd1 = self.get_word1(line)
98
100
  if wd1:
99
101
  rv[wd1] = line
102
+ prev_wd1 = wd1
103
+ elif prev_wd1 and line.startswith(' '):
104
+ line = line.strip()
105
+ if line:
106
+ rv[prev_wd1] += ' ' + line
107
+ else:
108
+ prev_wd1 = None
109
+ else:
110
+ prev_wd1 = None
111
+
100
112
  return rv
101
113
 
102
114
  @staticmethod
{vappman-0.9.1.dist-info → vappman-0.9.2.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: vappman
3
- Version: 0.9.1
3
+ Version: 0.9.2
4
4
  Summary: A visual wrapper for appman
5
5
  Author-email: Joe Defen <joedef@google.com>
6
6
  License: MIT
vappman-0.9.2.dist-info/RECORD ADDED
@@ -0,0 +1,9 @@
1
+ vappman/PowerWindow.py,sha256=pQGXsAMeuiHn-vtEiVG0rgW1eCslh3ukC-VrPhH_j3k,28587
2
+ vappman/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
3
+ vappman/main.py,sha256=l2rbFzsKhuwfVk0MEaSBQrZJWzgmxDoqdxNzHw_39hA,18038
4
+ vappman-0.9.2.dist-info/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
5
+ vappman-0.9.2.dist-info/METADATA,sha256=LZ9-2wGF67BRzwY8IDGlWQ5MId4r_B82NGlfPk1m6no,5027
6
+ vappman-0.9.2.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
7
+ vappman-0.9.2.dist-info/entry_points.txt,sha256=7_1MiUvkCJoElLePOCJYqhkQN4xmadBRQCKupOwzt90,46
8
+ vappman-0.9.2.dist-info/top_level.txt,sha256=5_Gb5oZh7s2-i62gLXZ6INVALAV9D0-yqh0TvNqpPC4,8
9
+ vappman-0.9.2.dist-info/RECORD,,
vappman-0.9.1.dist-info/RECORD DELETED
@@ -1,9 +0,0 @@
1
- vappman/PowerWindow.py,sha256=pQGXsAMeuiHn-vtEiVG0rgW1eCslh3ukC-VrPhH_j3k,28587
2
- vappman/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
3
- vappman/main.py,sha256=f1Hnx5SF0pXvKtERtdXoKW_R4UDxLUuq25MZoHJnc8g,17682
4
- vappman-0.9.1.dist-info/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
5
- vappman-0.9.1.dist-info/METADATA,sha256=JhPKqVdh-XtOum4iwLL7R-lKyrFgAU7xsbcG6yimI7M,5027
6
- vappman-0.9.1.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
7
- vappman-0.9.1.dist-info/entry_points.txt,sha256=7_1MiUvkCJoElLePOCJYqhkQN4xmadBRQCKupOwzt90,46
8
- vappman-0.9.1.dist-info/top_level.txt,sha256=5_Gb5oZh7s2-i62gLXZ6INVALAV9D0-yqh0TvNqpPC4,8
9
- vappman-0.9.1.dist-info/RECORD,,