fix the licenses query

szabgab · Mar 30, 2023 · bfc242d · bfc242d
1 parent e0b8a82
commit bfc242d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/PyDigger/templates/licenses.html b/PyDigger/templates/licenses.html
@@ -18,11 +18,11 @@
         {% for l in licenses %}
             <tr><td>{{l.count | commafy}}</td><td>
                 {% if l.long %}
-                    <a href="/search?license=__long__">{{l.license}}</a>
-                {% elif l.license == '' %}
+                    <a href="/search?license=__long__">{{l._id}}</a>
+                {% elif l._id == '' %}
                     <a href="/search?license=__empty__">**EMPTY**</a>
                 {% else %}
-                    <a href="/search?license={{l.license}}">{{l.license}}</a>
+                    <a href="/search?license={{l.license}}">{{l._id}}</a>
                 {% endif %}
             </td></tr>
         {% endfor %}

diff --git a/PyDigger/website.py b/PyDigger/website.py
@@ -205,21 +205,26 @@ def keywords():
 @app.route("/licenses")
 def licenses():
     db = PyDigger.common.get_db()
-    licenses = db.packages.group(['license'], {}, { 'count' : 0}, 'function (curr, result) { result.count++; }' )
-    licenses.sort(key=lambda f:f['count'])
-    licenses.reverse()
-    for licence in licenses:
+    licenses_res = db.packages.aggregate([{ "$group" : { "_id": "$license", 'count' : {"$sum" : 1} }}])
+    licenses = []
+    for licence in licenses_res:
+        #if licence['_id'] is not None and len(licence['_id']) < 10:
+        #    app.logger.info(licence)
         licence['count'] = int(licence['count'])
-        if licence['license'] is None:
-            licence['license'] = 'None'
-        if len(licence['license']) > max_license_length:
+        if licence['_id'] is None:
+            licence['_id'] = 'None'
+        if len(licence['_id']) > max_license_length:
             licence['long'] = True
+        licenses.append(licence)
+
+    licenses.sort(key=lambda f:f['count'], reverse=True)
 
     return render_template('licenses.html',
         title = "Licenses of Python packages on PyPI",
-        total = db.packages.find().count(),
-        has_license = db.packages.find(cases['has_license']).count(),
-        no_license = db.packages.find(cases['no_license']).count(),
+        total = db.packages.count_documents({}),
+
+        has_license = db.packages.count_documents(cases['has_license']),
+        no_license = db.packages.count_documents(cases['no_license']),
         licenses = licenses,
     )