Allow picture replacement

app.py

@@ -904,6 +904,56 @@ def copy_picture(id):

                                
                                
                                
                            
                                
                                    
                                        
                                            904  
                                                return flask.redirect("/picture/" + str(new_resource.id))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            905  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            906  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        907 +
                                        @app.route("/picture/<int:id>/put-file")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        908 +
                                        def put_file(id):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        909 +
                                            resource = db.session.get(PictureResource, id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        910 +
                                            if resource is None:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        911 +
                                                flask.abort(404)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        912 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        913 +
                                            current_user = db.session.get(User, flask.session.get("username"))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        914 +
                                            if current_user is None:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        915 +
                                                flask.abort(401)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        916 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        917 +
                                            if resource.author != current_user and not current_user.admin:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        918 +
                                                flask.abort(403)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        919 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        920 +
                                            return flask.render_template("put-file.html", resource=resource)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        921 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        922 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        923 +
                                        @app.route("/picture/<int:id>/put-file", methods=["POST"])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        924 +
                                        def put_file_post(id):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        925 +
                                            resource = db.session.get(PictureResource, id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        926 +
                                            if resource is None:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        927 +
                                                flask.abort(404)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        928 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        929 +
                                            current_user = db.session.get(User, flask.session.get("username"))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        930 +
                                            if current_user is None:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        931 +
                                                flask.abort(401)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        932 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        933 +
                                            if resource.author != current_user and not current_user.admin:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        934 +
                                                flask.abort(403)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        935 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        936 +
                                            file = flask.request.files["file"]
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        937 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        938 +
                                            if not file or not file.filename:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        939 +
                                                flask.flash("Select a file")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        940 +
                                                return flask.redirect(flask.request.url)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        941 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        942 +
                                            if not file.mimetype.startswith("image/") or file.mimetype == "image/svg+xml":
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        943 +
                                                flask.flash("Only images are supported")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        944 +
                                                return flask.redirect(flask.request.url)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        945 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        946 +
                                            file_path = path.join(config.DATA_PATH, "pictures", str(resource.id))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        947 +
                                            print(file_path)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        948 +
                                            file.save(file_path)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        949 +
                                            pil_image = Image.open(file_path)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        950 +
                                            resource.width, resource.height = pil_image.size
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        951 +
                                            pil_image = make_thumbnail(pil_image)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        952 +
                                            pil_image.save(path.join(config.DATA_PATH, "picture-thumbnails", str(resource.id)), **config.THUMBNAIL_SAVE_OPTIONS)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        953 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        954 +
                                            return flask.redirect("/picture/" + str(resource.id))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        955 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        956 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            957  
                                            @app.route("/gallery/<int:id>/")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            958  
                                            def gallery(id):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            959  
                                                gallery = db.session.get(Gallery, id)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -1696,6 +1746,35 @@ def api_delete_picture(id):

                                
                                
                                
                            
                                
                                    
                                        
                                            1746  
                                                return flask.jsonify({"message": "Picture deleted successfully"})
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1747  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1748  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1749 +
                                        @app.route("/api/picture/<int:id>/put-file", methods=["POST"])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1750 +
                                        def api_put_file(id):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1751 +
                                            resource = db.session.get(PictureResource, id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1752 +
                                            if resource is None:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1753 +
                                                return flask.jsonify({"error": "Picture not found"}), 404
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1754 +
                                            current_user = db.session.get(User, flask.session.get("username"))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1755 +
                                            if current_user is None:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1756 +
                                                return flask.jsonify({"error": "You must be logged in to edit pictures"}), 401
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1757 +
                                            if resource.author != current_user and not current_user.admin:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1758 +
                                                return flask.jsonify({"error": "You are not the author of this picture"}), 403
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1759 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1760 +
                                            file = flask.request.files["file"]
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1761 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1762 +
                                            if not file or not file.filename:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1763 +
                                                return flask.jsonify({"error": "Provide a file"}), 400
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1764 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1765 +
                                            if not file.mimetype.startswith("image/") or file.mimetype == "image/svg+xml":
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1766 +
                                                return flask.jsonify({"error": "Only images are supported"}), 400
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1767 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1768 +
                                            file_path = path.join(config.DATA_PATH, "pictures", str(resource.id))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1769 +
                                            file.save(file_path)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1770 +
                                            pil_image = Image.open(file_path)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1771 +
                                            resource.width, resource.height = pil_image.size
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1772 +
                                            pil_image = make_thumbnail(pil_image)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1773 +
                                            pil_image.save(path.join(config.DATA_PATH, "picture-thumbnails", str(resource.id)), **config.THUMBNAIL_SAVE_OPTIONS)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1774 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1775 +
                                            return flask.jsonify({"message": "File uploaded successfully"})
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1776 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1777 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1778  
                                            @app.route("/api/picture/<int:id>/rate", methods=["POST"])
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1779  
                                            def api_rate_picture(id):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1780  
                                                resource = db.session.get(PictureResource, id)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

static/style.css

@@ -922,3 +922,9 @@ button, .button, input, select, textarea {

                                
                                
                                
                            
                                
                                    
                                        
                                            922  
                                                --color-button-hover: var(--color-error);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            923  
                                                --color-button-active: var(--color-error);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            924  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        925 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        926 +
                                        input[type="file"] {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        927 +
                                            padding: 0.5rem;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        928 +
                                            display: flex;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        929 +
                                            font-style: italic;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        930 +
                                        }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

templates/edit-picture.html

@@ -1,6 +1,6 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            1  
                                            {% extends "default.html" %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            2  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        3 -
                                        {% block nav_title %}Edit '{{ resource.title }}'{% endblock %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        3 +
                                        {% block nav_title %}{{ resource.title }}{% endblock %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            4  
                                            {% block title %}Edit picture '{{ resource.title }}' | {{ site_name }}{% endblock %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            5  
                                            {% set back_url = "/picture/" + resource.id|string %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            6  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

templates/picture.html

@@ -55,8 +55,9 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            55  
                                                                <li><a href="/picture/{{ resource.id }}/edit-metadata">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            56  
                                                                    <iconify-icon icon="mdi:edit"></iconify-icon>Edit metadata
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            57  
                                                                </a></li>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        58 -
                                                        {% endif %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        59 -
                                                        {% if have_permission %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        58 +
                                                            <li><a href="/picture/{{ resource.id }}/put-file">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        59 +
                                                                <iconify-icon icon="mdi:file-upload"></iconify-icon>Replace image
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        60 +
                                                            </a></li>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            61  
                                                                <li><details>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            62  
                                                                    <summary>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            63  
                                                                        <iconify-icon icon="mdi:delete"></iconify-icon>Delete
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

templates/put-annotations-form.html

@@ -2,6 +2,8 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            2  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            3  
                                            {% block nav_title %}{{ resource.title }}{% endblock %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            4  
                                            {% block title %}Submit JSON annotations for {{ resource.title }} | {{ site_name }}{% endblock %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        5 +
                                        {% set back_url = "/picture/" + resource.id|string %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        6 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            7  
                                            {% block content %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            8  
                                                <x-frame style="--width: 768px">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            9  
                                                    <form method="POST" class="vbox">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

templates/put-file.html

@@ -0,0 +1,20 @@

                                
                                
                                
                            
                                
                                    
                                        1 +
                                        {% extends "default.html" %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        2 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        3 +
                                        {% block nav_title %}{{ resource.title }}{% endblock %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        4 +
                                        {% block title %}Replace {{ resource.title }} | {{ site_name }}{% endblock %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        5 +
                                        {% set back_url = "/picture/" + resource.id|string %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        6 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        7 +
                                        {% block content %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        8 +
                                            <x-frame style="--width: 768px">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        9 +
                                                <form method="POST" class="vbox" enctype="multipart/form-data">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        10 +
                                                    <p>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        11 +
                                                        Change the picture <a href="/picture/{{ resource.id }}">{{ resource.title }}</a>.
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        12 +
                                                    </p>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        13 +
                                                    <label>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        14 +
                                                        <span class="required-asterisk">File</span>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        15 +
                                                        <input type="file" name="file" required>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        16 +
                                                    </label>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        17 +
                                                    <button type="submit">Submit</button>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        18 +
                                                </form>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        19 +
                                            </x-frame>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        20 +
                                        {% endblock %}