Emojis and Transform Improvements

AUTHORS

@@ -24,6 +24,12 @@ Fonts:
 Canonical / Ubuntu (Ubuntu-R.ttf font)
 
 
+Emoji:
+
+OpenMoji (http://openmoji.org/). All emojis designed by OpenMoji,
+the open-source emoji and icon project. License: CC BY-SA 4.0
+
+
 Supporters
 
 A big thanks to all the financial backers and supporters from PayPay,

src/classes/info.py

@@ -56,6 +56,7 @@
 BLENDER_PATH = os.path.join(USER_PATH, "blender")
 TITLE_PATH = os.path.join(USER_PATH, "title")
 TRANSITIONS_PATH = os.path.join(USER_PATH, "transitions")
+EMOJIS_PATH = os.path.join(USER_PATH, "emojis")
 PREVIEW_CACHE_PATH = os.path.join(USER_PATH, "preview-cache")
 USER_PROFILES_PATH = os.path.join(USER_PATH, "profiles")
 USER_PRESETS_PATH = os.path.join(USER_PATH, "presets")
@@ -69,8 +70,7 @@
 for folder in [
     USER_PATH, BACKUP_PATH, RECOVERY_PATH, THUMBNAIL_PATH, CACHE_PATH,
     BLENDER_PATH, TITLE_PATH, TRANSITIONS_PATH, PREVIEW_CACHE_PATH,
-    USER_PROFILES_PATH, USER_PRESETS_PATH, USER_TITLES_PATH,
-]:
+    USER_PROFILES_PATH, USER_PRESETS_PATH, USER_TITLES_PATH, EMOJIS_PATH ]:
     if not os.path.exists(os.fsencode(folder)):
         os.makedirs(folder, exist_ok=True)
 

src/classes/json_data.py

@@ -225,6 +225,11 @@ def replace_string_to_absolute(self, match):
             new_path = json.dumps(new_path, ensure_ascii=False)
             return '"%s": %s' % (key, new_path)
 
+        elif "@emojis" in path:
+            new_path = path.replace("@emojis", os.path.join(info.PATH, "emojis", "color", "svg"))
+            new_path = json.dumps(new_path, ensure_ascii=False)
+            return '"%s": %s' % (key, new_path)
+
         elif "@assets" in path:
             new_path = path.replace("@assets", path_context["new_project_assets"])
             new_path = json.dumps(new_path, ensure_ascii=False)
@@ -268,20 +273,28 @@ def replace_string_to_relative(self, match):
 
         # Determine if @transitions path is found
         elif os.path.join(info.PATH, "transitions") in folder_path:
-            # Yes, this is an OpenShot transitions
+            # Yes, this is an OpenShot transition
             folder_path, category_path = os.path.split(folder_path)
 
             # Convert path to @transitions/ path
             new_path = os.path.join("@transitions", category_path, file_path).replace("\\", "/")
             new_path = json.dumps(new_path, ensure_ascii=False)
             return '"%s": %s' % (key, new_path)
 
+        # Determine if @emojis path is found
+        elif os.path.join(info.PATH, "emojis") in folder_path:
+            # Yes, this is an OpenShot emoji
+            # Convert path to @emojis/ path
+            new_path = os.path.join("@emojis", file_path).replace("\\", "/")
+            new_path = json.dumps(new_path, ensure_ascii=False)
+            return '"%s": %s' % (key, new_path)
+
         # Determine if @assets path is found
         elif path_context["new_project_assets"] in folder_path:
             # Yes, this is an OpenShot transitions
             folder_path = folder_path.replace(path_context["new_project_assets"], "@assets")
 
-            # Convert path to @transitions/ path
+            # Convert path to @assets/ path
             new_path = os.path.join(folder_path, file_path).replace("\\", "/")
             new_path = json.dumps(new_path, ensure_ascii=False)
             return '"%s": %s' % (key, new_path)

src/classes/thumbnail.py

@@ -37,7 +37,13 @@
 from http.server import BaseHTTPRequestHandler, HTTPServer
 from socketserver import ThreadingMixIn
 
-REGEX_THUMBNAIL_URL = re.compile(r"/thumbnails/(?P<file_id>.+?)/(?P<file_frame>\d+)(?P<only_path>/path/)?")
+# Regex for parsing URLs: (examples)
+#  http://127.0.0.1:33723/thumbnails/9ATJTBQ71V/1/path/no-cache/
+#  http://127.0.0.1:33723/thumbnails/9ATJTBQ71V/1/path/
+#  http://127.0.0.1:33723/thumbnails/9ATJTBQ71V/1/path
+#  http://127.0.0.1:33723/thumbnails/9ATJTBQ71V/1/
+#  http://127.0.0.1:33723/thumbnails/9ATJTBQ71V/1
+REGEX_THUMBNAIL_URL = re.compile(r"/thumbnails/(?P<file_id>.+?)/(?P<file_frame>\d+)/*(?P<only_path>path)?/*(?P<no_cache>no-cache)?")
 
 
 def GenerateThumbnail(file_path, thumb_path, thumbnail_frame, width, height, mask, overlay):
@@ -124,10 +130,12 @@ def do_GET(self):
         """ Process each GET request and return a value (image or file path)"""
         # Parse URL
         url_output = REGEX_THUMBNAIL_URL.match(self.path)
-        if url_output and len(url_output.groups()) == 3:
+        if url_output and len(url_output.groups()) == 4:
             # Path is expected to have 3 matched components (third is optional though)
             #   /thumbnails/FILE-ID/FRAME-NUMBER/   or
-            #   /thumbnails/FILE-ID/FRAME-NUMBER/path/
+            #   /thumbnails/FILE-ID/FRAME-NUMBER/path/  or
+            #   /thumbnails/FILE-ID/FRAME-NUMBER/no-cache/  or
+            #   /thumbnails/FILE-ID/FRAME-NUMBER/path/no-cache/
             self.send_response_only(200)
         else:
             self.send_error(404)
@@ -137,6 +145,7 @@ def do_GET(self):
         file_id = url_output.group('file_id')
         file_frame = int(url_output.group('file_frame'))
         only_path = url_output.group('only_path')
+        no_cache = url_output.group('no_cache')
 
         try:
             # Look up file data
@@ -165,7 +174,7 @@ def do_GET(self):
             # Try with ID and frame # in filename (for backwards compatibility)
             thumb_path = os.path.join(info.THUMBNAIL_PATH, "%s-%s.png" % (file_id, file_frame))
 
-        if not os.path.exists(thumb_path):
+        if not os.path.exists(thumb_path) or no_cache:
             # Generate thumbnail (since we can't find it)
 
             # Determine if video overlay should be applied to thumbnail

src/emojis/README.md

@@ -0,0 +1,74 @@
+OpenMoji
+========
+
+<img width="1157" alt="openmoji-github-keyvisual" src="https://user-images.githubusercontent.com/480224/71999652-1a60c000-3242-11ea-974a-96fef098147b.png">
+
+Open-source emojis for designers, developers and everyone else! OpenMoji is an open-source project of the HfG Schwäbisch Gmünd by Benedikt Groß, Daniel Utz, 50+ students and external contributors.
+
+👉 [OpenMoji.org/](http://openmoji.org/)
+
+Interact, create, save, and share your work! 🌈`#openmoji`
+
+This GitHub repository contains all of the source files and exported png/svg files of the OpenMoji project.
+
+⚠️ Please note that the master branch is in active development, so if you're looking for stable production version please use one of the releases.
+
+
+## Table of Contents
+
+- [Styleguide](http://openmoji.org/styleguide) our beloved styleguide.
+- [FAQ](FAQ.md) Check if your question has already been answered
+- [Contributing](CONTRIBUTING.md) Pull Requests are welcome!
+- [Developer Setup](CONTRIBUTING.md#developer-setup) how to setup node.js.
+- [Font](font) infos on the OpenMoji-Color and OpenMoji-Black fonts.
+- [Team](http://openmoji.org/about/#team) list of all authors and contributors.
+- [Acknowledgements](http://openmoji.org/about/#acknowledgement) Thanks!
+
+
+## Downloads & Distribution Channels
+You can download, use and "consume" OpenMoji in various ways:
+
+- [SVG](https://github.com/hfg-gmuend/openmoji/releases/latest): Color & Black (production ready)
+- [Fonts](https://github.com/hfg-gmuend/openmoji/releases/latest): Color & Black (experimental)
+- [PNG 618x618](https://github.com/hfg-gmuend/openmoji/releases/latest): Color & Black (production ready)
+- [PNG 72x72](https://github.com/hfg-gmuend/openmoji/releases/latest): Color & Black (production ready)
+- [OpenMoji app](https://itunes.apple.com/us/app/openmoji/id1462636288): for iOS with emoji picker
+- [OpenMoji Stickers](https://itunes.apple.com/us/app/openmoji/id1462636288): for iOS Messages app
+- [OpenMoji Github](https://github.com/hfg-gmuend/openmoji/): `git clone --dept 1 https://github.com/hfg-gmuend/openmoji.git` The OpenMoji repo is big! It is recommended to clone it without the entire history, note the --dept flag.
+- [OpenMoji NPM Package](https://www.npmjs.com/package/openmoji): `npm install openmoji`. You can also get individual files via [UNPKG](https://unpkg.com/) direclty e.g.: unpkg.com/[email protected]/color/svg/1F64B.svg
+- [OpenMoji Jekyll Plugin](https://github.com/azadeh-afzar/OpenMoji-Jekyll-Plugin): `gem install jekyll-openmoji`
+
+
+## Attribution Requirements
+As an open source project, attribution is critical from a legal, practical and motivational perspective. Please give us credits! Common places for attribution are for example: to mention us in your project README, the 'About' section or the footer on a website/in mobile apps.
+
+Attribution suggestion:
+
+> All emojis designed by [OpenMoji](https://openmoji.org/) – the open-source emoji and icon project. License: [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/#)
+
+
+## Anatomy of the OpenMoji Repository
+
+`black/` and `color/` Contains all exported .png and .svg files ¹
+
+`data/` Contains the central openmoji.json with all meta informations for each emoji ¹
+
+`font/` Contains the exported OpenMoji fonts ¹
+
+`guidelines/` Contains various template files related to the styleguide ¹
+
+`helpers/` Contains various helper scripts e.g. to export to .png and .svg, generate skintones variants, enforce the OpenMoji color palette etc. ²
+
+`src/` Contains all source .svg files of OpenMoji. The files are broken up into folders and files corresponding with the Unicode groups and sub-groups ¹
+
+`test/` Automated unit tests to ensure consistency across all source .svg files ²
+
+
+## License
+¹ OpenMoji graphics are licensed under the Creative Commons Share Alike License 4.0 ([CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/))
+
+[![License: CC BY-SA 4.0](https://img.shields.io/badge/License-CC%20BY--SA%204.0-lightgrey.svg)](https://creativecommons.org/licenses/by-sa/4.0/)
+
+² Code licensed under the GNU Lesser General Public License v3 ([LGPL-3.0](https://www.gnu.org/licenses/lgpl-3.0.en.html))
+
+[![License: LGPL-3.0](https://img.shields.io/badge/License-LGPL%20v3-lightgrey.svg)](https://www.gnu.org/licenses/lgpl-3.0.en.html)