Changeset 11370

Timestamp:

12/14/2021 05:20:19 AM (2 years ago)

Author:

dd32

Message:

SVN Watcher: Reports: Add an 'unknown props' report, simpler view to scan for known typos.

See #5978.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin

Files:

• list-table.php (modified) (1 diff)
• post.php (modified) (5 diffs)
• reports-page.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/list-table.php

@@ -123 +123 @@
             FROM {$props_table}
             WHERE revision IN({$revisions})
-            ORDER BY LENGTH(prop_name) DESC"
+            ORDER BY user_id IS NULL DESC, LENGTH(prop_name) DESC"
         );
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/post.php

@@ -38 +38 @@
             $svn['props_table'],
             [
-                'id'        => $the_prop->id,
-                'revision'  => $rev,
+                'id'       => $the_prop->id,
+                'revision' => $rev,
             ]
         );
@@ -73 +73 @@
                 [
                     'prop_name' => $the_prop->prop_name,
-                    'user_id' => null
+                    'user_id'   => null
                 ]
             );
@@ -109 +109 @@
             ]
         );
+
+        // Update any other occurences of this typo.
+        $wpdb->update(
+            $svn['props_table'],
+            [
+                'user_id'   => $user,
+            ],
+            [
+                'prop_name' => $prop_name,
+                'user_id'   => null
+            ]
+        );
     }
 
@@ -140 +152 @@
     }
 
-    // Remove the props for the commit first.
+    // Reparse
+    $raw_props = Props\from_log( $details->message );
+
+    // Fetch all the user_id's
+    $props = [];
+    foreach ( $raw_props as $prop ) {
+        $props[ $prop ] = Props\find_user_id( $prop, $svn );
+    }
+
+    // Remove the props for the commit, after reparsing. This is so that any usernames only corrected within that commit get picked up.
     $wpdb->delete(
         $svn['props_table'],
-        [
-            'revision' => $rev
-        ]
+        [ 'revision' => $rev ]
     );
 
-    // Reparse
-    $props = Props\from_log( $details->message );
-
     // Reinsert
-    foreach ( $props as $prop ) {
+    foreach ( $props as $prop => $user_id ) {
         $data = [
             'revision'  => $rev,
@@ -158 +174 @@
         ];
 
-        $user_id = Props\find_user_id( $prop, $svn );
         if ( $user_id ) {
             $data['user_id'] = $user_id;

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/admin/reports-page.php

@@ -25 +25 @@
             <li><a href="<?php echo $url; ?>&what=cloud">Cloud of Props matching filter</a></li>
             <li><a href="<?php echo $url; ?>&what=typos">Props typos matching filter</a></li>
+            <li><a href="<?php echo $url; ?>&what=unknown-props">Unknown Props/typos matching filter</a></li>
             <li><a href="<?php echo $url; ?>&what=raw-contributors-and-committers">All Props+Committers matching filter grouped together</a></li>
             
@@ -354 +355 @@
 
                 break;
+            case 'unknown-props':
+                $details = $wpdb->get_results(
+                    "SELECT p.prop_name,
+                        COUNT( * ) as count,
+                        GROUP_CONCAT( p.revision ORDER BY p.revision ASC ) as revisions
+                    FROM {$details['props_table']} p
+                        LEFT JOIN {$details['rev_table']} r ON p.revision = r.id
+                    WHERE $where AND p.user_id IS NULL
+                    GROUP BY p.prop_name
+                    ORDER BY r.id DESC"
+                );
+
+                echo '<table class="widefat striped">';
+                echo '<thead><tr><th>Prop</th><th>Count</th><th>Revisions</th></tr></thead>';
+                foreach ( $details as $c ) {
+                    $link = add_query_arg(
+                        [
+                            'page' => str_replace( 'reports', 'edit', $_REQUEST['page'] ),
+                            'revisions' => $c->revisions
+                        ],
+                        admin_url( 'admin.php' )
+                    );
+                    printf(
+                        '<tr><td>%s</td><td>%s</td><td><a href="%s">%s</a></td></tr>',
+                        esc_html( $c->prop_name ),
+                        $c->count,
+                        $link,
+                        '[' . str_replace( ',', '] [', $c->revisions ) . ']'
+                    );
+                }
+                echo '</table>';
+
+                break;
             case 'raw-contributors-and-committers':
                 $details = $wpdb->get_results(