Commander1024/radiation-tagger
Commander1024
/
radiation-tagger
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Made code better readable. 

Added verbose instance attributes.
This commit is contained in:
Marcus Scholz 2020-03-21 19:05:27 +01:00
parent 3e5cfcf327
commit 59b94991d0
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
functions.py
View File

@ -59,10 +59,11 @@ class Photo:
def __init__(self, photo, local_timezone, dest_dir, dry_run): def __init__(self, photo, local_timezone, dest_dir, dry_run):
self.get_date = self._get_creation_date(photo, local_timezone) self.get_date = self._get_creation_date(photo, local_timezone)
self.get_target_photo = self._copy_photo(photo, dest_dir, dry_run) self.get_photo_filename = self._copy_photo(photo, dest_dir, dry_run)[1]
self.get_photo_basename = self._copy_photo(photo, dest_dir, dry_run)[0]
def __repr__(self): def __repr__(self):
return 'Photo: %s Creation Date: %s' % (str(self.get_target_photo), str(self.get_date)) return 'Photo: %s Creation Date: %s' % (str(self.get_photo_basename), str(self.get_date))
def _copy_photo(self, photo, dest_dir, dry_run): def _copy_photo(self, photo, dest_dir, dry_run):
# Determine where to work on photo and copy it there if needed. # Determine where to work on photo and copy it there if needed.
@ -106,22 +107,26 @@ class Match:
''' '''
def __init__(self, photo_time, radiation_list, position_list): def __init__(self, photo_time, radiation_list, position_list):
self.radiation = self._find_radiation_match(photo_time, radiation_list) self.radiation_value = self._find_radiation_match(photo_time, radiation_list)[1]
self.position = self._find_position_match(photo_time, position_list) self.radiation_delta = self._find_radiation_match(photo_time, radiation_list)[0]
self.position_delta = self._find_position_match(photo_time, position_list)[0]
self.position_latitude = self._find_position_match(photo_time, position_list)[1][1]
self.position_longitude = self._find_position_match(photo_time, position_list)[1][2]
self.position_altitude = self._find_position_match(photo_time, position_list)[1][3]
def __repr__(self): def __repr__(self):
if self.radiation[1]: if self.radiation_value:
radiation = round(self.radiation[1], 2) radiation = round(self.radiation_value, 2)
else: else:
radiation = None radiation = None
if self.position[1][3]: if self.position_altitude:
altitude = round(self.position[1][3]) altitude = round(self.position_altitude)
else: else:
altitude = None altitude = None
return 'Radiation: %s µS/h (Δt %s) \nPosition: Lat: %s, Long: %s, Alt: %sm (Δt %s)' % \ return 'Radiation: %s µS/h (Δt %s) \nPosition: Lat: %s, Long: %s, Alt: %sm (Δt %s)' % \
(str(radiation), str(self.radiation[0]), str(self.position[1][1]), \ (str(radiation), str(self.radiation_delta), str(self.position_latitude), \
str(self.position[1][2]), altitude, str(self.position[0])) str(self.position_longitude), altitude, str(self.position_delta))
def _find_radiation_match(self, photo_time, list): def _find_radiation_match(self, photo_time, list):
valuelist = [] valuelist = []

8
rad_tag.py
View File

@ -96,10 +96,10 @@ for src_photo in args.photos:
match = Match(photo.get_date, radiation_list, position_list) match = Match(photo.get_date, radiation_list, position_list)
# Formatted output: # Formatted output:
data = Output(match.radiation[1], match.position[1][1], match.position[1][2], match.position[1][3]) data = Output(match.radiation_value, match.position_latitude, match.position_longitude, match.position_altitude)
print('{:<15} {:<25} {:<22}'.format(photo.get_target_photo[0], str(photo.get_date), str(data))) print('{:<15} {:<25} {:<22}'.format(photo.get_photo_basename, str(photo.get_date), str(data)))
#print(match) #print(match)
# Write exif data # Write exif data
Exif(photo.get_target_photo[1], args.dry, match.radiation[1], Exif(photo.get_photo_filename, args.dry, match.radiation_value,
match.position[1][1], match.position[1][2], match.position[1][3]) match.position_latitude, match.position_longitude, match.position_altitude)