Fix naming conflict by renaming global jobs to job_queue
This commit is contained in:
1 parent
cc5f353992
commit
1d9c9c7954
1 file changed
+10
-11
+10
-11
@@ -35,7 +35,7 @@ microsoft = oauth.register(
|
|||||||
ALLOWED_EXTENSIONS = {'pdf', 'zip'}
|
ALLOWED_EXTENSIONS = {'pdf', 'zip'}
|
||||||
|
|
||||||
# Global jobs storage (in production, use database)
|
# Global jobs storage (in production, use database)
|
||||||
jobs = {}
|
job_queue = {}
|
||||||
|
|
||||||
def login_required(f):
|
def login_required(f):
|
||||||
@wraps(f)
|
@wraps(f)
|
||||||
@@ -62,7 +62,7 @@ def extract_names_from_pdf(pdf_path):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
def process_job(job_id, files):
|
def process_job(job_id, files):
|
||||||
jobs[job_id]['status'] = 'processing'
|
job_queue[job_id]['status'] = 'processing'
|
||||||
processed_files = []
|
processed_files = []
|
||||||
temp_extract_dirs = []
|
temp_extract_dirs = []
|
||||||
|
|
||||||
@@ -116,12 +116,12 @@ def process_job(job_id, files):
|
|||||||
with zipfile.ZipFile(zip_output, 'w') as zip_out:
|
with zipfile.ZipFile(zip_output, 'w') as zip_out:
|
||||||
for _, rel_name, full_path in successful_files:
|
for _, rel_name, full_path in successful_files:
|
||||||
zip_out.write(full_path, rel_name)
|
zip_out.write(full_path, rel_name)
|
||||||
jobs[job_id]['zip_path'] = zip_output
|
job_queue[job_id]['zip_path'] = zip_output
|
||||||
jobs[job_id]['zip_name'] = f'renamed_{job_id}.zip'
|
job_queue[job_id]['zip_name'] = f'renamed_{job_id}.zip'
|
||||||
|
|
||||||
jobs[job_id]['status'] = 'completed'
|
job_queue[job_id]['status'] = 'completed'
|
||||||
jobs[job_id]['processed_files'] = processed_files
|
job_queue[job_id]['processed_files'] = processed_files
|
||||||
jobs[job_id]['skipped'] = [p[1] for p in processed_files if p[0] == 'skipped']
|
job_queue[job_id]['skipped'] = [p[1] for p in processed_files if p[0] == 'skipped']
|
||||||
|
|
||||||
@app.route('/login')
|
@app.route('/login')
|
||||||
def login():
|
def login():
|
||||||
@@ -222,7 +222,7 @@ def upload_files():
|
|||||||
return redirect(url_for('upload_files'))
|
return redirect(url_for('upload_files'))
|
||||||
|
|
||||||
job_id = str(uuid.uuid4())
|
job_id = str(uuid.uuid4())
|
||||||
jobs[job_id] = {
|
job_queue[job_id] = {
|
||||||
'status': 'queued',
|
'status': 'queued',
|
||||||
'files': [],
|
'files': [],
|
||||||
'zip_path': None,
|
'zip_path': None,
|
||||||
@@ -239,7 +239,7 @@ def upload_files():
|
|||||||
file.save(filepath)
|
file.save(filepath)
|
||||||
file_list.append({'name': filename, 'path': filepath})
|
file_list.append({'name': filename, 'path': filepath})
|
||||||
|
|
||||||
jobs[job_id]['files'] = file_list
|
job_queue[job_id]['files'] = file_list
|
||||||
|
|
||||||
# Start processing in background
|
# Start processing in background
|
||||||
thread = threading.Thread(target=process_job, args=(job_id, file_list))
|
thread = threading.Thread(target=process_job, args=(job_id, file_list))
|
||||||
@@ -290,7 +290,6 @@ def upload_files():
|
|||||||
@app.route('/jobs')
|
@app.route('/jobs')
|
||||||
@login_required
|
@login_required
|
||||||
def jobs():
|
def jobs():
|
||||||
global jobs
|
|
||||||
return render_template_string('''
|
return render_template_string('''
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
@@ -347,7 +346,7 @@ def jobs():
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
''', jobs=jobs)
|
''', jobs=job_queue)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
app.run(debug=True, port=3000)
|
app.run(debug=True, port=3000)
|
||||||
Reference in new issue
Block a user