From fae737ac77f05460661a653451fb0b5a55b9d1a1 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 25 Jul 2008 12:47:24 +0000
Subject: [PATCH] Move code extracting job ID into function
It might come in handy at some point and makes the code a bit easier
to read.
Reviewed-by: iustinp
---
lib/jqueue.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/lib/jqueue.py b/lib/jqueue.py
index 4d31b8390..46219c08b 100644
--- a/lib/jqueue.py
+++ b/lib/jqueue.py
@@ -431,6 +431,13 @@ class DiskJobStorage(JobStorageBase):
def _GetArchivedJobPath(self, job_id):
return os.path.join(constants.JOB_QUEUE_ARCHIVE_DIR, "job-%s" % job_id)
+ def _ExtractJobID(self, name):
+ m = self._RE_JOB_FILE.match(name)
+ if m:
+ return m.group(1)
+ else:
+ return None
+
def _GetJobIDsUnlocked(self, archived=False):
"""Return all known job IDs.
@@ -442,9 +449,7 @@ class DiskJobStorage(JobStorageBase):
extra IDs).
"""
- jfiles = self._ListJobFiles()
- jlist = [m.group(1) for m in
- [self._RE_JOB_FILE.match(name) for name in jfiles]]
+ jlist = [self._ExtractJobID(name) for name in self._ListJobFiles()]
jlist.sort()
return jlist
--
GitLab