v1.2.0

- new system used to generates emoji icons using pillow
- fix some typo

Author: BenjaminOddou

README.md

@@ -3,24 +3,22 @@
 
 [![made with heart by Benjamin Oddou](https://img.shields.io/badge/made%20with%20%E2%99%A5%20by-benjamin%20oddou-ff2f35.svg?style=flat)](https://github.com/BenjaminOddou)
 [![saythanks](https://img.shields.io/badge/say-thanks-bf0001.svg?style=flat)](https://saythanks.io/to/BenjaminOddou)
-[![Python 3.7+](https://img.shields.io/badge/python-3.7+-7f0000.svg)](https://www.python.org/downloads/macos/)
+[![Python 3.8+](https://img.shields.io/badge/python-3.8+-7f0000.svg)](https://www.python.org/downloads/macos/)
 
 Welcome to the Alfred Emoji Wine repository: **An Alfred Workflow** ✨
 
 ## ✅ Prerequisites
 
 * MacOS.
 * Alfred 5. Note that the [Alfred Powerpack](https://www.alfredapp.com/powerpack/) is required to use workflows.
-* Requires **python 3.7** or above.
+* Requires **python 3.8** or above.
 
 ## 🏎️ Data sources
 
-This workflow combines multiple sources (see below) to build a local JSON API (`~/Library/Caches/com.runningwithcrayons.Alfred/Workflow Data/com.benjamino.emoji_wine`) along with an icons folder with base64 png images (≊1-4Ko per image).
+This workflow combines multiple sources (see below) to build a local JSON API (`~/Library/Caches/com.runningwithcrayons.Alfred/Workflow Data/com.benjamino.emoji_wine`) along with an icons folder with png images.
 
 List of sources :
 * [Full list of latest emojis](https://unicode.org/Public/emoji/latest/emoji-test.txt) - Used to grab the full list of emojis.
-* [Classic emojis images](https://unicode.org/emoji/charts/full-emoji-list.html) - Used to grab list of classic emojis images.
-* [Skin Tone emojis images](https://unicode.org/emoji/charts/full-emoji-modifiers.html) -  Used to grab list of skin toned emojis images.
 * [CLDR Data files annotations](https://github.com/unicode-org/cldr/tree/main/common/annotations) - Used to translate emojis titles and tags.
 * [CLDR Data files annotations derived](https://github.com/unicode-org/cldr/tree/main/common/annotationsDerived) - Used to translate emojis titles and tags.
 
@@ -31,7 +29,7 @@ List of sources :
 
 ## 🧰 Setup the workflow
 
-Install Python 3.7 or above. Check your version with :
+Install Python 3.8 or above. Check your version with :
 
 ```shell
 python --version

helper/fuse.py

@@ -0,0 +1,13 @@
+import os
+import sys
+sys.path.insert(0, './temp')
+from delocate.fuse import fuse_wheels
+
+directory_path = os.path.join(os.getcwd(), 'temp')
+files = os.listdir(directory_path)
+wheel_files = [f for f in files if f.endswith('.whl')]
+base_name = wheel_files[0].split("-macosx")[0]
+final_binary = os.path.join(directory_path, f'{base_name}-macosx_11_0_universal2.whl')
+full_paths = [os.path.join(directory_path, file) for file in wheel_files]
+fuse_wheels(*full_paths, final_binary)
+print(final_binary)

helper/update.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Install platform agnostic version of Pillow (put this script inside the workflow folder along with fuse.py)
+mkdir -p temp
+pip3 install delocate -t temp # install delocate library in temp folder to fuse binaries
+pip3 download --only-binary=:all: --platform macosx_10_10_x86_64 Pillow -d temp # binary whl for intel chips
+pip3 download --only-binary=:all: --platform macosx_11_0_arm64 Pillow -d temp # binary whl for arm64 chips
+final_binary=$(python3 fuse.py) # fuse binaries into universal binary
+mkdir -p lib
+pip3 install "$final_binary" -t lib # install pillow using universal binary
+rm -r temp

public/search.webp

@@ -1,44 +1,34 @@
 import os
 import re
 import sys
-sys.path.insert(0, './lib')
-import base64
 import json
-import time
 import datetime
-from bs4 import BeautifulSoup
-from io import BytesIO
 from urllib import request
+sys.path.insert(0, './lib')
 import xml.etree.ElementTree as ET
-from utils import api_file_path, cache_folder_path, data_folder_path, icons_folder_path, display_notification, language
+from PIL import Image, ImageDraw, ImageFont
+from utils import api_file_path, data_folder_path, icons_folder_path, display_notification, language
 
 display_notification('⏳ Please wait !', 'Emojis data is beeing gathered, this can take some time...')
-time.sleep(0.2)
 
-for folder in [data_folder_path, cache_folder_path, icons_folder_path]:
+for folder in [data_folder_path, icons_folder_path]:
     if not os.path.exists(folder):
         os.mkdir(folder)
 
 check_e_type = ['flag:', 'keycap:']
 
-try:
-    img_urls = ['https://unicode.org/emoji/charts/full-emoji-list.html', 'https://unicode.org/emoji/charts/full-emoji-modifiers.html']
-    for url in img_urls:
-        img_response = request.urlopen(url).read().decode('utf-8')
-        soup = BeautifulSoup(img_response, 'html.parser')
-        rows = soup.find_all('tr')
-        for row in rows[1:]:
-            cols = row.find_all('td')
-            if cols:
-                img_tag = cols[3].find('img')
-                if img_tag:
-                    img_src = img_tag.get('src').split(',')[1]
-                    img_data = BytesIO(base64.b64decode(img_src))
-                    file_name = f'{cols[-1].text.replace("⊛", "").replace(":", "").strip()}.png'
-                    file_path = os.path.join(icons_folder_path, file_name)
-                    with open(file_path, 'wb') as file:
-                        file.write(img_data.getvalue())
+def convert_emoji_to_png(emoji, name):
+    image_size = (128, 128)
+    image = Image.new("RGBA", image_size, (0, 0, 0, 0))  # Set transparent background
+    font_size = 64  # Adjusted font size
+    font_path = "/System/Library/Fonts/Apple Color Emoji.ttc"
+    font = ImageFont.truetype(font_path, font_size, encoding='unic')
+    draw_position = (int((image_size[0] - font_size) / 2), int((image_size[1] - font_size) / 2))
+    draw = ImageDraw.Draw(image)
+    draw.text(draw_position, emoji, font=font, embedded_color=True)
+    image.save(f"{icons_folder_path}/{name.replace(':', '')}.png", "PNG")
 
+try:
     api_url = 'https://unicode.org/Public/emoji/latest/emoji-test.txt'
     api_response = request.urlopen(api_url).read().decode('utf-8')
     lines = [line.strip() for line in api_response.split('\n') if ('; fully-qualified' in line) or ('; component' in line)]
@@ -75,6 +65,7 @@
             'title': title,
             'tags': tags
         })
+        convert_emoji_to_png(emoji, name)
 
     with open('json/lang.json') as file:
         langs = json.load(file)

public/search_tag.webp

@@ -14,7 +14,10 @@
     action, level, subaction, kID = lib[1], int(lib[2]), lib[3], lib[4]
 
 if tags_data is None:
-    os.mkdir(data_folder_path)
+    try:
+        os.mkdir(data_folder_path)
+    except:
+        pass
     with open(tags_file_path, 'w') as file:
         json.dump([], file)
 
@@ -93,7 +96,7 @@
                     list_emojis = ', '.join(obj['emojis'])
                     list_emojis = '❌ No Emojis' if list_emojis == '' else f'Emojis: {list_emojis}'
                     items.append({
-                        'title': obj['title'] if obj['title'] is not '' else 'No Title',
+                        'title': obj['title'] if obj['title'] != '' else 'No Title',
                         'subtitle': list_emojis,
                         'arg': f'_rerun;modify;2;;{obj["id"]}',
                         'icon': {
@@ -106,7 +109,7 @@
                     list_emojis = ', '.join(obj.get('emojis'))
                     list_emojis = '❌ No Emojis' if list_emojis == '' else f'Emojis: {list_emojis}'
                     items.append({
-                        'title': obj['title'] if obj['title'] is not '' else 'No Title',
+                        'title': obj['title'] if obj['title'] != '' else 'No Title',
                         'subtitle': list_emojis,
                         'arg': f'_tags;delete;;{obj["id"]};{"ǀ".join(lib)}',
                         'icon': {

src/api.py

@@ -802,11 +802,11 @@
 
 * MacOS.
 * Alfred 5. Note that the [Alfred Powerpack](https://www.alfredapp.com/powerpack/) is required to use workflows.
-* Requires **python 3.7** or above.
+* Requires **python 3.8** or above.
 
 ## 🧰 Setup the workflow
 
-Install Python 3.7 or above. Check your version with :
+Install Python 3.8 or above. Check your version with :
 
 `python --version`
 
@@ -1187,7 +1187,7 @@ note: not all emojis are available in all languages.</string>
 		</dict>
 	</array>
 	<key>version</key>
-	<string>1.1.2</string>
+	<string>1.2.0</string>
 	<key>webaddress</key>
 	<string>https://github.com/BenjaminOddou/alfred-emoji-wine</string>
 </dict>