diff --git a/warehouse/models.py b/warehouse/models.py index 249f2e4b73b2ed7fdfb7cb01b87619a08e2e3930..866bacce02d920c1ea0df43fd792d73e73acafbb 100644 --- a/warehouse/models.py +++ b/warehouse/models.py @@ -16,8 +16,11 @@ class Photo(db.Model): def from_form(cls, filestorage): obj = cls(mimetype='image/jpeg') db.session.add(obj) + db.session.flush() + assert obj.id obj.path = f'photos/{obj.id}' path = os.path.join(current_app.config['UPLOAD_FOLDER'], obj.path) + assert not os.path.exists(path) filestorage.save(path) return obj @@ -26,9 +29,10 @@ class Photo(db.Model): obj = cls(mimetype='image/jpeg') db.session.add(obj) db.session.flush() + assert obj.id obj.path = f'photos/{obj.id}' path = os.path.join(current_app.config['UPLOAD_FOLDER'], obj.path) - print(path) + assert not os.path.exists(path) with open(path, 'wb') as f: f.write(data) return obj diff --git a/warehouse/utils/ipp.py b/warehouse/utils/ipp.py index 66fb415a942100a971cc657021852cf9680abc8f..1a2ace642a02fe8eca9fd324ae0622b949ee55a0 100644 --- a/warehouse/utils/ipp.py +++ b/warehouse/utils/ipp.py @@ -109,7 +109,6 @@ def ipp_request(uri, operation, *tags, data=b''): conn.close() major_version, minor_version, status, message_id = struct.unpack('>bbhi', resp_data[:8]) # TODO: decode tags/data - print('ipp', status, resp_data[8:]) return status def print_pdf(pdf_data, printer_uri, job_name=None, validate_only=False):