new stuff (#1251)

* scripts: proper dollar sign escaping

* new icon: OneBit Adventure

* icon update: Beeline

* new icon: NF (Народный фронт)

* new icon: Termux Fingerprint

* new icon: Neftmagistral

* new icon: BAZAR

* requests_parser: show 100% match entry if package id from request's compinfo matches appfilter.xml entry)

* add compinfos by new matching feature

Author: flameshikari

.github/scripts/add_icons.py

@@ -248,7 +248,8 @@ def verb(text=False, code=0):
             appfilter_entries = []
             for compinfo in compinfos:
                 appfilter_entry = f'<item component="ComponentInfo{{{compinfo}}}" drawable="{name}" />'
-                if not re.search(appfilter_entry, content):
+                compinfo_pattern = appfilter_entry.replace('$', '\\$')
+                if not re.search(compinfo_pattern, content):
                     appfilter_entries.append(appfilter_entry)
                     replace += f'\t{appfilter_entry}\n'
             if appfilter_entries:

.github/scripts/add_icons_wrapper.py

@@ -62,7 +62,7 @@
 icons = [(key, value) for key, value in icons_yml.items()]
 
 
-command_base = f'python {add_icons} -P {delta_dir} -aidI'
+command_base = f"python '{add_icons}' -P '{delta_dir}' -aidI"
 
 if options.dry_run: command_base += ' -D'
 
@@ -90,19 +90,19 @@
         exit(2)
 
 
-    command = f'{command_base} -n {name}'
+    command = f"{command_base} -n '{name}'"
 
     if compinfos:
-        command += ' -c ' + ' '.join(compinfos)
         for compinfo in compinfos:
+            command += f" -c '{compinfo}'"
             if compinfo in requests:
                 requests.pop(compinfo)
     else:
         if re.match('^.*_alt_[0-9]+$', name):
             category = 'Alts'
 
-    if category: command += f' -C {quote(category)}'
-
+    if category: command += f" -C '{quote(category)}'"
+    print(command)
 
     print(f'[icon] {name}')
     status = execute(f'{command}')

.github/scripts/requests_parser.py

@@ -4,6 +4,7 @@
 import xml.etree.ElementTree as ET
 from datetime import datetime
 from difflib import SequenceMatcher
+from copy import deepcopy as copy
 
 import yaml
 from natsort import natsorted as sorted
@@ -35,6 +36,10 @@ def increase_indent(self, flow=False, indentless=False):
                     help=f'remove existing compinfos from {filename}',
                     default=False,
                     action=argparse.BooleanOptionalAction)
+parser.add_argument('-R', '--ratio',
+                    dest='ratio',
+                    help=f'custom ratio from 0.5 to 1.0',
+                    default=0.75)
 parser.add_argument('-s', '--sort',
                     dest='sort',
                     help='sort by specific value',
@@ -70,27 +75,37 @@ def write(path, data):
 
 def main():
     requests = read(paths['requests'])
+    requests_copy = copy(requests)
+    
     updatable = {}
 
+    RATIO = float(args.ratio) if 0.5 <= float(args.ratio) <= 1.0 else 0.75
+
     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]
+            id, activity = compinfo.split('/')
             name = item.attrib['drawable']
 
-            for request in requests:
+            for request in requests_copy:
                 if id not in request: continue
-                diff = SequenceMatcher(None, request, compinfo).ratio()
-                ratio = round(diff, 2)
 
-                if ratio == 1.0:
-                    requests.pop(compinfo)
-                    continue
+                ratio = 0.0
+
+                if request.startswith(id + '/'):
+                    ratio = 1.0
+                else: 
+                    diff = SequenceMatcher(None, request, compinfo).ratio()
+                    ratio = round(diff, 2)
+
+                if ratio >= RATIO:
+
+                    if ratio == 1.0:
+                        requests.pop(request)
 
-                if ratio >= 0.75:
                     if request in updatable:
                         if updatable[request]['ratio'] < ratio:
                             ratio = updatable[request]['ratio']
@@ -100,6 +115,7 @@ def main():
                         'ratio': ratio,
                         'request': request
                     }
+
         except:
             continue
 

app/src/main/assets/drawable.xml

@@ -199,6 +199,7 @@
 	<item drawable="bbc_sounds_alt_1" />
 	<item drawable="bbc_sport_alt_1" />
 	<item drawable="bbc_weather_alt_1" />
+	<item drawable="beeline_alt_1" />
 	<item drawable="bergfex_alt_1" />
 	<item drawable="bilibili_alt_1" />
 	<item drawable="binance_alt_1" />
@@ -3446,7 +3447,6 @@
 	<item drawable="beautyxt" />
 	<item drawable="becu" />
 	<item drawable="beebom" />
-	<item drawable="beeline" />
 	<item drawable="beem_it" />
 	<item drawable="beep" />
 	<item drawable="beeper" />

…/src/main/res/drawable-nodpi/beeline.png …ain/res/drawable-nodpi/beeline_alt_1.pngapp/src/main/res/drawable-nodpi/beeline.png renamed to app/src/main/res/drawable-nodpi/beeline_alt_1.png app/src/main/res/drawable-nodpi/beeline.png renamed to app/src/main/res/drawable-nodpi/beeline_alt_1.png

@@ -199,6 +199,7 @@
 	<item drawable="bbc_sounds_alt_1" />
 	<item drawable="bbc_sport_alt_1" />
 	<item drawable="bbc_weather_alt_1" />
+	<item drawable="beeline_alt_1" />
 	<item drawable="bergfex_alt_1" />
 	<item drawable="bilibili_alt_1" />
 	<item drawable="binance_alt_1" />
@@ -3446,7 +3447,6 @@
 	<item drawable="beautyxt" />
 	<item drawable="becu" />
 	<item drawable="beebom" />
-	<item drawable="beeline" />
 	<item drawable="beem_it" />
 	<item drawable="beep" />
 	<item drawable="beeper" />