Skip to content

Commit a6147ef

Browse files
BenjaminOddouBenjaminOddou
committed
fix: brew path
fix #1 modify country codes for Danemark and Sweden
1 parent 740932c commit a6147ef

File tree

3 files changed

+72
-58
lines changed

3 files changed

+72
-58
lines changed

‎src/api.py‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,36 @@
11
import os
22
import sys
3+
import subprocess
34
from utils import api_file_path, data_folder_path, icons_folder_path, display_notification, language
4-
python_version = f"{sys.version_info.major}.{sys.version_info.minor}"
5-
pillow_dir = '/usr/local/Cellar/pillow'
6-
try:
7-
latest_version = max(os.listdir(pillow_dir))
8-
except:
9-
display_notification('🚨 Error !', 'Pillow is not detected, install it using homebrew')
10-
pillow_path = os.path.join(pillow_dir, latest_version, f'lib/python{python_version}/site-packages')
11-
sys.path.append(pillow_path)
5+
def get_homebrew_prefix():
6+
try:
7+
prefix = subprocess.check_output(['brew', '--prefix'])
8+
return prefix
9+
except:
10+
return None
11+
12+
homebrew_prefix = get_homebrew_prefix()
13+
14+
if homebrew_prefix:
15+
python_version = f"{sys.version_info.major}.{sys.version_info.minor}"
16+
pillow_dir = f'{homebrew_prefix}/Cellar/pillow'
17+
try:
18+
latest_version = max(os.listdir(pillow_dir))
19+
pillow_path = os.path.join(pillow_dir, latest_version, f'lib/python{python_version}/site-packages')
20+
sys.path.append(pillow_path)
21+
except:
22+
pass
23+
1224
import re
1325
import json
1426
import datetime
1527
from urllib import request
1628
import xml.etree.ElementTree as ET
17-
from PIL import Image, ImageDraw, ImageFont
29+
try:
30+
from PIL import Image, ImageDraw, ImageFont
31+
except:
32+
display_notification('🚨 Error !', 'Pillow is not detected, check the documentation to install it')
33+
exit()
1834

1935
display_notification('⏳ Please wait !', 'Emojis data is beeing gathered, this can take some time...')
2036

‎src/info.plist‎

Lines changed: 45 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,21 @@
476476
<key>version</key>
477477
<integer>1</integer>
478478
</dict>
479+
<dict>
480+
<key>config</key>
481+
<dict>
482+
<key>availableviaurlhandler</key>
483+
<false/>
484+
<key>triggerid</key>
485+
<string>harvest</string>
486+
</dict>
487+
<key>type</key>
488+
<string>alfred.workflow.trigger.external</string>
489+
<key>uid</key>
490+
<string>E06CBF7C-373F-4989-AD9D-77B601FA1E06</string>
491+
<key>version</key>
492+
<integer>1</integer>
493+
</dict>
479494
<dict>
480495
<key>config</key>
481496
<dict>
@@ -525,21 +540,6 @@
525540
<key>version</key>
526541
<integer>3</integer>
527542
</dict>
528-
<dict>
529-
<key>config</key>
530-
<dict>
531-
<key>availableviaurlhandler</key>
532-
<false/>
533-
<key>triggerid</key>
534-
<string>harvest</string>
535-
</dict>
536-
<key>type</key>
537-
<string>alfred.workflow.trigger.external</string>
538-
<key>uid</key>
539-
<string>E06CBF7C-373F-4989-AD9D-77B601FA1E06</string>
540-
<key>version</key>
541-
<integer>1</integer>
542-
</dict>
543543
<dict>
544544
<key>config</key>
545545
<dict>
@@ -641,25 +641,6 @@
641641
<key>version</key>
642642
<integer>1</integer>
643643
</dict>
644-
<dict>
645-
<key>config</key>
646-
<dict>
647-
<key>externaltriggerid</key>
648-
<string>harvest</string>
649-
<key>passinputasargument</key>
650-
<true/>
651-
<key>passvariables</key>
652-
<false/>
653-
<key>workflowbundleid</key>
654-
<string>self</string>
655-
</dict>
656-
<key>type</key>
657-
<string>alfred.workflow.output.callexternaltrigger</string>
658-
<key>uid</key>
659-
<string>19527210-0ADC-4179-BAB9-82A03C19D378</string>
660-
<key>version</key>
661-
<integer>1</integer>
662-
</dict>
663644
<dict>
664645
<key>config</key>
665646
<dict>
@@ -683,6 +664,25 @@
683664
<key>version</key>
684665
<integer>2</integer>
685666
</dict>
667+
<dict>
668+
<key>config</key>
669+
<dict>
670+
<key>externaltriggerid</key>
671+
<string>harvest</string>
672+
<key>passinputasargument</key>
673+
<true/>
674+
<key>passvariables</key>
675+
<false/>
676+
<key>workflowbundleid</key>
677+
<string>self</string>
678+
</dict>
679+
<key>type</key>
680+
<string>alfred.workflow.output.callexternaltrigger</string>
681+
<key>uid</key>
682+
<string>19527210-0ADC-4179-BAB9-82A03C19D378</string>
683+
<key>version</key>
684+
<integer>1</integer>
685+
</dict>
686686
<dict>
687687
<key>config</key>
688688
<dict>
@@ -743,6 +743,14 @@
743743
<key>version</key>
744744
<integer>1</integer>
745745
</dict>
746+
<dict>
747+
<key>type</key>
748+
<string>alfred.workflow.utility.junction</string>
749+
<key>uid</key>
750+
<string>CA37797D-2228-4350-836C-EC35177DCB08</string>
751+
<key>version</key>
752+
<integer>1</integer>
753+
</dict>
746754
<dict>
747755
<key>config</key>
748756
<dict>
@@ -760,14 +768,6 @@
760768
<key>version</key>
761769
<integer>2</integer>
762770
</dict>
763-
<dict>
764-
<key>type</key>
765-
<string>alfred.workflow.utility.junction</string>
766-
<key>uid</key>
767-
<string>CA37797D-2228-4350-836C-EC35177DCB08</string>
768-
<key>version</key>
769-
<integer>1</integer>
770-
</dict>
771771
<dict>
772772
<key>config</key>
773773
<dict>
@@ -1051,11 +1051,11 @@ Go to the dedicated [GitHub repository](https://github.com/BenjaminOddou/alfred-
10511051
</array>
10521052
<array>
10531053
<string>🇸🇪 Svenska</string>
1054-
<string>se</string>
1054+
<string>sv</string>
10551055
</array>
10561056
<array>
10571057
<string>🇩🇰 Dansk</string>
1058-
<string>dk</string>
1058+
<string>da</string>
10591059
</array>
10601060
<array>
10611061
<string>🇮🇩 Melayu</string>
@@ -1188,10 +1188,8 @@ note: not all emojis are available in all languages.</string>
11881188
<string>sound</string>
11891189
</dict>
11901190
</array>
1191-
<key>variablesdontexport</key>
1192-
<array/>
11931191
<key>version</key>
1194-
<string>1.2.2</string>
1192+
<string>1.2.3</string>
11951193
<key>webaddress</key>
11961194
<string>https://github.com/BenjaminOddou/alfred-emoji-wine</string>
11971195
</dict>

‎src/json/lang.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
},
3434
{
3535
"title": "🇸🇪 Svenska",
36-
"value": "se"
36+
"value": "sv"
3737
},
3838
{
3939
"title": "🇩🇰 Dansk",
40-
"value": "dk"
40+
"value": "da"
4141
},
4242
{
4343
"title": "🇮🇩 Malay",

0 commit comments

Comments
 (0)