From 39a8d5210b06009abe8b9a4ebc3977c927e32568 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Sat, 15 Dec 2018 12:07:01 +0100
Subject: [PATCH] Remove some metro crapware using remove_metroapp from
 setuphelpers

---
 WAPT/control |  2 +-
 setup.py     | 29 +++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/WAPT/control b/WAPT/control
index 39a2099..53fc83a 100644
--- a/WAPT/control
+++ b/WAPT/control
@@ -1,5 +1,5 @@
 package           : fws-remove-crapwares
-version           : 2
+version           : 4
 architecture      : all
 section           : base
 priority          : normal
diff --git a/setup.py b/setup.py
index c914f09..7b49048 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,29 @@ uninstallkey = []
 
 crapwares = [
     're:ask toolbar',
-    ('key:{7DB9F1E5-9ACB-410D-A7DC-7A3D023CE045}','welcome.exe','Dell Getting Started Guide')
+    ('key:{7DB9F1E5-9ACB-410D-A7DC-7A3D023CE045}','welcome.exe','Dell Getting Started Guide'),
+    'metro:Microsoft.XboxGameCallableUI',
+    'metro:Microsoft.MSPaint',
+    'metro:Microsoft.SkypeApp',
+    'metro:Microsoft.XboxGameOverlay',
+    'metro:Microsoft.Whiteboard',
+    'metro:Microsoft.Microsoft3DViewer',
+    'metro:Microsoft.XboxIdentityProvider',
+    'metro:Microsoft.Xbox.TCUI',
+    'metro:Microsoft.MicrosoftStickyNotes',
+    'metro:Microsoft.ZuneMusic',
+    'metro:Microsoft.ZuneVideo',
+    'metro:Microsoft.WindowsMaps',
+    'metro:Microsoft.WindowsMaps',
+    'metro:Microsoft.BingWeather',
+    'metro:Microsoft.MicrosoftSolitaireCollection',
+    'metro:Microsoft.OneConnect',
+    'metro:Microsoft.WindowsFeedbackHub',
+    'metro:Microsoft.XboxApp',
+    'metro:Microsoft.XboxSpeechToTextOverlay',
+    'metro:Microsoft.Windows.ParentalControls',
+    'metro:Microsoft.Advertising.Xaml',
+    'metro:Microsoft.Windows.Cortana'
 ]
 
 def find_soft_re(softs,pattern):
@@ -50,7 +72,10 @@ def install():
 
         run = None
 
-        if isinstance(crapware,re._pattern_type):
+        if isinstance(crapware,(unicode,str)) and crapware.startswith('metro:') and windows_version() > Version('10'):
+            print('Processing removal of %s '% title)
+            remove_metroapp(crapware[6:])
+        elif isinstance(crapware,re._pattern_type):
             uninstall_entries = find_soft_re(all_softs,crapware)
         elif isinstance(crapware,(unicode,str)) and crapware.startswith('re:'):
             uninstall_entries = find_soft_re(all_softs,re.compile(crapware[3:],re.IGNORECASE))