#136 Small fixes in the feed and the GitHub PR widgets
Merged 7 years ago by pingou. Opened 7 years ago by pingou.
pingou/fedora-hubs misc_fixes  into  develop

file modified
+4 -1
@@ -74,7 +74,10 @@ 

      matches = []

      preference = get_remote_preference(username, fmn_context)

      if preference:

-         preference = rehydrate_preference(preference)

+         try:

+             preference = rehydrate_preference(preference)

+         except ImportError:

+             pass

  

          # The smaller we make this, the faster it is.

          delta = datetime.timedelta(days=365)

file modified
+17 -14
@@ -27,21 +27,24 @@ 

            help="Github Organization or username")

  def data(session, widget, display_number, organization):

      log.info("Getting GH prs for %r, (%r)" % (organization, display_number))

-     token = config['github.oauth_token']

+     token = config.get('github.oauth_token')

      org = organization

-     repos = hubs.utils.github_repos(token, org)

-     pulls = sum([

-         list(hubs.utils.github_pulls(token, org, repo))

-         for repo in repos

-     ], [])

-     # Reverse-sort by time (newest-first)

-     pulls.sort(lambda a, b: cmp(b['timestamp'], a['timestamp']))

- 

-     # Some hints for display

-     display_number = min(display_number, len(pulls))

-     more = len(pulls) - display_number

-     if more < 0:

-         more = 0

+     pulls = []

+     display_number = 0

+     more = 0

+     if token:

+         repos = hubs.utils.github_repos(token, org)

+         pulls = sum([

+             list(hubs.utils.github_pulls(token, org, repo))

+             for repo in repos

+         ], [])

+         # Reverse-sort by time (newest-first)

+         pulls.sort(lambda a, b: cmp(b['timestamp'], a['timestamp']))

+ 

+         # Some hints for display

+         len_pulls = len(pulls)

+         display_number = min(display_number, len_pulls)

+         more = max(len_pulls - display_number, 0)

  

      return dict(

          organization=org,

no initial comment

One liner suggestion here:
more = max(len(pulls) - display_number, 0)

Also we can calculate len(pulls) once and store it.

Nice idea for the max and indeed for the length, I'll fix it as otherwise we'll forget it

Pull-Request has been updated

7 years ago

Pull-Request has been merged by pingou

7 years ago