@@ -79,7 +79,7 @@ def preview(response, num_lines=5):
7979def check_version (installed_version ):
8080 log = get_logger (__name__ )
8181 try :
82- r = requests .get ('https://api.github.com/repos/marzzzello /pytr/tags' , timeout = 1 )
82+ r = requests .get ('https://api.github.com/repos/pytr-org /pytr/tags' , timeout = 1 )
8383 except Exception as e :
8484 log .error ('Could not check for a newer version' )
8585 log .debug (str (e ))
@@ -290,7 +290,7 @@ def export_transactions(input_path, output_path, lang='auto'):
290290
291291
292292class Timeline :
293- def __init__ (self , tr ):
293+ def __init__ (self , tr , max_age_timestamp ):
294294 self .tr = tr
295295 self .log = get_logger (__name__ )
296296 self .received_detail = 0
@@ -301,21 +301,20 @@ def __init__(self, tr):
301301 self .num_timelines = 0
302302 self .timeline_events = {}
303303 self .timeline_events_iter = None
304+ self .max_age_timestamp = max_age_timestamp
304305
305- async def get_next_timeline_transactions (self , response = None , max_age_timestamp = 0 ):
306+ async def get_next_timeline_transactions (self , response = None ):
306307 '''
307308 Get timelines transactions and save time in list timelines.
308309 Extract timeline transactions events and save them in list timeline_events
309310
310311 '''
311-
312312 if response is None :
313313 # empty response / first timeline
314- self .log .info ('Awaiting #1 timeline transactions' )
314+ self .log .info ('Subscribing to #1 timeline transactions' )
315315 self .num_timelines = 0
316316 await self .tr .timeline_transactions ()
317317 else :
318- timestamp = response ['items' ][- 1 ]['timestamp' ]
319318 self .num_timelines += 1
320319 # print(json.dumps(response))
321320 self .num_timeline_details += len (response ['items' ])
@@ -324,30 +323,37 @@ async def get_next_timeline_transactions(self, response=None, max_age_timestamp=
324323 self .timeline_events [event ['id' ]] = event
325324
326325 after = response ['cursors' ].get ('after' )
327- if after is None :
328- # last timeline is reached
329- await self .get_next_timeline_activity_log ()
330- else :
326+
327+ last_transaction_time = response ['items' ][- 1 ]['timestamp' ][:19 ]
328+ timestamp = datetime .fromisoformat (last_transaction_time ).timestamp ()
329+ self .log .info (
330+ f'Received #{ self .num_timelines :<2} { last_transaction_time }
331+ )
332+ if (after is not None ) and ((self .max_age_timestamp == 0 ) or (timestamp >= self .max_age_timestamp )):
331333 self .log .info (
332- f'Received # { self . num_timelines :<2 } timeline transactions, awaiting #{ self .num_timelines + 1 :<2}
334+ f'Subscribing #{ self .num_timelines + 1 :<2}
333335 )
334- await self .tr .timeline_transactions (after )
336+ await self .tr .timeline_transactions (after )
337+ else :
338+ # last timeline is reached
339+ self .log .info ('Received last relevant timeline transaction' )
340+ await self .get_next_timeline_activity_log ()
335341
336342
337- async def get_next_timeline_activity_log (self , response = None , max_age_timestamp = 0 ):
343+ async def get_next_timeline_activity_log (self , response = None ):
338344 '''
339345 Get timelines acvtivity log and save time in list timelines.
340346 Extract timeline acvtivity log events and save them in list timeline_events
341347
342348 '''
343-
344349 if response is None :
345350 # empty response / first timeline
346351 self .log .info ('Awaiting #1 timeline activity log' )
347352 self .num_timelines = 0
348353 await self .tr .timeline_activity_log ()
349354 else :
350- timestamp = datetime .fromisoformat (response ['items' ][- 1 ]['timestamp' ][:19 ]).timestamp ()
355+ last_transaction_time = response ['items' ][- 1 ]['timestamp' ][:19 ]
356+ timestamp = datetime .fromisoformat (last_transaction_time ).timestamp ()
351357 self .num_timelines += 1
352358 # print(json.dumps(response))
353359 self .num_timeline_details += len (response ['items' ])
@@ -357,49 +363,26 @@ async def get_next_timeline_activity_log(self, response=None, max_age_timestamp=
357363 self .timeline_events [event ['id' ]] = event
358364
359365 after = response ['cursors' ].get ('after' )
360- if after is None :
361- # last timeline is reached
362- self .log .info (f'Received #{ self .num_timelines :<2} )
363- self .timeline_events_iter = iter (self .timeline_events .values ())
364- await self ._get_timeline_details (5 )
365- elif max_age_timestamp != 0 and timestamp < max_age_timestamp :
366- self .log .info (f'Received #{ self .num_timelines + 1 :<2} )
367- self .log .info ('Reached last relevant timeline activity log' )
368- self .timeline_events_iter = iter (self .timeline_events .values ())
369- await self ._get_timeline_details (5 , max_age_timestamp = max_age_timestamp )
370- else :
366+ self .log .info (f'Received #{ self .num_timelines :<2} { last_transaction_time } )
367+ if (after is not None ) and ((self .max_age_timestamp == 0 ) or (timestamp >= self .max_age_timestamp )):
371368 self .log .info (
372- f'Received # { self . num_timelines :<2 } timeline activity log, awaiting #{ self .num_timelines + 1 :<2}
369+ f'Subscribing #{ self .num_timelines + 1 :<2}
373370 )
374371 await self .tr .timeline_activity_log (after )
372+ else :
373+ self .log .info ('Received last relevant timeline activity log' )
374+ await self ._get_timeline_details ()
375375
376- async def _get_timeline_details (self , num_torequest , max_age_timestamp = 0 ):
376+ async def _get_timeline_details (self ):
377377 '''
378378 request timeline details
379379 '''
380- while num_torequest > 0 :
381-
382- try :
383- event = next (self .timeline_events_iter )
384- except StopIteration :
385- self .log .info ('All timeline details requested' )
386- return False
387-
380+ for event in self .timeline_events .values ():
388381 action = event .get ('action' )
389- # icon = event.get('icon')
390382 msg = ''
391383 timestamp_field = datetime .fromisoformat (event ['timestamp' ][:19 ]).timestamp ()
392- if max_age_timestamp != 0 and timestamp_field > max_age_timestamp :
384+ if self . max_age_timestamp != 0 and ( timestamp_field < self . max_age_timestamp ) :
393385 msg += 'Skip: too old'
394- # elif icon is None:
395- # pass
396- # elif icon.endswith('/human.png'):
397- # msg += 'Skip: human'
398- # elif icon.endswith('/CashIn.png'):
399- # msg += 'Skip: CashIn'
400- # elif icon.endswith('/ExemptionOrderChanged.png'):
401- # msg += 'Skip: ExemptionOrderChanged'
402-
403386 elif action is None :
404387 if event .get ('actionLabel' ) is None :
405388 msg += 'Skip: no action'
@@ -416,11 +399,12 @@ async def _get_timeline_details(self, num_torequest, max_age_timestamp=0):
416399 self .num_timeline_details -= 1
417400 continue
418401
419- num_torequest -= 1
420402 self .requested_detail += 1
421403 await self .tr .timeline_detail_v2 (event ['id' ])
404+ self .log .info ('All timeline details requested' )
405+ return False
422406
423- async def timelineDetail (self , response , dl , max_age_timestamp = 0 ):
407+ async def timelineDetail (self , response , dl ):
424408 '''
425409 process timeline response and request timelines
426410 '''
@@ -429,26 +413,15 @@ async def timelineDetail(self, response, dl, max_age_timestamp=0):
429413 event = self .timeline_events [response ['id' ]]
430414 event ['details' ] = response
431415
432- # when all requested timeline events are received request 5 new
433- if self .received_detail == self .requested_detail :
434- remaining = len (self .timeline_events )
435- if remaining < 5 :
436- await self ._get_timeline_details (remaining )
437- else :
438- await self ._get_timeline_details (5 )
439-
440- isSavingsPlan = (event ["eventType" ] == "SAVINGS_PLAN_EXECUTED" )
441-
442- if not isSavingsPlan and event ['subtitle' ] is not None :
443- isSavingsPlan = 'Sparplan' in event ['subtitle' ]
444-
416+ is_savings_plan = (event ["eventType" ] == "SAVINGS_PLAN_EXECUTED" )
417+
445418 max_details_digits = len (str (self .num_timeline_details ))
446419 self .log .info (
447420 f"{ self .received_detail :>{max_details_digits }} { self .num_timeline_details }
448- + f"{ event ['title' ]} { event ['subtitle' ]} [ { event [ 'eventType' ] } ] "
421+ + f"{ event ['title' ]} { event ['subtitle' ]}
449422 )
450423
451- if isSavingsPlan :
424+ if is_savings_plan :
452425 subfolder = 'Sparplan'
453426 else :
454427 subfolder = {
@@ -462,14 +435,12 @@ async def timelineDetail(self, response, dl, max_age_timestamp=0):
462435 for section in response ['sections' ]:
463436 if section ['type' ] != 'documents' :
464437 continue
465-
466438 for doc in section ['data' ]:
467439 try :
468- timestamp = datetime .strptime (doc ['detail' ], '%d.%m.%Y' ).timestamp () * 1000
440+ timestamp = datetime .strptime (doc ['detail' ], '%d.%m.%Y' ).timestamp ()
469441 except (ValueError , KeyError ):
470- timestamp = datetime .now ().timestamp () * 1000
471- if max_age_timestamp == 0 or max_age_timestamp < timestamp :
472- # save all savingsplan documents in a subdirectory
442+ timestamp = datetime .now ().timestamp ()
443+ if self .max_age_timestamp == 0 or self .max_age_timestamp < timestamp :
473444 title = f"{ doc ['title' ]} { event ['title' ]}
474445 if event ['eventType' ] in ["ACCOUNT_TRANSFER_INCOMING" , "ACCOUNT_TRANSFER_OUTGOING" , "CREDIT" ]:
475446 title += f" - { event ['subtitle' ]}
0 commit comments