Simplified extractData.generateIndex() logic. Tags are casefolded and capitalized than checked for duplicate entries

generator/main.py

@@ -24,7 +24,6 @@ along with SAAS.  If not, see <https://www.gnu.org/licenses/>.
 import glob
 import json
 import os
-import shutil
 import sys
 from urllib.parse import quote as strToHtmlFmt
 import zipfile
@@ -84,7 +83,7 @@ class extractData:
                 infoDict = self.extractActivityInfo(infoFiles[0], bundle)
                 self.bundlesInfoList.append(infoDict)
 
-                # FIXME: create seprate function for it
+                # FIXME: create separate function for it
                 # extract and copy icon
                 activityName = infoDict.get("name")
                 if type(activityName) == str:
@@ -106,8 +105,6 @@ class extractData:
                             self.iconErrorBundles.append(bundlePath)
 
                         bundle.close()
-                        # FIXME: uncomment below function.
-                        # Disabled sometime during development as time consuming
                         self.copyBundle(bundlePath, activityName)
             bundle.close()
 
@@ -152,65 +149,41 @@ class extractData:
     be created for it.
     appends keys rather than replacing where multiple map to same
     """
-    # FIXME: Simplify logic: replace str, tuple, list etc. with 'string' & 'array'
+    def generateIndex(self):
-    def generateIndex(
+        for activity in json.loads(self.infoJson):
-        self,
+            indexDict = {
-        infoToIndexMap={
+                "name": "",
-            "name": ("name", "string"),
+                "summary": "",
-            "summary":  ("summary", "string"),
+                "description": "",
-            "description": ("description", "string"),
+                "tags": ()
-            "tag": ("tags", "array"),
-            "tags": ("tags", "array"),
-            "categories": ("tags", "array"),
-            "category": ("tags", "array")
                 }
-        ):
-            unexpectedInputError = (
-                "main.py generateIndex() : expect only str, list or tuple as "
-                "kwargs -> value[1] but found "
-                )
 
-            i2IMap = infoToIndexMap
+            name = activity.get("name")
+            if name is not None:
+                indexDict["name"] = name
 
-            for obj in json.loads(self.infoJson):
+            summary = activity.get("summary")
-                indexDict = {}
+            if summary is not None:
-                for k, v in obj.items():
+                indexDict["summary"] = summary
-                    if k in i2IMap:
 
-                        # add new entry/key to app index
+            description = activity.get("description")
-                        if k not in indexDict:
+            if description is not None:
-                            if i2IMap[k][1] == "string":
+                indexDict["description"] = description
-                                indexDict[i2IMap[k][0]] = v
-                            elif i2IMap[k][1] == "array":
-                                if v.find(';') >= 0:
-                                    indexDict[i2IMap[k][0]] = v.split(';')
-                                else:
-                                    indexDict[i2IMap[k][0]] = v.split()
 
-                        # Append to existing entry/key to app index
+            tags = []
+            tagsKeys = ["tag", "tags", "category", "categories"]
+            for key in tagsKeys:
+                tagsString = activity.get(key)
+                if tagsString is not None:
+                    if tagsString.find(';') != -1:
+                        tagsList = tagsString.split(';')
                     else:
-                            if i2IMap[k][1] == "string":
+                        tagsList = tagsString.split()
-                                indexDict[i2IMap[k][0]] += ' '+v
+                    for tag in tagsList:
-                            elif i2IMap[k][1] == "array":
+                        tag = tag.casefold().capitalize()
-                                if v.find(';') >= 0:
+                        if tag not in tags:
-                                    indexDict[i2IMap[k][0]] += v.split(';')
+                            tags.append(tag)
-                                else:
+            indexDict["tags"] = tuple(tags)
-                                    indexDict[i2IMap[k][0]] += v.split()
-                            else:
-                                print(unexpectedInputError, i2IMap[k][1])
-                                sys.exit(1)
-
-                # Create entry/key with empty value for keys not present
-                # in activity.info
-                for k, v in i2IMap.items():
-                    if v[0] not in indexDict:
-                        if v[1] == "string":
-                            indexDict[v[0]] = ""
-                        elif v[1] == "array":
-                            indexDict[v[0]] = ()
-                        else:
-                            print(unexpectedInputError, v[1])
-                            sys.exit(1)
 
             self.indexDictList.append(indexDict)
         self.indexJs = (

generator/portableCode/OS.py

@@ -1,4 +1,5 @@
 import os
+import shutil
 
 
 def CallFuncInDir(Directory, Function, *args, **kwArgs):