diff --git a/week5/app.py b/week5/app.py index 724bbd4..403a844 100644 --- a/week5/app.py +++ b/week5/app.py @@ -5,6 +5,8 @@ from flask import request, redirect from flask import render_template import glob import os +from shutil import copyfile +from datetime import datetime UPLOAD_FOLDER = os.path.join("static", "img") ALLOWED_EXTENSIONS = {'txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'} @@ -69,7 +71,11 @@ def upload_file(): @app.route('/image/static/img/') def zoomedimage(imgpath): print (imgpath) - return render_template("zoomreplace.html", image=imgpath) + # list the files in imgpath[0:2], pass them to template + images = glob.glob('./static/img/' + imgpath[0:2] + '/*.png') + images.sort(reverse=True) + print(images) + return render_template("zoomreplace.html", image=imgpath, images=images) @app.route('/upload2/', methods=['POST']) def upload2_file(image): @@ -91,5 +97,17 @@ def upload2_file(image): cmd = f"convert { input_file_path } { overwritten_file_path }" os.system(cmd) + # save it in the main folder with the number as the name file.save(overwritten_file_path) + + # and save it in the folder with the date as the name + number_folder = image[0:2] + datething = str(datetime.now()).replace(":", "").replace(" ", "").replace("-", "").replace(".", "") + print(datething) + memory_file_path = os.path.join(app.config['UPLOAD_FOLDER'],number_folder, datething + ".png") + + print(memory_file_path) + # tempfile.save(memory_file_path) + copyfile(overwritten_file_path, memory_file_path) + return redirect("/") diff --git a/week5/folders.py b/week5/folders.py new file mode 100644 index 0000000..df4cc76 --- /dev/null +++ b/week5/folders.py @@ -0,0 +1,4 @@ +import os + +for number in range(100): + os.mkdir("./static/img/" + f"{number:02d}") \ No newline at end of file diff --git a/week5/static/img/00.png b/week5/static/img/00.png index 751ab1f..35c284f 100644 Binary files a/week5/static/img/00.png and b/week5/static/img/00.png differ diff --git a/week5/static/img/01.png b/week5/static/img/01.png index 69c3771..79d9656 100644 Binary files a/week5/static/img/01.png and b/week5/static/img/01.png differ diff --git a/week5/static/img/02.png b/week5/static/img/02.png index 90c2ee4..e8f8feb 100644 Binary files a/week5/static/img/02.png and b/week5/static/img/02.png differ diff --git a/week5/static/img/03.png b/week5/static/img/03.png index 9338791..898ad2d 100644 Binary files a/week5/static/img/03.png and b/week5/static/img/03.png differ diff --git a/week5/static/img/04.png b/week5/static/img/04.png index 7fe1190..d686846 100644 Binary files a/week5/static/img/04.png and b/week5/static/img/04.png differ diff --git a/week5/static/img/05.png b/week5/static/img/05.png index 12de203..dac338e 100644 Binary files a/week5/static/img/05.png and b/week5/static/img/05.png differ diff --git a/week5/static/img/06.png b/week5/static/img/06.png index 78374e3..7017c0d 100644 Binary files a/week5/static/img/06.png and b/week5/static/img/06.png differ diff --git a/week5/static/img/07.png b/week5/static/img/07.png index 78f2315..72ff332 100644 Binary files a/week5/static/img/07.png and b/week5/static/img/07.png differ diff --git a/week5/static/img/08.png b/week5/static/img/08.png index 2e86a25..5c4739b 100644 Binary files a/week5/static/img/08.png and b/week5/static/img/08.png differ diff --git a/week5/static/img/09.png b/week5/static/img/09.png index 6e0b3b0..84f394c 100644 Binary files a/week5/static/img/09.png and b/week5/static/img/09.png differ diff --git a/week5/static/img/10.png b/week5/static/img/10.png index d170a49..b4cb799 100644 Binary files a/week5/static/img/10.png and b/week5/static/img/10.png differ diff --git a/week5/static/img/11.png b/week5/static/img/11.png index b7c3a7b..cdc5965 100644 Binary files a/week5/static/img/11.png and b/week5/static/img/11.png differ diff --git a/week5/static/img/12.png b/week5/static/img/12.png index a31780c..d0692a8 100644 Binary files a/week5/static/img/12.png and b/week5/static/img/12.png differ diff --git a/week5/static/img/13.png b/week5/static/img/13.png index f31fe94..8e06f52 100644 Binary files a/week5/static/img/13.png and b/week5/static/img/13.png differ diff --git a/week5/static/img/14.png b/week5/static/img/14.png index ef8b22a..de6403e 100644 Binary files a/week5/static/img/14.png and b/week5/static/img/14.png differ diff --git a/week5/static/img/15.png b/week5/static/img/15.png index 6b0b0e7..fbed87e 100644 Binary files a/week5/static/img/15.png and b/week5/static/img/15.png differ diff --git a/week5/static/img/16.png b/week5/static/img/16.png index c77360b..a03a783 100644 Binary files a/week5/static/img/16.png and b/week5/static/img/16.png differ diff --git a/week5/static/img/17.png b/week5/static/img/17.png index d683c47..63c2c24 100644 Binary files a/week5/static/img/17.png and b/week5/static/img/17.png differ diff --git a/week5/static/img/18.png b/week5/static/img/18.png index 1a73184..1b03682 100644 Binary files a/week5/static/img/18.png and b/week5/static/img/18.png differ diff --git a/week5/static/img/19.png b/week5/static/img/19.png index 813426a..d359c6b 100644 Binary files a/week5/static/img/19.png and b/week5/static/img/19.png differ diff --git a/week5/static/img/20.png b/week5/static/img/20.png index 400f583..e2bae67 100644 Binary files a/week5/static/img/20.png and b/week5/static/img/20.png differ diff --git a/week5/static/img/21.png b/week5/static/img/21.png index 7af1b8d..78b70b3 100644 Binary files a/week5/static/img/21.png and b/week5/static/img/21.png differ diff --git a/week5/static/img/22.png b/week5/static/img/22.png index dbc2294..f9d12c9 100644 Binary files a/week5/static/img/22.png and b/week5/static/img/22.png differ diff --git a/week5/static/img/23.png b/week5/static/img/23.png index 74166a1..a3cea86 100644 Binary files a/week5/static/img/23.png and b/week5/static/img/23.png differ diff --git a/week5/static/img/24.png b/week5/static/img/24.png index 3672bb5..8d60334 100644 Binary files a/week5/static/img/24.png and b/week5/static/img/24.png differ diff --git a/week5/static/img/25.png b/week5/static/img/25.png index 135ba5f..9443415 100644 Binary files a/week5/static/img/25.png and b/week5/static/img/25.png differ diff --git a/week5/static/img/26.png b/week5/static/img/26.png index 6b8b6a0..c0515ee 100644 Binary files a/week5/static/img/26.png and b/week5/static/img/26.png differ diff --git a/week5/static/img/27.png b/week5/static/img/27.png index 79eb6e3..c93e966 100644 Binary files a/week5/static/img/27.png and b/week5/static/img/27.png differ diff --git a/week5/static/img/28.png b/week5/static/img/28.png index 0b2a3e2..e8cc670 100644 Binary files a/week5/static/img/28.png and b/week5/static/img/28.png differ diff --git a/week5/static/img/29.png b/week5/static/img/29.png index 72969ef..3128dac 100644 Binary files a/week5/static/img/29.png and b/week5/static/img/29.png differ diff --git a/week5/static/img/30.png b/week5/static/img/30.png index abda4a1..40857c5 100644 Binary files a/week5/static/img/30.png and b/week5/static/img/30.png differ diff --git a/week5/static/img/31.png b/week5/static/img/31.png index ca03a4c..3f42fb4 100644 Binary files a/week5/static/img/31.png and b/week5/static/img/31.png differ diff --git a/week5/static/img/32.png b/week5/static/img/32.png index c0125d3..490b1d8 100644 Binary files a/week5/static/img/32.png and b/week5/static/img/32.png differ diff --git a/week5/static/img/32/20230606173002602802.png b/week5/static/img/32/20230606173002602802.png new file mode 100644 index 0000000..1357d22 Binary files /dev/null and b/week5/static/img/32/20230606173002602802.png differ diff --git a/week5/static/img/32/20230606173125107243.png b/week5/static/img/32/20230606173125107243.png new file mode 100644 index 0000000..1af299f Binary files /dev/null and b/week5/static/img/32/20230606173125107243.png differ diff --git a/week5/static/img/32/20230606174639861056.png b/week5/static/img/32/20230606174639861056.png new file mode 100644 index 0000000..1af299f Binary files /dev/null and b/week5/static/img/32/20230606174639861056.png differ diff --git a/week5/static/img/32/20230606174654702967.png b/week5/static/img/32/20230606174654702967.png new file mode 100644 index 0000000..1357d22 Binary files /dev/null and b/week5/static/img/32/20230606174654702967.png differ diff --git a/week5/static/img/33.png b/week5/static/img/33.png index 1eb4ec1..bf3d49e 100644 Binary files a/week5/static/img/33.png and b/week5/static/img/33.png differ diff --git a/week5/static/img/34.png b/week5/static/img/34.png index 21d881e..2d9967f 100644 Binary files a/week5/static/img/34.png and b/week5/static/img/34.png differ diff --git a/week5/static/img/35.png b/week5/static/img/35.png index b615c2b..3d23dcc 100644 Binary files a/week5/static/img/35.png and b/week5/static/img/35.png differ diff --git a/week5/static/img/36.png b/week5/static/img/36.png index 98d8530..c6aa095 100644 Binary files a/week5/static/img/36.png and b/week5/static/img/36.png differ diff --git a/week5/static/img/37.png b/week5/static/img/37.png index 7ed7793..daacfa2 100644 Binary files a/week5/static/img/37.png and b/week5/static/img/37.png differ diff --git a/week5/static/img/38.png b/week5/static/img/38.png index 5135eb9..14242f9 100644 Binary files a/week5/static/img/38.png and b/week5/static/img/38.png differ diff --git a/week5/static/img/39.png b/week5/static/img/39.png index 43944a9..d8a3573 100644 Binary files a/week5/static/img/39.png and b/week5/static/img/39.png differ diff --git a/week5/static/img/40.png b/week5/static/img/40.png index 6aee5a5..cf05fa3 100644 Binary files a/week5/static/img/40.png and b/week5/static/img/40.png differ diff --git a/week5/static/img/41.png b/week5/static/img/41.png index fb5aad7..06ddd9b 100644 Binary files a/week5/static/img/41.png and b/week5/static/img/41.png differ diff --git a/week5/static/img/42.png b/week5/static/img/42.png index 71ae2c3..b0c9c93 100644 Binary files a/week5/static/img/42.png and b/week5/static/img/42.png differ diff --git a/week5/static/img/43.png b/week5/static/img/43.png index 9a6b638..9f0875c 100644 Binary files a/week5/static/img/43.png and b/week5/static/img/43.png differ diff --git a/week5/static/img/44.png b/week5/static/img/44.png index 634fae4..90aab54 100644 Binary files a/week5/static/img/44.png and b/week5/static/img/44.png differ diff --git a/week5/static/img/45.png b/week5/static/img/45.png index 2232e63..68861d3 100644 Binary files a/week5/static/img/45.png and b/week5/static/img/45.png differ diff --git a/week5/static/img/46.png b/week5/static/img/46.png index e05dc14..b87cebf 100644 Binary files a/week5/static/img/46.png and b/week5/static/img/46.png differ diff --git a/week5/static/img/47.png b/week5/static/img/47.png index 73deff1..17b9aee 100644 Binary files a/week5/static/img/47.png and b/week5/static/img/47.png differ diff --git a/week5/static/img/48.png b/week5/static/img/48.png index 9fe79c5..aed0bbc 100644 Binary files a/week5/static/img/48.png and b/week5/static/img/48.png differ diff --git a/week5/static/img/49.png b/week5/static/img/49.png index fe01e52..67e08f2 100644 Binary files a/week5/static/img/49.png and b/week5/static/img/49.png differ diff --git a/week5/static/img/50.png b/week5/static/img/50.png index 4eb41e0..9d10ee7 100644 Binary files a/week5/static/img/50.png and b/week5/static/img/50.png differ diff --git a/week5/static/img/51.png b/week5/static/img/51.png index 6e14c59..e6c4210 100644 Binary files a/week5/static/img/51.png and b/week5/static/img/51.png differ diff --git a/week5/static/img/52.png b/week5/static/img/52.png index 6b43817..9ebbc4f 100644 Binary files a/week5/static/img/52.png and b/week5/static/img/52.png differ diff --git a/week5/static/img/53.png b/week5/static/img/53.png index b23f25d..cdf8b22 100644 Binary files a/week5/static/img/53.png and b/week5/static/img/53.png differ diff --git a/week5/static/img/54.png b/week5/static/img/54.png index fcc16d5..5256a67 100644 Binary files a/week5/static/img/54.png and b/week5/static/img/54.png differ diff --git a/week5/static/img/55.png b/week5/static/img/55.png index 6d5e516..64b2ae0 100644 Binary files a/week5/static/img/55.png and b/week5/static/img/55.png differ diff --git a/week5/static/img/56.png b/week5/static/img/56.png index 3ee5df7..947719e 100644 Binary files a/week5/static/img/56.png and b/week5/static/img/56.png differ diff --git a/week5/static/img/57.png b/week5/static/img/57.png index 76b396c..12c2d86 100644 Binary files a/week5/static/img/57.png and b/week5/static/img/57.png differ diff --git a/week5/static/img/58.png b/week5/static/img/58.png index ebdf0a8..f89c478 100644 Binary files a/week5/static/img/58.png and b/week5/static/img/58.png differ diff --git a/week5/static/img/59.png b/week5/static/img/59.png index 881f0c4..7f7c264 100644 Binary files a/week5/static/img/59.png and b/week5/static/img/59.png differ diff --git a/week5/static/img/60.png b/week5/static/img/60.png index ccecfe9..03b49a4 100644 Binary files a/week5/static/img/60.png and b/week5/static/img/60.png differ diff --git a/week5/static/img/61.png b/week5/static/img/61.png index 6580bc6..2e0fa77 100644 Binary files a/week5/static/img/61.png and b/week5/static/img/61.png differ diff --git a/week5/static/img/62.png b/week5/static/img/62.png index f1ef8f9..6460e6a 100644 Binary files a/week5/static/img/62.png and b/week5/static/img/62.png differ diff --git a/week5/static/img/63.png b/week5/static/img/63.png index c8eadc0..bb7f713 100644 Binary files a/week5/static/img/63.png and b/week5/static/img/63.png differ diff --git a/week5/static/img/64.png b/week5/static/img/64.png index a226832..6484624 100644 Binary files a/week5/static/img/64.png and b/week5/static/img/64.png differ diff --git a/week5/static/img/65.png b/week5/static/img/65.png index 04b48c0..8c751ae 100644 Binary files a/week5/static/img/65.png and b/week5/static/img/65.png differ diff --git a/week5/static/img/65/20230606172523987059.png b/week5/static/img/65/20230606172523987059.png new file mode 100644 index 0000000..a37065c Binary files /dev/null and b/week5/static/img/65/20230606172523987059.png differ diff --git a/week5/static/img/65/20230606172532075936.png b/week5/static/img/65/20230606172532075936.png new file mode 100644 index 0000000..4f740b0 Binary files /dev/null and b/week5/static/img/65/20230606172532075936.png differ diff --git a/week5/static/img/66.png b/week5/static/img/66.png index 7859ac9..26812f4 100644 Binary files a/week5/static/img/66.png and b/week5/static/img/66.png differ diff --git a/week5/static/img/67.png b/week5/static/img/67.png index 2994621..14ae8d5 100644 Binary files a/week5/static/img/67.png and b/week5/static/img/67.png differ diff --git a/week5/static/img/68.png b/week5/static/img/68.png index 3b07265..9224228 100644 Binary files a/week5/static/img/68.png and b/week5/static/img/68.png differ diff --git a/week5/static/img/69.png b/week5/static/img/69.png index d9cfc7f..5b105a8 100644 Binary files a/week5/static/img/69.png and b/week5/static/img/69.png differ diff --git a/week5/static/img/70.png b/week5/static/img/70.png index b7bc63c..1874aa5 100644 Binary files a/week5/static/img/70.png and b/week5/static/img/70.png differ diff --git a/week5/static/img/71.png b/week5/static/img/71.png index 9c1b9d7..94d2ef7 100644 Binary files a/week5/static/img/71.png and b/week5/static/img/71.png differ diff --git a/week5/static/img/72.png b/week5/static/img/72.png index 9c144ac..bfbe426 100644 Binary files a/week5/static/img/72.png and b/week5/static/img/72.png differ diff --git a/week5/static/img/73.png b/week5/static/img/73.png index 14ef800..88115a3 100644 Binary files a/week5/static/img/73.png and b/week5/static/img/73.png differ diff --git a/week5/static/img/74.png b/week5/static/img/74.png index 7d24f29..3376705 100644 Binary files a/week5/static/img/74.png and b/week5/static/img/74.png differ diff --git a/week5/static/img/75.png b/week5/static/img/75.png index 9c45db1..29e88e0 100644 Binary files a/week5/static/img/75.png and b/week5/static/img/75.png differ diff --git a/week5/static/img/76.png b/week5/static/img/76.png index 2f93625..b46da7e 100644 Binary files a/week5/static/img/76.png and b/week5/static/img/76.png differ diff --git a/week5/static/img/77.png b/week5/static/img/77.png index d8f3d9e..037d19a 100644 Binary files a/week5/static/img/77.png and b/week5/static/img/77.png differ diff --git a/week5/static/img/78.png b/week5/static/img/78.png index 1bacd3f..5aa3f78 100644 Binary files a/week5/static/img/78.png and b/week5/static/img/78.png differ diff --git a/week5/static/img/79.png b/week5/static/img/79.png index 4d62fd1..5544bc1 100644 Binary files a/week5/static/img/79.png and b/week5/static/img/79.png differ diff --git a/week5/static/img/80.png b/week5/static/img/80.png index 591a9a5..ea90ae4 100644 Binary files a/week5/static/img/80.png and b/week5/static/img/80.png differ diff --git a/week5/static/img/81.png b/week5/static/img/81.png index 3bfc18f..20f646f 100644 Binary files a/week5/static/img/81.png and b/week5/static/img/81.png differ diff --git a/week5/static/img/82.png b/week5/static/img/82.png index 29e74a0..aee6cff 100644 Binary files a/week5/static/img/82.png and b/week5/static/img/82.png differ diff --git a/week5/static/img/83.png b/week5/static/img/83.png index c7bf28f..5428542 100644 Binary files a/week5/static/img/83.png and b/week5/static/img/83.png differ diff --git a/week5/static/img/84.png b/week5/static/img/84.png index b17f4b3..b323c00 100644 Binary files a/week5/static/img/84.png and b/week5/static/img/84.png differ diff --git a/week5/static/img/85.png b/week5/static/img/85.png index d3aac4a..a986ff2 100644 Binary files a/week5/static/img/85.png and b/week5/static/img/85.png differ diff --git a/week5/static/img/86.png b/week5/static/img/86.png index 9c830ee..98028cb 100644 Binary files a/week5/static/img/86.png and b/week5/static/img/86.png differ diff --git a/week5/static/img/87.png b/week5/static/img/87.png index ce2e860..19f6216 100644 Binary files a/week5/static/img/87.png and b/week5/static/img/87.png differ diff --git a/week5/static/img/88.png b/week5/static/img/88.png index 06fbb9e..38a1e49 100644 Binary files a/week5/static/img/88.png and b/week5/static/img/88.png differ diff --git a/week5/static/img/89.png b/week5/static/img/89.png index 5e8111e..09c07b7 100644 Binary files a/week5/static/img/89.png and b/week5/static/img/89.png differ diff --git a/week5/static/img/90.png b/week5/static/img/90.png index a9fdc86..1ed2c1a 100644 Binary files a/week5/static/img/90.png and b/week5/static/img/90.png differ diff --git a/week5/static/img/91.png b/week5/static/img/91.png index 78974c8..e035da8 100644 Binary files a/week5/static/img/91.png and b/week5/static/img/91.png differ diff --git a/week5/static/img/92.png b/week5/static/img/92.png index 933d0a1..a16ce63 100644 Binary files a/week5/static/img/92.png and b/week5/static/img/92.png differ diff --git a/week5/static/img/93.png b/week5/static/img/93.png index 5e6b01c..784f574 100644 Binary files a/week5/static/img/93.png and b/week5/static/img/93.png differ diff --git a/week5/static/img/94.png b/week5/static/img/94.png index f5736cc..59e30c7 100644 Binary files a/week5/static/img/94.png and b/week5/static/img/94.png differ diff --git a/week5/static/img/95.png b/week5/static/img/95.png index d4682ff..26ac7f5 100644 Binary files a/week5/static/img/95.png and b/week5/static/img/95.png differ diff --git a/week5/static/img/96.png b/week5/static/img/96.png index 639dd61..380bcf7 100644 Binary files a/week5/static/img/96.png and b/week5/static/img/96.png differ diff --git a/week5/static/img/97.png b/week5/static/img/97.png index 10f2363..3a28499 100644 Binary files a/week5/static/img/97.png and b/week5/static/img/97.png differ diff --git a/week5/static/img/98.png b/week5/static/img/98.png index 1d2b982..10c193e 100644 Binary files a/week5/static/img/98.png and b/week5/static/img/98.png differ diff --git a/week5/static/img/99.png b/week5/static/img/99.png index 04e354e..26e85e2 100644 Binary files a/week5/static/img/99.png and b/week5/static/img/99.png differ diff --git a/week5/templates/zoomreplace.html b/week5/templates/zoomreplace.html index 2b5a3b2..cf8e883 100644 --- a/week5/templates/zoomreplace.html +++ b/week5/templates/zoomreplace.html @@ -2,7 +2,9 @@ - + {% for image in images %} + + {% endfor %}