Skip to content

Commit

Permalink
Adding filenames
Browse files Browse the repository at this point in the history
  • Loading branch information
@villanueval
villanueval committed Apr 29, 2024
1 parent 46f0b96 commit 2a31d3d
Show file tree
Hide file tree
Showing 7 changed files with 501 additions and 17 deletions.
153 changes: 151 additions & 2 deletions web_app/app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
import settings


site_ver = "2.7.3"
site_ver = "2.7.4"
site_env = settings.env
site_net = settings.site_net

Expand Down Expand Up @@ -3718,6 +3718,138 @@ def file(file_id=None):
)





# @app.route('/file_iiif/<file_id>/', methods=['GET'], provide_automatic_options=False)
# def file_iiif(file_id=None):
# """File details using TIFY IIIF Viewer"""
# if current_user.is_authenticated:
# user_exists = True
# username = current_user.name
# else:
# user_exists = False
# username = None

# # Declare the login form
# form = LoginForm(request.form)

# # Connect to db
# try:
# conn = pymysql.connect(host=settings.host,
# user=settings.user,
# passwd=settings.password,
# database=settings.database,
# port=settings.port,
# charset='utf8mb4',
# cursorclass=pymysql.cursors.DictCursor,
# autocommit=True)
# cur = conn.cursor()
# except pymysql.Error as e:
# logger.error(e)
# raise InvalidUsage('System error')

# file_id, file_uid = check_file_id(file_id, cur=cur)

# if file_id is None:
# error_msg = "File ID is missing."
# return render_template('error.html', error_msg=error_msg, project_alias=None, site_env=site_env, site_net=site_net, site_ver=site_ver), 400

# folder_info = run_query(
# "SELECT * FROM folders WHERE folder_id IN (SELECT folder_id FROM files WHERE file_id = %(file_id)s)",
# {'file_id': file_id}, cur=cur)
# if len(folder_info) == 0:
# error_msg = "Invalid File ID."
# return render_template('error.html', error_msg=error_msg, project_alias=None, site_env=site_env, site_net=site_net, site_ver=site_ver), 400
# else:
# folder_info = folder_info[0]
# file_details = run_query(("WITH data AS ("
# " SELECT file_id, "
# " CONCAT(%(preview)s, file_id) as preview_image, "
# " preview_image as preview_image_ext, "
# " folder_id, file_name, dams_uan, file_ext"
# " FROM files "
# " WHERE folder_id = %(folder_id)s AND folder_id IN (SELECT folder_id FROM folders)"
# " UNION "
# " SELECT file_id, CONCAT(%(preview)s, file_id) as preview_image, preview_image as preview_image_ext, folder_id, file_name, dams_uan, file_ext "
# " FROM files "
# " WHERE folder_id = %(folder_id)s AND folder_id NOT IN (SELECT folder_id FROM folders)"
# " ORDER BY file_name"
# "),"
# "data2 AS (SELECT file_id, preview_image, file_ext, preview_image_ext, folder_id, file_name, dams_uan, "
# " lag(file_id,1) over (order by file_name) prev_id,"
# " lead(file_id,1) over (order by file_name) next_id "
# " FROM data)"
# " SELECT "
# " file_id, "
# " CASE WHEN position('?' in preview_image)>0 THEN preview_image ELSE CONCAT(preview_image, '?') END AS preview_image, "
# " preview_image_ext, folder_id, file_name, dams_uan, prev_id, next_id, file_ext "
# "FROM data2 WHERE file_id = %(file_id)s LIMIT 1"),
# {'folder_id': folder_info['folder_id'], 'file_id': file_id,
# 'preview': '/preview_image/'}, cur=cur)

# file_details = file_details[0]
# project_alias = run_query(("SELECT COALESCE(project_alias, CAST(project_id AS char)) as project_id FROM projects "
# " WHERE project_id = %(project_id)s"),
# {'project_id': folder_info['project_id']}, cur=cur)[0]
# project_alias = project_alias['project_id']

# file_checks = run_query(("SELECT file_check, check_results, CASE WHEN check_info = '' THEN 'Check passed.' "
# " ELSE check_info END AS check_info "
# " FROM files_checks WHERE file_id = %(file_id)s"),
# {'file_id': file_id}, cur=cur)
# image_url = '/preview_image/' + str(file_id)
# file_metadata = pd.DataFrame(run_query(("SELECT tag, taggroup, tagid, value "
# " FROM files_exif "
# " WHERE file_id = %(file_id)s AND "
# " lower(filetype) = %(file_ext)s AND "
# " lower(taggroup) != 'system' "
# " ORDER BY taggroup, tag "),
# {'file_id': file_id, 'file_ext': file_details['file_ext']}, cur=cur))
# file_links = run_query("SELECT link_name, link_url, link_aria FROM files_links WHERE file_id = %(file_id)s ",
# {'file_id': file_id}, cur=cur)
# file_sensitive = run_query("SELECT sensitive_contents FROM files WHERE file_id = %(file_id)s ",
# {'file_id': file_id}, cur=cur)[0]

# if current_user.is_authenticated:
# user_name = current_user.name
# is_admin = user_perms('', user_type='admin')
# else:
# user_name = ""
# is_admin = False
# logger.info("project_alias: {}".format(project_alias))

# cur.close()
# conn.close()

# # kiosk mode
# kiosk, user_address = kiosk_mode(request, settings.kiosks)

# return render_template('file_iiif.html',
# folder_info=folder_info,
# file_details=file_details,
# file_checks=file_checks,
# username=user_name,
# image_url=image_url,
# is_admin=is_admin,
# project_alias=project_alias,
# tables=[file_metadata.to_html(table_id='file_metadata', index=False, border=0,
# escape=False,
# classes=["display", "compact", "table-striped"])],
# file_metadata_rows=file_metadata.shape[0],
# file_links=file_links,
# file_sensitive=str(file_sensitive['sensitive_contents']),
# form=form,
# site_env=site_env,
# site_net=site_net,
# site_ver=site_ver,
# kiosk=kiosk,
# user_address=user_address,
# analytics_code=settings.analytics_code
# )



@app.route('/file/', methods=['GET'], provide_automatic_options=False)
def file_empty():
return redirect(url_for('homepage'))
Expand Down Expand Up @@ -4629,13 +4761,29 @@ def api_update_project_details(project_alias=None):
'check_results': check_results, 'check_info': check_info}, cur=cur)
elif query_property == "filechecks":
# Add to server side:
# - valid_name
# - dupe_elsewhere
# - md5
folder_id = request.form.get("folder_id")
file_check = request.form.get("file_check")
check_results = query_value
check_info = request.form.get("check_info")
if file_check == 'filename':
query = ("SELECT settings_details FROM projects_settings "
" WHERE project_id = %(project_id)s AND project_setting = 'project_checks' and settings_value = 'filename'")
res = run_query(query, {'project_id': project_id}, cur=cur)
if len(res) == 0:
check_results = 1
check_info = "Query for filename not found"
else:
query = res[0]['settings_details']
res = query_database_insert(query, {'file_id': file_id,}, cur=cur)
logger.info(res)
# Get results for file query
if res[0]['result'] == "1":
check_results = 0
else:
check_results = 1
check_info = res[0]['info']
query = (
"INSERT INTO files_checks (file_id, folder_id, file_check, check_results, check_info, updated_at) "
" VALUES (%(file_id)s, %(folder_id)s, %(file_check)s, %(check_results)s, %(check_info)s, CURRENT_TIME) "
Expand Down Expand Up @@ -5246,6 +5394,7 @@ def get_preview(file_id=None, max=None, sensitive=None):
return send_file("static/na.jpg", mimetype='image/jpeg')



@cache.memoize()
@app.route('/barcode_image/<barcode>/', methods=['GET', 'POST'], provide_automatic_options=False)
def get_barcodeimage(barcode=None):
Expand Down
7 changes: 7 additions & 0 deletions web_app/static/css/tify.css
View file

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions web_app/static/js/tify.js
View file

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion web_app/templates/dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ <h2><span class="badge bg-dark d-flex">Project Details</span></h2>
{% if project_stats_other.other_stat != "0" %}
<p title="{{ project_stats_other.other_name }} in this project" style="font-size: x-large;"><span class="badge bg-warning w-100" style="color: black;">{{project_stats_other.other_icon | safe }} {{ project_stats_other.other_stat }} {{ project_stats_other.other_name }}</span></p>
{% endif %}
<!-- <a href="{{ url_for('proj_statistics', project_alias=project_alias) }}" class="btn btn-info btn-lg text-white w-100" style="font-size:x-large;" role="button"><i class="fa-solid fa-chart-column"></i> Project Statistics</a> -->
{% if project_info.stats_page == 1 %}
<p style="font-size: large;"><a href="{{ url_for('proj_statistics', project_alias=project_alias) }}" class="btn btn-dark btn text-white w-100" role="button"><i class="fa-solid fa-chart-column"></i> Project Statistics</a></p>
{% endif %}
</div>
<div class="col">
<form action="{{ url_for('search_files', project_alias=project_alias) }}" method="GET">
Expand Down
Loading

0 comments on commit 2a31d3d

Please sign in to comment.