new stuff (#923)

* new icons by johnmaneca; add missing and fix others

* .gitignore: add *.aab

* build.gradle: change output filename

* build.gradle: bump CandyBar versions to 3.20.2

* update contributed icons

* a lot scripts changes

Author: flameshikari

.github/scripts/add_icons_wrapper.py

@@ -2,7 +2,7 @@
 
 from os import system as execute
 from os import name as platform
-from os.path import abspath, basename, dirname, realpath
+from os.path import basename
 
 from natsort import natsorted as sorted
 from yaml import safe_load as yaml

.github/scripts/bump_version.py

@@ -1,18 +1,26 @@
-#!/usr/bin/env python3
+#! /usr/bin/env python
 
 import argparse, re
 
+from os.path import join
+
 from resolve_paths import paths
 
 
 argparser = argparse.ArgumentParser(description='Bump release version')
-argparser.add_argument('-t', dest='type',
-                             help='type of release [beta|prod]',
-                             default='beta')
+argparser.add_argument('-t', '--type',
+                       dest='type',
+                       help='type of release [beta|prod]',
+                       default='beta')
+argparser.add_argument('-p', '--print',
+                       dest='print',
+                       help='print variables for shell exporting',
+                       default=False,
+                       action=argparse.BooleanOptionalAction)
 args = argparser.parse_args()
 
 
-target = paths['root'] + '/app/build.gradle'
+target = join(paths['root'], 'app/build.gradle')
 
 regexp_version_code = re.compile('versionCode (\d+)')
 regexp_version_name = re.compile('versionName "((\d+\.\d+\.\d+)(-beta(\d+))?)"')
@@ -62,6 +70,7 @@
     file.write(content)
     file.truncate()
 
+if args.print:
     print(f'is_beta={is_beta}')
     print(f'filename=delta-v{version_name}')
     print(f'version=v{version_name}')

.github/scripts/email_dumper.py

@@ -4,37 +4,37 @@
 
 from datetime import datetime
 from os import mkdir
-from os.path import dirname, exists, realpath
+from os.path import exists
 
 from redbox import EmailBox as redbox
 
 
 parser = argparse.ArgumentParser(description='Dump a IMAP folder into .eml files')
-parser.add_argument('-s',
+parser.add_argument('-s', '--host',
                     dest='host',
                     help='IMAP host',
                     default='imap.gmail.com')
-parser.add_argument('-P',
+parser.add_argument('-P', '--port',
                     dest='port',
                     help='IMAP port',
                     default=993)
-parser.add_argument('-u',
+parser.add_argument('-u', '--username',
                     dest='username',
                     help='IMAP username',
                     required=True)
-parser.add_argument('-p',
+parser.add_argument('-p', '--password',
                     dest='password',
                     help='IMAP password',
                     required=True)
-parser.add_argument('-r',
+parser.add_argument('-r', '--remote',
                     dest='remote',
                     help='Remote folder to download',
                     default='INBOX')
-parser.add_argument('-l',
+parser.add_argument('-l', '--local',
                     dest='local',
                     help='Local folder where to save .eml files',
                     default=f'emails')
-parser.add_argument('-U',
+parser.add_argument('-U', '--unread',
                     dest='unread',
                     help='Keep emails unread in the inbox',
                     default=False,

.github/scripts/email_parser.py

@@ -1,13 +1,12 @@
 #!/usr/bin/env python3
 
-import argparse
 import base64
 import copy
 import io
 import re
 import os
 
-from datetime import datetime, timedelta
+from datetime import datetime
 from hashlib import sha1
 from zipfile import ZipFile
 

.github/scripts/find_updatable.py

@@ -1,13 +1,17 @@
 #!/usr/bin/env python3
 
+import argparse, re, sys
+import xml.etree.ElementTree as ET
 from datetime import datetime
+from difflib import SequenceMatcher
 
 import yaml
-
 from natsort import natsorted as sorted
 
+from resolve_paths import paths
+
 
-class CustomDumper(yaml.SafeDumper):
+class YamlNewLines(yaml.SafeDumper):
     # https://github.com/yaml/pyyaml/issues/127#issuecomment-525800484
     def write_line_break(self, data=None):
         super().write_line_break(data)
@@ -17,6 +21,31 @@ def write_line_break(self, data=None):
     def increase_indent(self, flow=False, indentless=False):
         return super().increase_indent(flow, False)
 
+filename = 'requests.yml'
+
+
+parser = argparse.ArgumentParser(description=f'parse {filename}')
+
+parser.add_argument('-f', '--format',
+                    dest='format',
+                    choices=['xml', 'yml'],
+                    help='output in specific format')
+parser.add_argument('-r', '--remove',
+                    dest='remove',
+                    help=f'remove existing compinfos from {filename}',
+                    default=False,
+                    action=argparse.BooleanOptionalAction)
+parser.add_argument('-s', '--sort',
+                    dest='sort',
+                    help='sort by specific value',
+                    choices=['name', 'ratio', 'request'],
+                    default='ratio')
+parser.add_argument('-H', '--hide-ratios',
+                    dest='hide_ratios',
+                    help='hide ratios in output',
+                    default=False,
+                    action=argparse.BooleanOptionalAction)
+
 
 def read(path):
     with open(path, 'r+') as file:
@@ -34,7 +63,71 @@ def write(path, data):
         # header message with total number of requested icons and last time update
         header = (f"# {len(data)} requested apps pending \n"
                   f"# updated {datetime.today().strftime('%Y-%m-%d %H:%M:%S')}\n\n")
-        dump = yaml.dump(data, Dumper=CustomDumper, allow_unicode=True, indent=4, sort_keys=False)
+        dump = yaml.dump(data, Dumper=YamlNewLines, allow_unicode=True, indent=4, sort_keys=False)
         file.seek(0)
         file.write(header + dump)
         file.truncate()
+
+def main():
+    requests = read(paths['requests'])
+    updatable = {}
+
+    with open(paths['appfilter'][0], 'r') as file:
+        appfilter = ET.ElementTree(ET.fromstring(file.read())).getroot()
+
+    for item in appfilter:
+        try:
+            compinfo = re.search('ComponentInfo{(.*)}', item.attrib['component']).group(1)
+            id = compinfo.split('/')[0]
+            name = item.attrib['drawable']
+
+            for request in requests:
+                if id not in request: continue
+                diff = SequenceMatcher(None, request, compinfo).ratio()
+                ratio = round(diff, 2)
+
+                if ratio == 1.0:
+                    requests.pop(compinfo)
+                    continue
+                
+                if ratio >= 0.75:
+                    if request in updatable:
+                        if updatable[request]['ratio'] < ratio:
+                            ratio = updatable[request]['ratio']
+
+                    updatable[request] = {
+                        'name': name,
+                        'ratio': ratio,
+                        'request': request
+                    }
+        except:
+            continue
+
+    updatable = dict(sorted(updatable.items(), key=lambda x: x[1][args.sort]))
+
+    if args.remove:
+        write(paths['requests'], requests)
+
+    for [key, value] in updatable.items():
+        name = value['name']
+        ratio = int(value['ratio'] * 100)
+        
+        match args.format:
+            case 'xml':
+                ratios = f'<!-- {ratio}% --> ' if not args.hide_ratios else ''
+                print(ratios + f'<item component="ComponentInfo{{{key}}}" drawable="{name}" />')
+            case 'yml':
+                ratios = f' # {ratio}%' if not args.hide_ratios else ''
+                print(f'{name}:'+ ratios)
+                print(f'  - {key}\n')
+            case _:
+                ratios = f'[{ratio}%] ' if not args.hide_ratios else ''
+                print(ratios + f'{name} -> {key}')
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        args = parser.parse_args()
+    else:
+        parser.print_help()
+        sys.exit(1)
+    main()