mirror of
https://github.com/TrentSPalmer/flask_photo_scaling_app.git
synced 2025-04-19 05:22:46 -07:00
Compare commits
No commits in common. "7997202d77217f3fb422f15439eabedef028b287" and "a2de38563860546c21ecc3320806a4b27f287d63" have entirely different histories.
7997202d77
...
a2de385638
@ -26,30 +26,15 @@ def get_exif(img_raw, exif_data):
|
|||||||
if v == "Software":
|
if v == "Software":
|
||||||
exif_data['Software'] = exifdata[k]
|
exif_data['Software'] = exifdata[k]
|
||||||
if v == "DateTime":
|
if v == "DateTime":
|
||||||
exif_data['DateTime'] = datetime.strptime(
|
exif_data['DateTime'] = datetime.strptime(exifdata[k], date_format)
|
||||||
exifdata[k],
|
|
||||||
date_format,
|
|
||||||
)
|
|
||||||
if v == "DateTimeOriginal":
|
if v == "DateTimeOriginal":
|
||||||
exif_data['DateTimeOriginal'] = datetime.strptime(
|
exif_data['DateTimeOriginal'] = datetime.strptime(exifdata[k], date_format)
|
||||||
exifdata[k],
|
|
||||||
date_format,
|
|
||||||
)
|
|
||||||
if v == "DateTimeDigitized":
|
if v == "DateTimeDigitized":
|
||||||
exif_data['DateTimeDigitized'] = datetime.strptime(
|
exif_data['DateTimeDigitized'] = datetime.strptime(exifdata[k], date_format)
|
||||||
exifdata[k],
|
|
||||||
date_format,
|
|
||||||
)
|
|
||||||
if v == "FNumber":
|
if v == "FNumber":
|
||||||
exif_data['fnumber'] = round(
|
exif_data['fnumber'] = round(exifdata[k][0] / exifdata[k][1], 1)
|
||||||
exifdata[k][0] / exifdata[k][1],
|
|
||||||
1,
|
|
||||||
)
|
|
||||||
if v == "DigitalZoomRatio":
|
if v == "DigitalZoomRatio":
|
||||||
exif_data['DigitalZoomRatio'] = round(
|
exif_data['DigitalZoomRatio'] = round(exifdata[k][0] / exifdata[k][1], 2)
|
||||||
exifdata[k][0] / exifdata[k][1],
|
|
||||||
2,
|
|
||||||
)
|
|
||||||
if v == "TimeZoneOffset":
|
if v == "TimeZoneOffset":
|
||||||
exif_data['TimeZoneOffset'] = exifdata[k]
|
exif_data['TimeZoneOffset'] = exifdata[k]
|
||||||
if v == "GPSInfo":
|
if v == "GPSInfo":
|
||||||
@ -57,46 +42,28 @@ def get_exif(img_raw, exif_data):
|
|||||||
for h, i in GPSTAGS.items():
|
for h, i in GPSTAGS.items():
|
||||||
if h in exifdata[k]:
|
if h in exifdata[k]:
|
||||||
if i == 'GPSAltitudeRef':
|
if i == 'GPSAltitudeRef':
|
||||||
gpsinfo['GPSAltitudeRef'] = int.from_bytes(
|
gpsinfo['GPSAltitudeRef'] = int.from_bytes(exifdata[k][h], "big")
|
||||||
exifdata[k][h],
|
|
||||||
"big",
|
|
||||||
)
|
|
||||||
if i == 'GPSAltitude':
|
if i == 'GPSAltitude':
|
||||||
gpsinfo['GPSAltitude'] = round(
|
gpsinfo['GPSAltitude'] = round(exifdata[k][h][0] / exifdata[k][h][1], 3)
|
||||||
exifdata[k][h][0] / exifdata[k][h][1],
|
|
||||||
3,
|
|
||||||
)
|
|
||||||
if i == 'GPSLatitudeRef':
|
if i == 'GPSLatitudeRef':
|
||||||
gpsinfo['GPSLatitudeRef'] = exifdata[k][h]
|
gpsinfo['GPSLatitudeRef'] = exifdata[k][h]
|
||||||
if i == 'GPSLatitude':
|
if i == 'GPSLatitude':
|
||||||
gpsinfo['GPSLatitude'] = calc_coordinate(
|
gpsinfo['GPSLatitude'] = calc_coordinate(exifdata[k][h])
|
||||||
exifdata[k][h],
|
|
||||||
)
|
|
||||||
if i == 'GPSLongitudeRef':
|
if i == 'GPSLongitudeRef':
|
||||||
gpsinfo['GPSLongitudeRef'] = exifdata[k][h]
|
gpsinfo['GPSLongitudeRef'] = exifdata[k][h]
|
||||||
if i == 'GPSLongitude':
|
if i == 'GPSLongitude':
|
||||||
gpsinfo['GPSLongitude'] = calc_coordinate(
|
gpsinfo['GPSLongitude'] = calc_coordinate(exifdata[k][h])
|
||||||
exifdata[k][h],
|
|
||||||
)
|
|
||||||
update_gpsinfo(gpsinfo, exif_data)
|
update_gpsinfo(gpsinfo, exif_data)
|
||||||
|
|
||||||
|
|
||||||
def update_gpsinfo(gpsinfo, exif_data):
|
def update_gpsinfo(gpsinfo, exif_data):
|
||||||
if 'GPSAltitudeRef' in gpsinfo and 'GPSLatitude' in gpsinfo:
|
if 'GPSAltitudeRef' in gpsinfo and 'GPSLatitude' in gpsinfo:
|
||||||
exif_data['GPSAltitude'] = gpsinfo['GPSAltitude']
|
exif_data['GPSAltitude'] = gpsinfo['GPSAltitude']
|
||||||
exif_data['GPSAboveSeaLevel'] = False
|
exif_data['GPSAboveSeaLevel'] = False if gpsinfo['GPSAltitudeRef'] != 0 else True
|
||||||
if gpsinfo['GPSAltitudeRef'] == 0:
|
|
||||||
exif_data['GPSAboveSeaLevel'] = True
|
|
||||||
if 'GPSLatitudeRef' in gpsinfo and 'GPSLatitude' in gpsinfo:
|
if 'GPSLatitudeRef' in gpsinfo and 'GPSLatitude' in gpsinfo:
|
||||||
if gpsinfo['GPSLatitudeRef'] != 'S':
|
exif_data['GPSLatitude'] = gpsinfo['GPSLatitude'] if gpsinfo['GPSLatitudeRef'] != 'S' else 0 - gpsinfo['GPSLatitude']
|
||||||
exif_data['GPSLatitude'] = gpsinfo['GPSLatitude']
|
|
||||||
else:
|
|
||||||
exif_data['GPSLatitude'] = 0 - gpsinfo['GPSLatitude']
|
|
||||||
if 'GPSLongitudeRef' in gpsinfo and 'GPSLongitude' in gpsinfo:
|
if 'GPSLongitudeRef' in gpsinfo and 'GPSLongitude' in gpsinfo:
|
||||||
if gpsinfo['GPSLongitudeRef'] != 'W':
|
exif_data['GPSLongitude'] = gpsinfo['GPSLongitude'] if gpsinfo['GPSLongitudeRef'] != 'W' else 0 - gpsinfo['GPSLongitude']
|
||||||
exif_data['GPSLongitude'] = gpsinfo['GPSLongitude']
|
|
||||||
else:
|
|
||||||
exif_data['GPSLongitude'] = 0 - gpsinfo['GPSLongitude']
|
|
||||||
|
|
||||||
|
|
||||||
def calc_coordinate(x):
|
def calc_coordinate(x):
|
||||||
|
@ -10,28 +10,6 @@ from .get_exif_data import get_exif_data
|
|||||||
def process_uploaded_photo(filename, current_user, app_config):
|
def process_uploaded_photo(filename, current_user, app_config):
|
||||||
crop_photo(filename, app_config['PHOTO_SAVE_PATH'])
|
crop_photo(filename, app_config['PHOTO_SAVE_PATH'])
|
||||||
exif_data = get_exif_data(filename)
|
exif_data = get_exif_data(filename)
|
||||||
|
|
||||||
if 'DateTimeOriginal' in exif_data:
|
|
||||||
my_date_time_original = exif_data['DateTimeOriginal']
|
|
||||||
else:
|
|
||||||
my_date_time_original = None
|
|
||||||
if 'DateTimeDigitized' in exif_data:
|
|
||||||
my_date_time_digitized = exif_data['DateTimeDigitized']
|
|
||||||
else:
|
|
||||||
my_date_time_digitized = None
|
|
||||||
if 'DigitalZoomRatio' in exif_data:
|
|
||||||
my_digital_zoom_ratio = exif_data['DigitalZoomRatio']
|
|
||||||
else:
|
|
||||||
my_digital_zoom_ratio = None
|
|
||||||
if 'TimeZoneOffset' in exif_data:
|
|
||||||
my_timezone_offset = exif_data['TimeZoneOffset']
|
|
||||||
else:
|
|
||||||
my_timezone_offset = None
|
|
||||||
if 'GPSAboveSeaLevel' in exif_data:
|
|
||||||
my_gps_above_sealevel = exif_data['GPSAboveSeaLevel']
|
|
||||||
else:
|
|
||||||
my_gps_above_sealevel = None
|
|
||||||
|
|
||||||
conn = psycopg2.connect(
|
conn = psycopg2.connect(
|
||||||
dbname=app_config['DATABASE_NAME'],
|
dbname=app_config['DATABASE_NAME'],
|
||||||
user=app_config['DATABASE_USER'],
|
user=app_config['DATABASE_USER'],
|
||||||
@ -41,10 +19,7 @@ def process_uploaded_photo(filename, current_user, app_config):
|
|||||||
cur = conn.cursor()
|
cur = conn.cursor()
|
||||||
cur.execute("SELECT setval('photo_id_seq', (SELECT MAX(id) FROM photo))")
|
cur.execute("SELECT setval('photo_id_seq', (SELECT MAX(id) FROM photo))")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
cur.execute(
|
cur.execute("SELECT count(id) FROM photo WHERE photo_name=%s", (filename, ))
|
||||||
"SELECT count(id) FROM photo WHERE photo_name=%s",
|
|
||||||
(filename, ),
|
|
||||||
)
|
|
||||||
if cur.fetchone()[0] == 0:
|
if cur.fetchone()[0] == 0:
|
||||||
sql_statement = "INSERT INTO photo("
|
sql_statement = "INSERT INTO photo("
|
||||||
|
|
||||||
@ -109,14 +84,14 @@ def process_uploaded_photo(filename, current_user, app_config):
|
|||||||
exif_data['Model'] if 'Model' in exif_data else None,
|
exif_data['Model'] if 'Model' in exif_data else None,
|
||||||
exif_data['Software'] if 'Software' in exif_data else None,
|
exif_data['Software'] if 'Software' in exif_data else None,
|
||||||
exif_data['DateTime'] if 'DateTime' in exif_data else None,
|
exif_data['DateTime'] if 'DateTime' in exif_data else None,
|
||||||
my_date_time_original,
|
exif_data['DateTimeOriginal'] if 'DateTimeOriginal' in exif_data else None,
|
||||||
my_date_time_digitized,
|
exif_data['DateTimeDigitized'] if 'DateTimeDigitized' in exif_data else None,
|
||||||
exif_data['fnumber'] if 'fnumber' in exif_data else None,
|
exif_data['fnumber'] if 'fnumber' in exif_data else None,
|
||||||
my_digital_zoom_ratio,
|
exif_data['DigitalZoomRatio'] if 'DigitalZoomRatio' in exif_data else None,
|
||||||
exif_data['AspectRatio'],
|
exif_data['AspectRatio'],
|
||||||
my_timezone_offset,
|
exif_data['TimeZoneOffset'] if 'TimeZoneOffset' in exif_data else None,
|
||||||
exif_data['GPSAltitude'] if 'GPSAltitude' in exif_data else None,
|
exif_data['GPSAltitude'] if 'GPSAltitude' in exif_data else None,
|
||||||
my_gps_above_sealevel,
|
exif_data['GPSAboveSeaLevel'] if 'GPSAboveSeaLevel' in exif_data else None,
|
||||||
exif_data['GPSLatitude'] if 'GPSLatitude' in exif_data else None,
|
exif_data['GPSLatitude'] if 'GPSLatitude' in exif_data else None,
|
||||||
exif_data['GPSLongitude'] if 'GPSLongitude' in exif_data else None,
|
exif_data['GPSLongitude'] if 'GPSLongitude' in exif_data else None,
|
||||||
int(time() * 1000)
|
int(time() * 1000)
|
||||||
@ -170,14 +145,14 @@ def process_uploaded_photo(filename, current_user, app_config):
|
|||||||
exif_data['Model'] if 'Model' in exif_data else None,
|
exif_data['Model'] if 'Model' in exif_data else None,
|
||||||
exif_data['Software'] if 'Software' in exif_data else None,
|
exif_data['Software'] if 'Software' in exif_data else None,
|
||||||
exif_data['DateTime'] if 'DateTime' in exif_data else None,
|
exif_data['DateTime'] if 'DateTime' in exif_data else None,
|
||||||
my_date_time_original,
|
exif_data['DateTimeOriginal'] if 'DateTimeOriginal' in exif_data else None,
|
||||||
my_date_time_digitized,
|
exif_data['DateTimeDigitized'] if 'DateTimeDigitized' in exif_data else None,
|
||||||
exif_data['fnumber'] if 'fnumber' in exif_data else None,
|
exif_data['fnumber'] if 'fnumber' in exif_data else None,
|
||||||
my_digital_zoom_ratio,
|
exif_data['DigitalZoomRatio'] if 'DigitalZoomRatio' in exif_data else None,
|
||||||
exif_data['AspectRatio'],
|
exif_data['AspectRatio'],
|
||||||
my_timezone_offset,
|
exif_data['TimeZoneOffset'] if 'TimeZoneOffset' in exif_data else None,
|
||||||
exif_data['GPSAltitude'] if 'GPSAltitude' in exif_data else None,
|
exif_data['GPSAltitude'] if 'GPSAltitude' in exif_data else None,
|
||||||
my_gps_above_sealevel,
|
exif_data['GPSAboveSeaLevel'] if 'GPSAboveSeaLevel' in exif_data else None,
|
||||||
exif_data['GPSLatitude'] if 'GPSLatitude' in exif_data else None,
|
exif_data['GPSLatitude'] if 'GPSLatitude' in exif_data else None,
|
||||||
exif_data['GPSLongitude'] if 'GPSLongitude' in exif_data else None,
|
exif_data['GPSLongitude'] if 'GPSLongitude' in exif_data else None,
|
||||||
int(time() * 1000),
|
int(time() * 1000),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user