Remade Free Software checker / Fixed file formats in Blender and Krita

apps/bibliogram.json

@@ -4,7 +4,7 @@
 	  "git":"https://git.sr.ht/~cadence/bibliogram",
 	  "documentation":"https://git.sr.ht/~cadence/bibliogram-docs/tree/master/docs",
 	  "icon":"https://bibliogram.art/favicon-32x32.png"},
- "licenses":["AGPL3"],
+ "licenses":["AGPL-3.0"],
  "platforms":["Web"],
  "interface":["Touch",
 	      "HTML"],

apps/blender.json

@@ -5,7 +5,7 @@
 	  "wikipedia":"https://en.wikipedia.org/wiki/Blender_(software)",
 	  "documentation":"https://docs.blender.org/manual/en/latest/",
 	  "icon":"https://download.blender.org/branding/square/blender_icon_64x64.png"},
- "licenses":["GPL3+"],
+ "licenses":["GPL-2.0-or-later"],
  "platforms":["GNU/Linux",
 	      "Windows",
 	      "MacOS",
@@ -16,6 +16,34 @@
  "languages":["C"],
  "networks_read":[],
  "networks_write":[],
- "formats_read":[],
+ "formats_read":["blend",
- "formats_write":[],
+		 "dae",
+		 "abc",
+		 "usd",
+		 "usdc",
+		 "usda",
+		 "svg",
+		 "bvh",
+		 "ply",
+		 "stl",
+		 "fbx",
+		 "glb",
+		 "obj",
+		 "x3d",
+		 "wrl"],
+ "formats_write":["blend",
+		  "dae",
+		  "abc",
+		  "usd",
+		  "usdc",
+		  "usda",
+		  "svg",
+		  "pdf",
+		  "obj",
+		  "ply",
+		  "stl",
+		  "fbx",
+		  "glb",
+		  "gltf",
+		  "x3d"],
  "generic_name":["Text Editor", "Video Editor", "3D Modeling tool"]}

apps/element.json

@@ -5,7 +5,7 @@
 	  "git":"https://github.com/vector-im",
 	  "wikipedia":"https://en.wikipedia.org/wiki/Element_(software)",
 	  "icon":"https://upload.wikimedia.org/wikipedia/commons/thumb/c/cb/Element_%28software%29_logo.svg/54px-Element_%28software%29_logo.svg.png?20200716131352"},
- "licenses":["Apache2.0"],
+ "licenses":["Apache-2.0"],
  "platforms":["GNU/Linux",
 	      "MacOS",
 	      "Windows",

apps/emacs.json

@@ -1,11 +1,12 @@
-{"names":["GNU emacs"],
+{"names":["GNU emacs",
- "comment":"An extensibe free/libre text editor and more.",
+	  "Emacs"],
+ "comment":"An extensibe free/libre text editor and a religion.",
  "links":{"website":"https://www.gnu.org/software/emacs/",
 	  "git":"https://git.savannah.gnu.org/cgit/emacs.git",
 	  "wikipedia":"https://en.wikipedia.org/wiki/GNU_Emacs",
 	  "documentation":"https://www.gnu.org/software/emacs/documentation.html",
 	  "icon":"https://www.gnu.org/software/emacs/images/emacs.png"},
- "licenses":["GPL3+"],
+ "licenses":["GPL-3.0-or-later"],
  "platforms":["GNU/Linux",
 	      "Windows",
 	      "MacOS",

apps/gimp.json

@@ -8,7 +8,7 @@
 	  "wikipedia":"https://en.wikipedia.org/wiki/GIMP",
 	  "documentation":"https://www.gimp.org/docs/",
 	  "icon":"https://upload.wikimedia.org/wikipedia/commons/thumb/4/45/The_GIMP_icon_-_gnome.svg/64px-The_GIMP_icon_-_gnome.svg.png"},
- "licenses":["GPL3+"],
+ "licenses":["GPL-3.0-or-later"],
  "platforms":["GNU/Linux",
 	      "Windows",
 	      "MacOS",

apps/invidious.json

@@ -3,7 +3,7 @@
  "links":{"website":"https://invidious.io/",
 	  "git":"https://github.com/iv-org/invidious#invidious",
 	  "icon":"https://invidious.io/invidious-colored-vector.svg"},
- "licenses":["AGPL3+"],
+ "licenses":["AGPL-3.0-or-later"],
  "platforms":["Web"],
  "interface":["HTML5"],
  "languages":["Crystal"],

apps/krita.json

@@ -5,7 +5,7 @@
 	  "wikipedia":"https://en.wikipedia.org/wiki/Krita",
 	  "documentation":"https://invent.kde.org/graphics/krita",
 	  "icon":"https://upload.wikimedia.org/wikipedia/commons/thumb/7/73/Calligrakrita-base.svg/1024px-Calligrakrita-base.svg.png"},
- "licenses":["GPL3"],
+ "licenses":["GPL-3.0"],
  "platforms":["GNU/Linux",
 	      "Windows",
 	      "MacOS",
@@ -16,6 +16,44 @@
  "languages":["C++"],
  "networks_read":[],
  "networks_write":[],
- "formats_read":[],
+ "formats_read":["bmp",
- "formats_write":[],
+		 "csv",
+		 "exr",
+		 "gbr",
+		 "gif",
+		 "gih",
+		 "heif",
+		 "avif",
+		 "jpg",
+		 "kpl",
+		 "kra",
+		 "ora",
+		 "pbm",
+		 "pgm",
+		 "ppm",
+		 "pdf",
+		 "png",
+		 "psd",
+		 "svg",
+		 "tiff"],
+ "formats_write":["bmp",
+		 "csv",
+		 "exr",
+		 "gbr",
+		 "gif",
+		 "gih",
+		 "heif",
+		 "avif",
+		 "jpg",
+		 "kpl",
+		 "kra",
+		 "ora",
+		 "pbm",
+		 "pgm",
+		 "ppm",
+		 "pdf",
+		 "png",
+		 "psd",
+		 "svg",
+		 "tiff"],
  "generic_name":["Image Editor", "Drawing Tool", "Raster"]}

apps/mastodon.json

@@ -4,7 +4,7 @@
 	  "git":"https://github.com/mastodon/mastodon",
 	  "wikipedia":"https://en.wikipedia.org/wiki/Mastodon_(software)",
 	  "icon":"https://upload.wikimedia.org/wikipedia/commons/thumb/4/48/Mastodon_Logotype_%28Simple%29.svg/60px-Mastodon_Logotype_%28Simple%29.svg.png"},
- "licenses":["AGPL3+"],
+ "licenses":["AGPL-3.0-or-later"],
  "platforms":["Web"],
  "interface":["HTML5"],
  "languages":["Ruby",

apps/newpipe.json

@@ -4,7 +4,7 @@
 	  "git":"https://github.com/TeamNewPipe/NewPipe",
 	  "wikipedia":"https://en.wikipedia.org/wiki/NewPipe",
 	  "icon":"https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/NewPipelogo.svg/220px-NewPipelogo.svg.png"},
- "licenses":["GPL3+"],
+ "licenses":["GPL-3.0-or-later"],
  "platforms":["Android"],
  "interface":["Touch"],
  "languages":["Java",

apps/peertube.json

@@ -3,7 +3,7 @@
     "links":{"website":"https://joinpeertube.org",
 	     "git":"https://github.com/Chocobozzz/PeerTube#--------",
 	     "icon":"https://joinpeertube.org/img/icons/favicon.png"},
- "licenses":["AGPL3+"],
+ "licenses":["AGPL-3.0-or-later"],
  "platforms":["Web"],
  "interface":["JavaScript"],
  "languages":["TypeScript"],

apps/piped.json

@@ -3,7 +3,7 @@
  "links":{"git":"https://github.com/TeamPiped/Piped#piped",
 	  "website":"https://piped.kavin.rocks",
 	  "icon":"https://piped.kavin.rocks/img/icons/logo.svg"},
- "licenses":["AGPL3+"],
+ "licenses":["AGPL-3.0-or-later"],
  "platforms":["Web"],
  "interface":["JavaScript"],
  "languages":["Vue"],

apps/pixelfeed.json

@@ -5,7 +5,7 @@
 	  "git":"https://github.com/pixelfed/pixelfed",
 	  "documentation":"https://docs.pixelfed.org/",
 	  "icon":"https://pixelfed.org/img/logo.svg"},
- "licenses":["AGPL3"],
+ "licenses":["AGPL-3.0"],
  "platforms":["Web"],
  "interface":["Touch",
 	      "JavaScript",

apps/pleroma.json

@@ -3,7 +3,7 @@
     "links":{"website":"https://pleroma.social/",
 	     "git":"https://git.pleroma.social/pleroma/pleroma/",
 	     "icon":"https://pleroma.social/images/pleroma_logo_vector_nobg_nopan.svg"},
- "licenses":["AGPL3+"],
+ "licenses":["AGPL-3.0-or-later"],
  "platforms":["Web"],
  "interface":["HTML5"],
  "languages":["Elixer"],

apps/telegram.json

@@ -4,7 +4,7 @@
 	  "git":"https://github.com/telegramdesktop/tdesktop",
 	  "wikipedia":"https://en.wikipedia.org/wiki/Telegram_(software)",
 	  "icon":"https://upload.wikimedia.org/wikipedia/commons/thumb/8/83/Telegram_2019_Logo.svg/121px-Telegram_2019_Logo.svg.png"},
- "licenses":["GPLv2+", "GPLv3", "Proprietary"],
+ "licenses":["GPL-2.0-or-later", "GPL-3.0", "Proprietary"],
  "platforms":["GNU/Linux",
 	      "MacOS",
 	      "Windows",

apps/viewtube.json

@@ -4,7 +4,7 @@
  "links":{"website":"https://viewtube.io",
 	  "git":"https://github.com/ViewTube/viewtube-vue#viewtube",
 	  "icon":"https://dev.viewtube.io/_nuxt/img/icon.dc8b72c.svg"},
- "licenses":["AGPL3+"],
+ "licenses":["AGPL-3.0-or-later"],
  "platforms":["Web"],
  "interface":["HTML5"],
  "languages":["Vue",

modules/render.py

@@ -7,7 +7,6 @@
 # your ability to set it up and running.
 
 from modules import search
-import json
 
 def html(page, json):
 

modules/search.py

@@ -103,14 +103,12 @@ def suggest(json_data):
 
 def is_free(app):
     if "licenses" in app and app["licenses"]:
-        matches = 0
+        with open("data/licenses.json", "r") as data:
-        with open("licenses.json", "r") as data:
+            all_licenses = json.load(data)["licenses"]
-            all_licenses = json.load(data)
+            for al in all_licenses: # Making longer loop once
-            for license in app["licenses"]:
+                for l in app["licenses"]:
-                for license2 in all_licenses["licenses"]:
+                    if l in [al.get("licenseId",""),al.get("name","")]\
-                    if license2 == license:
+                    and al.get("isFsfLibre", False):
-                        matches = matches + 1
+                        return True
-                        break
+        print("License Error! "+app.get("names",[])[0], "Check with data/licenses.json 'licenseId'")
-            if matches == len(app["licenses"]):
-                return True
     return False