Revert "Enriched class comments with arguments and return values."

This reverts commit 8ea6524238.

I'm stupid, and deleted the wrong file. Fixed it.
This commit is contained in:
2020-03-14 17:32:29 +01:00
parent da09323380
commit ce65eb4cee
3 changed files with 117 additions and 180 deletions

View File

@@ -10,20 +10,7 @@ from fractions import Fraction
import pyexiv2
class Radiation:
'''
Reiceives Values vom CSV file and creates a list of the relevant data
Arguments:
timestamp: Date/time string from CSV as string
radiation: Radiation from CSV in CP/M as float
local_timezone: timezone for timezone-unware CSV / Photo, if GPX is timezone aware
si_factor: CP/M to (µS/h) conversion factor - specific to GMC-tube
Returns:
timestamp: timestamp of CSV value als datetime object
radiation: radiation in µS/h as str (for Exif comment, UTF-8)
'''
''' Handles CSV processing. '''
def __init__(self, timestamp, radiation, local_timezone, si_factor):
self.timestamp = self._time_conversion(timestamp, local_timezone)
self.radiation = self._radiation_conversion(radiation, si_factor)
@@ -43,20 +30,7 @@ class Radiation:
return radiation
class Photo:
'''
Reads Exif metadata.
Arguments:
photo: source photo ()
local_timezone: timezone for timezone-unware CSV / Photo, if GPX is timezone aware
dest_dir: destination directory where the photo is going to be copied to.
dry_run: whether to acutally write (True / False)
Returns:
self.get_date: timestamp of photo als datetime object
self.get_target_photo: full path to photo file to work on
'''
''' Reads and writes Exif metadata. '''
def __init__(self, photo, local_timezone, dest_dir, dry_run):
self.get_date = self._get_creation_date(photo, local_timezone)
self.get_target_photo = self._copy_photo(photo, dest_dir, dry_run)
@@ -83,6 +57,7 @@ class Photo:
# Load Exif data from photo
metadata = pyexiv2.ImageMetadata(photo)
metadata.read()
print(metadata)
date = metadata['Exif.Photo.DateTimeOriginal']
# date.value creates datetime object in pic_naive_time
pic_naive_time = date.value
@@ -91,8 +66,7 @@ class Photo:
return pic_aware_time
class Exif:
'''
Converts, compiles and writes Exif-Tags from given arguemnts.
''' Converts, compiles and writes Exif-Tags from given values.
Arguments:
photo: file name of photo to modify
@@ -101,18 +75,14 @@ class Exif:
longitude: longitude as float
elevation: elevation as float
dry_run: whether to acutally write (True / False)
Returns:
Latitude / Longitude in degrees
Exif-Comment that has been written (incl. radiation)
'''
def __init__(self, photo, radiation, latitude, longitude, elevation, dry_run):
self.write_exif = self._write_exif(photo, radiation, latitude,
longitude, elevation, dry_run)
# self.get_degree = self._to_degree(value, loc)
self.write_exif = self._write_exif(photo, radiation, latitude, longitude, elevation, dry_run)
def __repr__(self):
return 'Position: %s, %s: %s ' % self.write_exif
# def __repr__(self):
# return 'Photo: %s Creation Date: %s' % (str(self.get_target_photo), str(self.get_date))
def _to_degree(self, value, loc):
if value < 0:
@@ -136,6 +106,9 @@ class Exif:
latitude_degree = self._to_degree(latitude, ["S", "N"])
longitude_degree = self._to_degree(longitude, ["W", "E"])
print(latitude_degree)
print(longitude_degree)
# convert decimal coordinates into fractions required for pyexiv2
exiv2_latitude = (Fraction(latitude_degree[0] * 60 + latitude_degree[1], 60),
Fraction(int(round(latitude_degree[2] * 100, 0)), 6000),
@@ -159,8 +132,10 @@ class Exif:
metadata['Exif.GPSInfo.GPSVersionID'] = '2 0 0 0'
metadata['Exif.Photo.UserComment'] = new_comment
print(new_comment)
# Write Exif tags to file, if not in dry-run mode
if dry_run is not True:
metadata.write()
return latitude_degree, longitude_degree, new_comment
return new_comment