Version 2.0

Author: jay3332

.gitignore

@@ -0,0 +1,156 @@
+# Created by .ignore support plugin (hsz.mobi)
+### VirtualEnv template
+# Virtualenv
+# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
+.Python
+[Bb]in
+[Ii]nclude
+[Ll]ib
+[Ll]ib64
+[Ll]ocal
+[Ss]cripts
+pyvenv.cfg
+.venv
+pip-selfcheck.json
+
+### Python template
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+

LICENSE

@@ -0,0 +1,7 @@
+Copyright 2021-present jay3332
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,34 +1,36 @@
 # Pilmoji
-Pilmoji is an emoji renderer for Pillow, Python's imaging library.  
-It supports not only unicode emojis, but also Discord emojis.
+Pilmoji is an emoji renderer for [Pillow](https://github.com/python-pillow/Pillow/), 
+Python's imaging library.
 
-Pilmoji uses [twemoji](https://github.com/twitter/twemoji) for unicode emojis.  
-For Discord emojis, Pilmoji will send a request to Discord's CDN.  
-Everything is cached, to ensure fast results.  
-
-You can also use Microsoft's emojis instead of Twemoji, if that's what you prefer.
+Pilmoji comes equipped with support for both unicode emojis and Discord emojis.
 
 ## Features
-- Asynchronous support
-- Multi-line support
 - Discord emoji support
-- Emoji position and size adjusting
-- Twemoji __and__ Microsoft emoji support
-- Caching
-
-## Asynchronous Support
-Pilmoji has both synchronous ([requests](https://pypi.org/project/requests/))
-and asynchrounous ([aiohttp](https://pypi.org/project/aiohttp/)) support.  
-
-## Installation
-Pilmoji should be installed using `pip`:
-``` 
-pip install pilmoji
+- Multi-line rendering support
+- Emoji position and/or size adjusting
+- Many built-in emoji sources
+- Optional caching
+
+## Installation and Requirements
+You must have Python 3.8 or higher in order to install Pilmoji.
+
+Installation can be done with `pip`:
+```shell 
+$ pip install -U pilmoji
 ```
-Installing from Github will most likely fail.
 
-## Examples
-### Basic usage
+Optionally, you can add the `[requests]` option to install requests
+alongside Pilmoji:
+```shell 
+$ pip install -U pilmoji[requests]
+```
+
+The option is not required, instead if `requests` is not installed, 
+Pilmoji will fallback to use the builtin `urllib`.
+
+You may also install from Github.
+
+## Usage
 ```py 
 from pilmoji import Pilmoji
 from PIL import Image, ImageFont
@@ -47,49 +49,37 @@ with Image.new('RGB', (550, 80), (255, 255, 255)) as image:
 
     image.show()
 ```
+
 #### Result
 ![Example result](https://jay.has-no-bra.in/f/j4iEcc.png)
-### Async usage
-```py
-import asyncio
-from pilmoji import AsyncPilmoji
-from PIL import Image, ImageFont
 
-my_string = '''
-Hello, world! 👋 Here are some emojis: 🎨 🌊 😎
-I also support Discord emoji: <:rooThink:596576798351949847>
-'''
+## Switching emoji sources
+As seen from the example, Pilmoji defaults to the `Twemoji` emoji source. 
 
+If you prefer emojis from a different source, for example Microsoft, simply
+set the `source` kwarg in the constructor to a source found in the 
+`pilmoji.source` module:
 
-async def main():
-    with Image.new('RGB', (550, 80), (255, 255, 255)) as image:
-        font = ImageFont.truetype('arial.ttf', 24)
+```py 
+from pilmoji.source import MicrosoftEmojiSource
 
-        async with AsyncPilmoji(image) as pilmoji:
-            await pilmoji.text((10, 10), my_string.strip(), (0, 0, 0), font)
+with Pilmoji(image, source=MicrosoftEmojiSource) as pilmoji:
+    ...
+```
 
-        image.show()
+![results](https://jay.has-no-bra.in/f/suPfj0.png)
 
+It is also possible to create your own emoji sources via subclass.
+
+## Fine adjustments
+If an emoji looks too small or too big, or out of place, you can make fine adjustments 
+with the `emoji_scale_factor` and `emoji_position_offset` kwargs:
 
-asyncio.run(main())
-```
-Results are the exact same.
-### Size/position adjustments
-Is an emoji too low, or too small for a given font?  
-You can also render emojis with offsets:
 ```py 
 pilmoji.text((10, 10), my_string.strip(), (0, 0, 0), font,
-             emoji_size_factor=1.15, emoji_position_offset=(0, -2))
-```
-### Using Microsoft emojis
-Pilmoji also supports Microsoft emojis.  
-Simply set the `use_microsoft_emoji` kwarg to True, as such:
-```py 
-with Pilmoji(image, use_microsoft_emoji=True) as pilmoji:
-    ...
+             emoji_scale_factor=1.15, emoji_position_offset=(0, -2))
 ```
-![results](https://jay.has-no-bra.in/f/suPfj0.png)
-## Notes
-- [async] If you're running PIL in an executor, use the **sync** version of Pilmoji instead.
-- [async] It is not recommended to run PIL in asynchronous conditions (PIL is blocking.)
-    - If you really have to, run the manipulation in an executor.
+
+## Contributing
+Contributions are welcome. Make sure to follow [PEP-8](https://www.python.org/dev/peps/pep-0008/)
+styling guidelines.

pilmoji/__init__.py

@@ -1,9 +1,6 @@
-# sync
-from .sync import Pilmoji, Requester
+from . import helpers, source
+from .core import Pilmoji
+from .helpers import *
 
-# async
-from .aio import AsyncPilmoji, AsyncRequester
-
-
-__version__ = '1.3.2'
+__version__ = '2.0.0'
 __author__ = 'jay3332'