rework pipeline (#913)

* move LICENSE.md -> LICENSE

* add contribs dir

* remove utilities dir, requests & new icons

* update gitignore

* move header.svg to images

* update variables.sh

* add new requests updater

* convert requests.txt to requests.yml

* remove redundant stuff in requests_parser.py

* update scripts, workflow; remove old requests

* Auto-update requests.yml

* rewrite paths in scripts

* add shebangs

* restore sort_drawable.py

* lf endings

* lf endings

* remove push trigger

* scripts refactoring, etc.

* add appfilter sorting

* move icons to new dir

---------

Co-authored-by: flameshikari <[email protected]>

Author: flameshikari

.github/CONTRIBUTING.md

@@ -50,9 +50,9 @@ Don't forget to give yourself an entry at the bottom of [app/src/main/res/xml/co
 
 > **This method is only for adding new icons or linking ComponentInfo(s) with existing icons!** 
 
-1. Add `new_icon.svg` and `new_icon.png` to [resources/utilities/icons](../../../tree/master/resources/utilities/icons) directory
+1. Add `new_icon.svg` and `new_icon.png` to [contribs/icons](../../../tree/master/contribs/icons) directory
 
-2. Append the icon name with ComponentInfo(s) to [resources/new_icons.yaml](https://github.com/Delta-Icons/android/blob/master/resources/new_icons.yaml) with any of the next formats:
+2. Append the icon name with ComponentInfo(s) to [contribs/icons.yml](https://github.com/Delta-Icons/android/blob/master/contribs/icons.yml) with any of the next formats:
 
     2.1. The new icon with the ComponentInfo.
 
@@ -158,7 +158,7 @@ If the existing icon rebranded, don't overwrite it with a new one, do the follow
 
 ## Requests
 
-If you wanna help close icon requests from users, you can take a look at [resources/requests.txt](../../../tree/master/resources/requests.txt) where all requests are stored. The file updates periodically.
+If you wanna help close icon requests from users, you can take a look at [contribs/requests.yml](../../../tree/master/contribs/requests.yml) where all requests are stored. The file updates periodically.
 
 ## Gathering ComponentInfo
 

.github/README.md

@@ -1,53 +1,51 @@
-<p align="center">
-  <img width="200" src="./header.svg"/>
-</p>
-
-<h2 align="center" padding="100">Delta Icons for Android</h2>
-
-<p align="center">
-  <a href="../../../releases/latest">
-    <img src="https://img.shields.io/github/v/release/Delta-Icons/android?labelColor=56595b&color=a6c6ff&logo=github&logoColor=ffffff&label=release&style=for-the-badge"/>
-  </a>
-
-  <a href="../../../releases">
-    <img src="https://img.shields.io/github/v/release/Delta-Icons/android?labelColor=56595b&color=f8c28d&logo=github&logoColor=ffffff&include_prereleases&label=beta&style=for-the-badge"/>
-  </a>
-
-  <a href="https://play.google.com/store/apps/details?id=website.leifs.delta">
-    <img src="https://img.shields.io/static/v1?labelColor=56595b&color=97db99&logo=google-play&logoColor=ffffff&label=google play&style=for-the-badge&message=get"/>
-  </a>
-
-  <a href="https://f-droid.org/packages/website.leifs.delta.foss">
-    <img src="https://img.shields.io/static/v1?labelColor=56595b&color=f9de81&logo=f-droid&logoColor=ffffff&label=f-droid&style=for-the-badge&message=get"/>
-  </a>
-</p>
-
-## Contributing
-
-Please refer to **[contribution guidelines](./CONTRIBUTING.md)**.
-
-
-## Discord
-
-✋ The server is **not** intended for requests!
-
-👋 If you need help contributing or just want to chat with other contributors feel free to **[join us](https://discord.gg/F9RFqHN)**!
-
-<p align="center">
-  <a href="https://discord.gg/F9RFqHN">
-    <img src="https://img.shields.io/discord/743783969216135198?labelColor=56595b&color=ababff&logo=discord&logoColor=ffffff&label=discord&style=for-the-badge"/>
-  </a>
-</p>
-
-
-## Telegram
-
-📰 Follow the Telegram channel to get the latest news and don't miss the events!
-
-<p align="center">
-  <a href="https://t.me/deltaicons">
-    <img src="https://img.shields.io/badge/updates-delta?style=for-the-badge&logo=telegram&logoColor=ffffff&label=Telegram&labelColor=56595b&color=9abeff"/>
-  </a>
-</p>
-
-
+<p align="center">
+  <img width="200" src="./images/header.svg"/>
+</p>
+
+<h2 align="center" padding="100">Delta Icons for Android</h2>
+
+<p align="center">
+  <a href="../../../releases/latest">
+    <img src="https://img.shields.io/github/v/release/Delta-Icons/android?labelColor=56595b&color=a6c6ff&logo=github&logoColor=ffffff&label=release&style=for-the-badge"/>
+  </a>
+
+  <a href="../../../releases">
+    <img src="https://img.shields.io/github/v/release/Delta-Icons/android?labelColor=56595b&color=f8c28d&logo=github&logoColor=ffffff&include_prereleases&label=beta&style=for-the-badge"/>
+  </a>
+
+  <a href="https://play.google.com/store/apps/details?id=website.leifs.delta">
+    <img src="https://img.shields.io/static/v1?labelColor=56595b&color=97db99&logo=google-play&logoColor=ffffff&label=google play&style=for-the-badge&message=get"/>
+  </a>
+
+  <a href="https://f-droid.org/packages/website.leifs.delta.foss">
+    <img src="https://img.shields.io/static/v1?labelColor=56595b&color=f9de81&logo=f-droid&logoColor=ffffff&label=f-droid&style=for-the-badge&message=get"/>
+  </a>
+</p>
+
+## Contributing
+
+Please refer to **[contribution guidelines](./CONTRIBUTING.md)**.
+
+
+## Discord
+
+✋ The server is **not** intended for requests!
+
+👋 If you need help contributing or just want to chat with other contributors feel free to **[join us](https://discord.gg/F9RFqHN)**!
+
+<p align="center">
+  <a href="https://discord.gg/F9RFqHN">
+    <img src="https://img.shields.io/discord/743783969216135198?labelColor=56595b&color=ababff&logo=discord&logoColor=ffffff&label=discord&style=for-the-badge"/>
+  </a>
+</p>
+
+
+## Telegram
+
+📰 Follow the Telegram channel to get the latest news and don't miss the events!
+
+<p align="center">
+  <a href="https://t.me/deltaicons">
+    <img src="https://img.shields.io/badge/updates-delta?style=for-the-badge&logo=telegram&logoColor=ffffff&label=Telegram&labelColor=56595b&color=9abeff"/>
+  </a>
+</p>

.github/header.svg .github/images/header.svg

@@ -13,6 +13,8 @@
 from subprocess import check_output as get_output
 from sys import argv as args
 
+import requests_parser
+from resolve_paths import paths
 
 parser = argparse.ArgumentParser()
 parser.add_argument('-n', '--name', metavar='NAME', help='the name of a drawable entry')
@@ -53,27 +55,25 @@
 name = options.name
 path = options.path
 
-
 if path: delta_dir = abspath(path)
 else: delta_dir = dirname(realpath(__file__ + '/../..')) # if the script placed in utility_scripts
 
-work_dir = dirname(realpath(__file__))
-icons_dir = abspath(f'{work_dir}/icons')
-
-
-appfilter_files = [ abspath(f'{delta_dir}/app/src/main/res/xml/appfilter.xml'),
-                    abspath(f'{delta_dir}/app/src/main/assets/appfilter.xml')]
-drawable_files  = [ abspath(f'{delta_dir}/app/src/main/res/xml/drawable.xml'),
-                    abspath(f'{delta_dir}/app/src/main/assets/drawable.xml')]
-icons_src_files = [ abspath(f'{icons_dir}/{name}.png'),
-                    abspath(f'{icons_dir}/{name}.svg')]
-icons_dst_files = [ abspath(f'{delta_dir}/app/src/main/res/drawable-nodpi/{name}.png'),
-                    abspath(f'{delta_dir}/resources/vectors/{name}.svg')]
-requests_file   =   abspath(f'{delta_dir}/resources/requests.txt')
+work_dir = paths['scripts']
+icons_dir = paths['src']['dir']
+appfilter_files = paths['appfilter']
+drawable_files = paths['drawable']
+requests_file = paths['requests']
+icons_src_files = [
+    paths['src']['png'].format(name),
+    paths['src']['svg'].format(name)
+]
+icons_dst_files = [
+    paths['dst']['png'].format(name),
+    paths['dst']['svg'].format(name)
+]
 
 git_arguments = appfilter_files + drawable_files + [requests_file]
 
-
 blank = ''
 changes = False
 dry_run_prefix = 'will be ' if dry_run else blank
@@ -263,34 +263,31 @@ def verb(text=False, code=0):
 
 
 if include_requests:
-    filename = 'requests.txt'
+    filename = 'requests.yml'
     if not compinfos: out.warn(f'{filename}: no compinfos passed')
     else:
-        with open(requests_file, 'r+', encoding='utf-8', newline=blank) as file:
-            content = file.read()
-            lines = []
-            lines_count = 0
-            for compinfo in compinfos:
-                try:
-                    pattern = fr'\n.*\n.*{re.escape(compinfo)}.*\n.*\nRequested.*\n.*\n\t'
-                    match = re.search(pattern, content)
-                    lines.append(re.findall(pattern, content)[0].splitlines()[1:6])
-                    if match:
-                        content = re.sub(pattern, blank, content)
-                        lines_count += 1
-                except: continue
-            if lines_count > 0:
-                write(file, content)
-                entry = 'entry' if lines_count == 1 else 'entries'
-                out.done(f'{filename}: {dry_run_prefix + "removed"} {lines_count} {entry}')
-                if verbose:
+        requests = requests_parser.read(requests_file)
+        lines = []
+        for compinfo in compinfos:
+            if compinfo in requests:
+                lines.append(compinfo)
+                requests.pop(compinfo)
+
+        lines_count = len(lines)
+
+        if not dry_run: requests_parser.write(requests_file, requests)
+
+        if lines_count > 0:
+            entry = 'entry' if lines_count == 1 else 'entries'
+            out.done(f'{filename}: {dry_run_prefix + "removed"} {lines_count} {entry}')
+            if verbose:
+                out.verb()
+                for group in lines:
+                    for entry in group: out.verb(out.rem.format(entry))
                     out.verb()
-                    for group in lines:
-                        for entry in group: out.verb(out.rem.format(entry))
-                        out.verb()
-                changes = True
-            else:
-                out.warn(f'{filename}: no entries found to delete')
+            changes = True
+        else:
+            out.warn(f'{filename}: no entries found to delete')
 
 
 try:

resources/utilities/add_icons.py .github/scripts/add_icons.py

@@ -4,15 +4,16 @@
 from os import name as platform
 from os.path import abspath, basename, dirname, realpath
 
+from natsort import natsorted as sorted
 from yaml import safe_load as yaml
 
-from natsort import natsorted as sorted
+from resolve_paths import paths
 
 
-work_dir = dirname(realpath(__file__))
-delta_dir = abspath(f'{work_dir}/../..')
-target_file = abspath(f'{work_dir}/../new_icons.yaml')
-target_script = abspath(f'{work_dir}/add_icons.py')
+work_dir = paths['scripts']
+delta_dir = paths['root']
+target_file = paths['icons']
+target_script = work_dir + '/add_icons.py'
 
 null = '>NUL 2>NUL' if platform == 'nt' else '>/dev/null 2>&1'
 
@@ -49,6 +50,7 @@
                 if status != 0:
                     print(f'> {drawable}:')
                     execute(f'{command} -D')
+                    print(command)
                     print()
                     errors.append(drawable)
 

resources/utilities/add_icons_wrapper.py .github/scripts/add_icons_wrapper.py

@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+
+import argparse, re
+
+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')
+args = argparser.parse_args()
+
+
+target = paths['root'] + '/app/build.gradle'
+
+regexp_version_code = re.compile('versionCode (\d+)')
+regexp_version_name = re.compile('versionName "((\d+\.\d+\.\d+)(-beta(\d+))?)"')
+is_beta = 'true' if args.type == 'beta' else 'false'
+
+with open(target, 'r+') as file:
+
+    content = file.read()
+    latest_version = re.search(regexp_version_name, content)
+
+    full_version = latest_version.group(1)
+    base_version = latest_version.group(2)
+    beta_version = str(int(latest_version.group(4) if latest_version.group(4) else '-1') + 1)
+    build_number = str(int(re.search(regexp_version_code, content).group(1)[-3:]) + 1)
+
+    if args.type == 'prod':
+        if not 'beta' in full_version:
+            base_version = list(map(int, base_version.split('.')))
+            base_version[2] += 1
+            for n in range(2):
+                if base_version[2-n] > 9:
+                    base_version[2-n] = 0
+                    base_version[1-n] += 1
+            new_version = '.'.join(str(x) for x in base_version)
+            build_number = '0'
+        else:
+            new_version = base_version
+        version_code = new_version.replace('.', '') + build_number.rjust(3, '0')
+        version_name = new_version
+    else:
+        base_version = list(map(int, base_version.split('.')))
+        if not 'beta' in full_version:
+            build_number = '0'
+            base_version[2] += 1
+        for n in range(2):
+            if base_version[2-n] > 9:
+                base_version[2-n] = 0
+                base_version[1-n] += 1
+        new_version = '.'.join(str(x) for x in base_version)
+        version_code = new_version.replace('.', '') + build_number.rjust(3, '0')
+        version_name = new_version + '-beta' + beta_version
+
+    content = re.sub(regexp_version_code, f'versionCode {version_code}', content)
+    content = re.sub(regexp_version_name, f'versionName "{version_name}"', content)
+
+    file.seek(0)
+    file.write(content)
+    file.truncate()
+
+    print(f'is_beta={is_beta}')
+    print(f'filename=delta-v{version_name}')
+    print(f'version=v{version_name}')
+    print(f'version_code={version_code}')
+    print(f'version_name={version_name}')