Changeset 191702

Timestamp:

01/08/2010 11:48:08 PM (16 years ago)

Author:

zeeg

Message:

Sexifying the GitHub extension. Some strict syntax errors cleaned up.

Location:

lifestream/trunk

Files:

• CHANGES (modified) (1 diff)
• extensions/github/extension.inc.php (modified) (2 diffs)
• inc/core.php (modified) (2 diffs)
• inc/labels.php (modified) (1 diff)
• inc/widget.php (modified) (1 diff)
• pages/add-feed.inc.php (modified) (1 diff)

lifestream/trunk/CHANGES

@@ -7 +7 @@
 * Updated SimplePie to 1.2.
 * Upon activating the plugin the default feed is now owned by the user performing the activation.
+* Added much needed "less suck" to the GitHub extension.
 
 0.99.9.5

lifestream/trunk/extensions/github/extension.inc.php

@@ -13 +13 @@
         return $match[1];
     }
-
+    function parse_repo($text)
+    {
+        preg_match('/pushed to (.+) at (.+\/.+)/', $text, $match);
+        return array($match[1], $match[2]);
+    }
+    
+    function get_repository_name(&$event, &$bit)
+    {
+        return $bit['repository'];
+    }
+    
+    function get_repository_link(&$event, &$bit)
+    {
+        $name = $this->get_repository_name($event, $bit);
+        if (!$name) return;
+        return $this->lifestream->get_anchor_html($this->get_repository_name($event, $bit), sprintf('http://www.github.com/%s/', $name));
+    }
+    
+    
     function yield($row, $url, $key)
     {
@@ -23 +41 @@
             $message = $this->parse_message($description);
             $data['title'] = $message;
+            $repo = $this->parse_repo($row->get_title());
+            $data['branch'] = $repo[0];
+            $data['repository'] = $repo[1];
             return $data;
         }

lifestream/trunk/inc/core.php

@@ -68 +68 @@
         $this->owner_id = $row->owner_id;
         $this->visible = $row->visible;
-        $this->link = (!empty($this->data['link']) ? $this->data['link'] : $row->link);
+        $this->link = @(!empty($this->data['link']) ? $this->data['link'] : $row->link);
         $cls = $this->lifestream->get_feed($row->feed);
         $this->feed = new $cls($this->lifestream, unserialize($row->options), $row->feed_id);
@@ -2000 +2000 @@
             $this->_owner_id = $row->owner_id;
             $this->version = $row->version;
-            $this->events = $row->events;
+            $this->events = 'n/a';
+            //$this->events = $row->events;
             $this->feed = $row->feed;
         }

lifestream/trunk/inc/labels.php

@@ -365 +365 @@
     function get_label_single()
     {
-        return $this->lifestream->__('Committed code.', $this->get_feed_label());
-    }
-    
-    function get_label_plural()
-    {
-        return $this->lifestream->__('Made %s commits.', $this->_get_show_details_link(), $this->get_feed_label());
-    }
-    
-    function get_label_single_user()
-    {
-        return $this->lifestream->__('%s committed code.', $this->get_user_label(), $this->get_feed_label());
-    }
-    
-    function get_label_plural_user()
-    {
-        return $this->lifestream->__('%s made %s commits.', $this->get_user_label(), $this->_get_show_details_link(), $this->get_feed_label());
+        $repo = $this->feed->get_repository_link($this->event, $this->event->data[0]);
+        if ($repo)
+        {
+            return $this->lifestream->__('Committed %2$s to %3$s.', $this->get_feed_label(), $this->get_single_link(), $repo);
+        }
+        return $this->lifestream->__('Committed %2$s.', $this->get_feed_label(), $this->get_single_link());
+    }
+    
+    function get_label_plural()
+    {
+        $repo = $this->feed->get_repository_link($this->event, $this->event->data[0]);
+        if ($repo)
+        {
+            return $this->lifestream->__('Made %s commits to %3$s.', $this->_get_show_details_link(), $this->get_feed_label(), $repo);
+        }
+        return $this->lifestream->__('Made %s commits to %s.', $this->_get_show_details_link(), $this->get_feed_label());
+    }
+    
+    function get_label_single_user()
+    {
+        $repo = $this->feed->get_repository_link($this->event, $this->event->data[0]);
+        if ($repo)
+        {
+            return $this->lifestream->__('%1$s committed %3$s to %4$s.', $this->get_user_label(), $this->get_feed_label(), $this->get_single_link(), $repo);
+        }
+        return $this->lifestream->__('%1$s committed %3$s', $this->get_user_label(), $this->get_feed_label(), $this->get_single_link());
+    }
+    
+    function get_label_plural_user()
+    {
+        $repo = $this->feed->get_repository_link($this->event, $this->event->data[0]);
+        if ($repo)
+        {
+            return $this->lifestream->__('%s made %s commits to %3$s.', $this->get_user_label(), $this->_get_show_details_link(), $this->get_feed_label(), $repo);
+        }
+        return $this->lifestream->__('%s made %s commits to %s.', $this->get_user_label(), $this->_get_show_details_link(), $this->get_feed_label());
     }
 }

lifestream/trunk/inc/widget.php

@@ -105 +105 @@
             'amount' => 10,
             'title' => 'Lifestream',
+            'break_groups' => false,
+            'feeds' => array(),
+            'hide_metadata' => false,
         );
         $number = '%i%';

lifestream/trunk/pages/add-feed.inc.php

@@ -79 +79 @@
                 <th>&nbsp;</th>
                 <td>
-                    <label><input type="checkbox" name="grouped" id="id_grouped" value="1"<?php if ($_POST['grouped'] == '1') echo ' checked="checked"'; ?>/> <?php $lifestream->_e('Group events from the same day together.'); ?></label>
+                    <label><input type="checkbox" name="grouped" id="id_grouped" value="1"<?php if (isset($_POST['grouped']) && $_POST['grouped'] == '1') echo ' checked="checked"'; ?>/> <?php $lifestream->_e('Group events from the same day together.'); ?></label>
                 </td>
             </tr>