TimeTracker/TimeTracker.py

changeset 94
a3d936304e51
parent 93
7ffe7ae4947d
child 98
693e42176007
diff -r 7ffe7ae4947d -r a3d936304e51 TimeTracker/TimeTracker.py
--- a/TimeTracker/TimeTracker.py	Sun Apr 25 17:13:50 2021 +0200
+++ b/TimeTracker/TimeTracker.py	Sun Apr 25 17:29:38 2021 +0200
@@ -179,11 +179,11 @@
         """
         if not filePath:
             filePath = self.__trackerFilePath
-        if ids:
-            entriesList = [self.__entries[eid] for eid in ids
-                           if eid in self.__entries]
-        else:
-            entriesList = self.__entries.values()
+        entriesList = (
+            [self.__entries[eid] for eid in ids if eid in self.__entries]
+            if ids else
+            self.__entries.values()
+        )
         try:
             with open(filePath, "w", encoding="utf-8") as f:
                 for entry in entriesList:
@@ -236,14 +236,14 @@
                     entries.remove(entry)
                     duplicateCount += 1
         
-        if len(self.__entries.keys()):
-            nextID = max(self.__entries.keys()) + 1
-        else:
-            nextID = 0
-        for entry in entries:
+        start = (
+            max(self.__entries.keys()) + 1
+            if len(self.__entries.keys()) else
+            0
+        )
+        for nextID, entry in enumerate(entries, start=start):
             entry.setID(nextID)
             self.__entries[nextID] = entry
-            nextID += 1
         
         if self.__plugin.getPreferences("AutoSave"):
             self.saveTrackerEntries()
@@ -298,10 +298,11 @@
         if duration < self.__plugin.getPreferences("MinimumDuration"):
             return
         
-        if len(self.__entries.keys()):
-            nextID = max(self.__entries.keys()) + 1
-        else:
-            nextID = 0
+        nextID = (
+            max(self.__entries.keys()) + 1
+            if len(self.__entries.keys()) else
+            0
+        )
         
         from .TimeTrackEntry import TimeTrackEntry
         
@@ -411,11 +412,9 @@
                 entries[dt] = entry
         
         self.__entries = {}
-        nextID = 0
-        for entry in sorted(entries.values()):
+        for nextID, entry in enumerate(sorted(entries.values())):
             entry.setID(nextID)
             self.__entries[nextID] = entry
-            nextID += 1
         
         if self.__plugin.getPreferences("AutoSave"):
             self.saveTrackerEntries()
@@ -441,11 +440,9 @@
                 entries[dt] = entry
         
         self.__entries = {}
-        nextID = 0
-        for entry in sorted(entries.values()):
+        for nextID, entry in enumerate(sorted(entries.values())):
             entry.setID(nextID)
             self.__entries[nextID] = entry
-            nextID += 1
         
         if self.__plugin.getPreferences("AutoSave"):
             self.saveTrackerEntries()

eric ide

mercurial