ReverseGeoLocate/reverse-geolocate
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects 1 Releases Wiki Activity

Do double byte special format for all fields where possible

Browse Source 
Not only for path, but also for filename, country, state, city and
location.

There is a possibility that double byte characters are inside, so this
needs to be special formatted too
This commit is contained in:
Clemens Schwaighofer
2018-05-08 10:10:58 +09:00
parent 74f9cfa29b
commit 2b1f9352ff
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bin/reverse_geolocate.py
View File

@@ -983,14 +983,14 @@ if args.read_only:
# 4 {} => final replace: data (2 pre replaces) # 4 {} => final replace: data (2 pre replaces)
# 1 {} => length replace here # 1 {} => length replace here
format_line = " {{{{filename:<{}}}}} | {{{{latitude:>{}}}}} | {{{{longitude:>{}}}}} | {{{{code:<{}}}}} | {{{{country:<{}}}}} | {{{{state:<{}}}}} | {{{{city:<{}}}}} | {{{{location:<{}}}}} | {{{{path:<{}}}}}".format( format_line = " {{{{filename:<{}}}}} | {{{{latitude:>{}}}}} | {{{{longitude:>{}}}}} | {{{{code:<{}}}}} | {{{{country:<{}}}}} | {{{{state:<{}}}}} | {{{{city:<{}}}}} | {{{{location:<{}}}}} | {{{{path:<{}}}}}".format(
format_length['filename'], "{filenamelen}",
format_length['latitude'], format_length['latitude'],
format_length['longitude'], format_length['longitude'],
format_length['code'], format_length['code'],
format_length['country'], "{countrylen}",
format_length['state'], "{statelen}",
format_length['city'], "{citylen}",
format_length['location'], "{locationlen}",
"{pathlen}" # set path len replacer variable "{pathlen}" # set path len replacer variable
) )
# header line format: # header line format:
@@ -1002,7 +1002,14 @@ if args.read_only:
{}'''.format( {}'''.format(
'> Page {page_no:,}/{page_all:,}', # can later be set to something else, eg page numbers '> Page {page_no:,}/{page_all:,}', # can later be set to something else, eg page numbers
# pre replace path length before we add the header titles # pre replace path length before we add the header titles
format_line.format(pathlen=format_length['path']).format( # the header title line format_line.format(
filenamelen=format_length['filename'],
countrylen=format_length['country'],
statelen=format_length['state'],
citylen=format_length['city'],
locationlen=format_length['location'],
pathlen=format_length['path']
).format( # the header title line
filename='File'[:format_length['filename']], filename='File'[:format_length['filename']],
latitude='Latitude'[:format_length['latitude']], latitude='Latitude'[:format_length['latitude']],
longitude='Longitude'[:format_length['longitude']], longitude='Longitude'[:format_length['longitude']],
@@ -1058,7 +1065,12 @@ for xmp_file in work_files:
count['read'] = printHeader(header_line.format(page_no=page_no, page_all=page_all), count['read'], header_repeat) count['read'] = printHeader(header_line.format(page_no=page_no, page_all=page_all), count['read'], header_repeat)
# the data content # the data content
print(format_line.format( print(format_line.format(
# we need to adjust the path length to the folder name if it has double byte characters inside # for all possible non latin fields we do adjust if it has double byte characters inside
filenamelen=formatLen(shortenPath(xmp_file, format_length['filename'], file_only=True), format_length['filename']),
countrylen=formatLen(shortenString(data_set['Country'], width=format_length['country']), format_length['country']),
statelen=formatLen(shortenString(data_set['State'], width=format_length['state']), format_length['state']),
citylen=formatLen(shortenString(data_set['City'], width=format_length['city']), format_length['city']),
locationlen=formatLen(shortenString(data_set['Location'], width=format_length['location']), format_length['location']),
pathlen=formatLen(shortenPath(xmp_file, format_length['path'], path_only=True), format_length['path']) pathlen=formatLen(shortenPath(xmp_file, format_length['path'], path_only=True), format_length['path'])
).format( ).format(
filename=shortenPath(xmp_file, format_length['filename'], file_only=True), # shorten from the left filename=shortenPath(xmp_file, format_length['filename'], file_only=True), # shorten from the left