From 81e5ada2829991ec429af1e04927eb47b9a155eb Mon Sep 17 00:00:00 2001
From: siddharm <siddharm@gmail.com>
Date: Fri, 13 Sep 2019 17:25:29 -0400
Subject: [PATCH] refactoring & added --list

---
 .ascl_list1.py.swp | Bin 0 -> 20480 bytes
 ascl_list1.py      | 151 ++++++++++++++++++++++++++++-----------------
 try.csv            |   0
 3 files changed, 96 insertions(+), 55 deletions(-)
 create mode 100644 .ascl_list1.py.swp
 create mode 100644 try.csv

diff --git a/.ascl_list1.py.swp b/.ascl_list1.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..b82210813b8b95dd9ffef6c091e34f77eea96bd5
GIT binary patch
literal 20480
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
Kp=g452>lb!I<9&E

literal 0
HcmV?d00001

diff --git a/ascl_list1.py b/ascl_list1.py
index f2f766f..cc2cd08 100755
--- a/ascl_list1.py
+++ b/ascl_list1.py
@@ -26,7 +26,9 @@
 
 parser = argparse.ArgumentParser()
 
-parser.add_argument('-tags',        action='store_true')
+parser.add_argument('--list',       action='store_true')
+parser.add_argument('--tags',       action='store_true')
+
 parser.add_argument('--codedir',    type = str, default = '../code-nasa-gov',  help = "input directory for code-nasa-gov")
 parser.add_argument('--code',       type = str, default = 'code.json',         help = "input json for --mode 1")
 parser.add_argument('--catalog',    type = str, default = 'data/catalog.json', help = "input json for --mode 2")
@@ -43,11 +45,7 @@
 match_id   = args.matchid
 
 
-f1 = open(args.codedir + '/' + args.code)
-d1 = json.load(f1)
 
-f2 = open(args.codedir + '/' + args.catalog)
-d2 = json.load(f2)
     
 # d1: dict_keys(['version', 'agency', 'measurementType', 'releases'])  where d1['releases'] is a list of dict:
 #     ['repositoryURL','name','tags','contact','laborHours','date','organization','permissions','identifier','description']
@@ -60,65 +58,108 @@
 
 
 if mode == 1:    
+    
+    f1 = open(args.codedir + '/' + args.code)
+    d1 = json.load(f1)
+    
     r = d1['releases']
-    nr = len(r)
-    for ri in r:
-        name = ri['name']
-        tags = ri['tags']
-        desc = ri['description']
-        if not args.tags:
-            if 'identifier' in ri.keys():
-                iden = ri['identifier']
-            else:
-                iden = "NONE"
-
-            if match_name != None:
-                if name.find(match_name) < 0: continue
-                jstr = json.dumps(ri,indent=4)
-                print(jstr)
-                break
-
-            elif match_desc != None:
-                if desc.find(match_desc) < 0: continue
-                jstr = json.dumps(ri,indent=4)
-                print(jstr)
-
-            elif match_id == iden:
-                jstr = json.dumps(ri,indent=4)
-                print(jstr)
-                break
-
-            else:
-                print("%s %s" % (iden,name))
-        else:
+    
+    if args.tags:
+        for i in range(len(r)):
+            ri  = r[i]
+            tags= ri['tags']
+
             for t in tags:
                 print(t)
 
+    else:
+
+        if match_name != None:
+            for i in range(len(r)):
+                ri  = r[i]
+                name = ri['name']
+                if name.find(match_name) >= 0:
+                    jstr = json.dumps(ri,indent=4)
+                    print(jstr)
+
+        elif match_desc != None:
+            for i in range(len(r)):
+                ri  = r[i]
+                desc = ri['description']
+                if desc.find(match_desc) >= 0: 
+                    jstr = json.dumps(ri,indent=4)
+                    print(jstr)
+
+        elif match_id != None:
+            for i in range(len(r)):
+                ri = r[i]
+                iden = ri['identifier'] if 'identifier' in ri.keys() else "NONE"
+
+                if match_id == iden:
+                    jstr = json.dumps(ri,indent=4)
+                    print(jstr)
+
+        else:
+            for i in range(len(r)):
+                ri = r[i]
+                iden = ri['identifier'] if 'identifier' in ri.keys() else "NONE"
+                name = ri['name']
+                print("%s %s" % (iden,name))
+
 elif mode == 2:
-    for i in range(len(d2)):
-        ri = d2[i]
-        name = ri['Software']
-        desc = ri['Description']
-        cat  = ri['Categories']
+    f2 = open(args.codedir + '/' + args.catalog, )
+    d2 = json.load(f2)
+    
+    if args.tags:
+        for i in range(len(d2)):
+            ri = d2[i] 
+            cat     = ri['Categories']
+
+            for c in cat:
+                print(c)
+                
+    elif args.list:
+        output_str = "Ordinal,Status,Software,Description,Public Code Repo,External Link,Contributers\n"
+
+        for i in range(len(d2)): 
+            ri = d2[i]
+
+            s       = ", "
+            s2      = "," 
+
+            soft    = "\"" + ri['Software']             + "\""  
+            desc    = "\"" + ri['Description']          + "\""  
+            pcr     = "\"" + ri["Public Code Repo"]     + "\""  
+            el      = "\"" + ri["External Link"]        + "\""  
+            cont    = "\"" + s.join(ri["Contributors"]) + "\"" 
+           
+            output_str += s2.join([str(i), str(0), soft, desc, pcr, el, cont]) + "\n\n"
         
-        if not args.tags:
-            if match_name != None:
-                if name.find(match_name) < 0: continue
-                jstr = json.dumps(ri,indent=4)
-                print(jstr)
-                break
+        print( output_str )
             
-            elif match_desc != None:
-                if desc.find(match_desc) < 0: continue
-                jstr = json.dumps(ri,indent=4)
-                print(jstr)
+    else:
+        if match_name != None:
+            for i in range(len(d2)): 
+                ri = d2[i]
+                soft    = ri['Software']
+
+                if soft.find(match_name) >= 0:
+                    jstr = json.dumps(ri,indent=4)
+                    print(jstr)
+        
+        elif match_desc != None:
+            for i in range(len(d2)):
+                ri = d2[i]
+                desc    = ri['Description']
+                
+                if desc.find(match_desc) >= 0:
+                    jstr = json.dumps(ri,indent=4)
+                    print(jstr)
             
-            else:
-                print("%s" % (ri['Software']))
         else:
-            for c in cat:
-                print(c)
-
+            for i in range(len(d2)): 
+                ri = d2[i]
+                print("%s" % (ri['Software']))
 
 else:
     sys.exit(1)
diff --git a/try.csv b/try.csv
new file mode 100644
index 0000000..e69de29