vappman 0.9.1__py3-none-any.whl → 0.9.3__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 (9) hide show
  1. vappman/main.py +15 -2
  2. {vappman-0.9.1.dist-info → vappman-0.9.3.dist-info}/METADATA +9 -9
  3. vappman-0.9.3.dist-info/RECORD +8 -0
  4. {vappman-0.9.1.dist-info → vappman-0.9.3.dist-info}/WHEEL +1 -2
  5. vappman-0.9.3.dist-info/entry_points.txt +3 -0
  6. vappman-0.9.1.dist-info/RECORD +0 -9
  7. vappman-0.9.1.dist-info/entry_points.txt +0 -2
  8. vappman-0.9.1.dist-info/top_level.txt +0 -1
  9. {vappman-0.9.1.dist-info → vappman-0.9.3.dist-info/licenses}/LICENSE +0 -0
vappman/main.py CHANGED
@@ -80,7 +80,8 @@ class Vappman:
80
80
  command = cmd.split()
81
81
  # Run the command and capture the output
82
82
  try:
83
- result = subprocess.run(command, stdout=subprocess.PIPE, text=True, check=False)
83
+ result = subprocess.run(command, stdout=subprocess.PIPE,
84
+ text=True, encoding='utf-8', errors='ignore', check=False)
84
85
  except Exception as exc:
85
86
  Window.stop_curses()
86
87
  print(f'FAILED: {command}: {exc}')
@@ -91,12 +92,24 @@ class Vappman:
91
92
  lines = result.stdout.splitlines()
92
93
  ansi_escape_pattern = re.compile(r'\x1B\[[0-?]*[ -/]*[@-~]')
93
94
  rv = {}
95
+ prev_wd1 = None
94
96
  for line in lines:
95
- line = ansi_escape_pattern.sub('', line).strip() # get clean text
97
+ line = ansi_escape_pattern.sub('', line) # get clean text
96
98
  if re.match(start, line):
99
+ line = line.strip()
97
100
  wd1 = self.get_word1(line)
98
101
  if wd1:
99
102
  rv[wd1] = line
103
+ prev_wd1 = wd1
104
+ elif prev_wd1 and line.startswith(' '):
105
+ line = line.strip()
106
+ if line:
107
+ rv[prev_wd1] += ' ' + line
108
+ else:
109
+ prev_wd1 = None
110
+ else:
111
+ prev_wd1 = None
112
+
100
113
  return rv
101
114
 
102
115
  @staticmethod
{vappman-0.9.1.dist-info → vappman-0.9.3.dist-info}/METADATA RENAMED
@@ -1,20 +1,19 @@
1
- Metadata-Version: 2.1
1
+ Metadata-Version: 2.4
2
2
  Name: vappman
3
- Version: 0.9.1
3
+ Version: 0.9.3
4
4
  Summary: A visual wrapper for appman
5
- Author-email: Joe Defen <joedef@google.com>
6
- License: MIT
7
- Project-URL: Homepage, https://github.com/joedefen/vappman
8
- Project-URL: Bug Tracker, https://github.com/joedefen/vappman/issues
9
5
  Keywords: app,installer,manager,appimages
6
+ Author-email: Joe Defen <joedef@google.com>
7
+ Requires-Python: >=3.8
8
+ Description-Content-Type: text/markdown
10
9
  Classifier: Programming Language :: Python :: 3
11
10
  Classifier: License :: OSI Approved :: MIT License
12
11
  Classifier: Operating System :: POSIX :: Linux
13
- Requires-Python: >=3.8
14
- Description-Content-Type: text/markdown
15
12
  License-File: LICENSE
13
+ Requires-Dist: importlib-metadata; python_version<"3.8"
16
14
  Requires-Dist: psutil>=5.9
17
- Requires-Dist: importlib-metadata; python_version < "3.8"
15
+ Project-URL: Bug Tracker, https://github.com/joedefen/vappman/issues
16
+ Project-URL: Homepage, https://github.com/joedefen/vappman
18
17
 
19
18
  # vappman
20
19
  `vappman` presents a visual (curses) interface to `appman`.
@@ -88,3 +87,4 @@ NOTES: in this example:
88
87
 
89
88
  ## Screen Recording (Intro to vappman based on v0.9)
90
89
  [![Screen Recording](https://i9.ytimg.com/vi_webp/NUHYN9_DZtA/mq3.webp?sqp=CMTu4LMG-oaymwEmCMACELQB8quKqQMa8AEB-AHqBYAC4AOKAgwIABABGEogZShRMA8=&rs=AOn4CLBaBrOpAhJkRIQQNNdCzYaqpOYl-Q)](https://www.youtube.com/watch?v=fC2EYMMcMQk)
90
+
vappman-0.9.3.dist-info/RECORD ADDED
@@ -0,0 +1,8 @@
1
+ vappman/PowerWindow.py,sha256=pQGXsAMeuiHn-vtEiVG0rgW1eCslh3ukC-VrPhH_j3k,28587
2
+ vappman/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
3
+ vappman/main.py,sha256=2UBp283X-JPcfzrkQdzljJMZz64Cw1atXssG7V21yQc,18093
4
+ vappman-0.9.3.dist-info/entry_points.txt,sha256=c9NHAQ8xJLkwtSWlw_nGNlAPCMODp_qGj4wlaHvbVUM,45
5
+ vappman-0.9.3.dist-info/licenses/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
6
+ vappman-0.9.3.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
7
+ vappman-0.9.3.dist-info/METADATA,sha256=F3GK6FklFN0fRjg4NjKHScBWz6PGX6etLgKKK_NXnVU,5013
8
+ vappman-0.9.3.dist-info/RECORD,,
{vappman-0.9.1.dist-info → vappman-0.9.3.dist-info}/WHEEL RENAMED
@@ -1,5 +1,4 @@
1
1
  Wheel-Version: 1.0
2
- Generator: setuptools (74.0.0)
2
+ Generator: flit 3.12.0
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
-
vappman-0.9.3.dist-info/entry_points.txt ADDED
@@ -0,0 +1,3 @@
1
+ [console_scripts]
2
+ vappman=vappman.main:main
3
+
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,,
vappman-0.9.1.dist-info/entry_points.txt DELETED
@@ -1,2 +0,0 @@
1
- [console_scripts]
2
- vappman = vappman.main:main
vappman-0.9.1.dist-info/top_level.txt DELETED
@@ -1 +0,0 @@
1
- vappman