Fix uploading with licence

app.py

@@ -295,6 +295,10 @@ def profile(username):

                                
                                
                                
                            
                                
                                    
                                        
                                            295  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            296  
                                            @app.route("/upload")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            297  
                                            def upload():
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        298 +
                                            if "username" not in flask.session:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        299 +
                                                flask.flash("Log in to upload pictures.")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        300 +
                                                return flask.redirect("/accounts")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        301 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            302  
                                                licences = Licence.query.order_by(Licence.free.desc(), Licence.pinned.desc(), Licence.title).all()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            303  
                                                return flask.render_template("upload.html", licences=licences)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            304  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -305,11 +309,38 @@ def upload_post():

                                
                                
                                
                            
                                
                                    
                                        
                                            309  
                                                description = flask.request.form["description"]
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            310  
                                                origin_url = flask.request.form["origin_url"]
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            311  
                                                author = db.session.get(User, flask.session.get("username"))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        312 +
                                            licence_ids = flask.request.form.getlist("licence")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        313 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        314 +
                                            if author is None:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        315 +
                                                flask.abort(401)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            316  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            317  
                                                file = flask.request.files["file"]
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            318  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            319  
                                                if not file or not file.filename:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        312 -
                                                flask.flash("No selected file")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        320 +
                                                flask.flash("Select a file")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        321 +
                                                return flask.redirect(flask.request.url)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        322 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        323 +
                                            if not file.mimetype.startswith("image/"):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        324 +
                                                flask.flash("Only images are supported")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        325 +
                                                return flask.redirect(flask.request.url)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        326 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        327 +
                                            if not title:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        328 +
                                                flask.flash("Enter a title")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        329 +
                                                return flask.redirect(flask.request.url)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        330 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        331 +
                                            if not description:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        332 +
                                                flask.flash("Enter a description")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        333 +
                                                return flask.redirect(flask.request.url)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        334 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        335 +
                                            print(licence_ids)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        336 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        337 +
                                            if not licence_ids:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        338 +
                                                flask.flash("Select licences")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        339 +
                                                return flask.redirect(flask.request.url)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        340 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        341 +
                                            licences = [db.session.get(Licence, licence_id) for licence_id in licence_ids]
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        342 +
                                            if not any(licence.free for licence in licences):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        343 +
                                                flask.flash("Select at least one free licence")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            344  
                                                    return flask.redirect(flask.request.url)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            345  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            346  
                                                resource = PictureResource(title, author, description, origin_url, ["CC0-1.0"], file.mimetype)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -317,6 +348,8 @@ def upload_post():

                                
                                
                                
                            
                                
                                    
                                        
                                            348  
                                                db.session.commit()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            349  
                                                file.save(path.join(config.DATA_PATH, "pictures", str(resource.id)))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            350  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        351 +
                                            flask.flash("Picture uploaded successfully")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        352 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            353  
                                                return flask.redirect("/picture/" + str(resource.id))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            354  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            355  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

static/efficient-ui

@@ -1 +1 @@

                                
                                
                                
                            
                                
                                    
                                        1 -
                                        Subproject commit 475381868136b3cb05e333950cd523f633ce501d
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1 +
                                        Subproject commit de68efc82aa23ebb7a5f007af0f393167e2c4105
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

static/style.css

@@ -264,3 +264,8 @@ iconify-icon {

                                
                                
                                
                            
                                
                                    
                                        
                                            264  
                                                grid-template-columns: auto 1fr;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            265  
                                                align-items: center;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            266  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        267 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        268 +
                                        .required-asterisk::after {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        269 +
                                            content: "*";
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        270 +
                                            color: var(--color-error);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        271 +
                                        }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

templates/upload.html

@@ -5,19 +5,20 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            5  
                                                    <form method="POST" class="vbox" enctype="multipart/form-data">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            6  
                                                        <h2>Upload</h2>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            7  
                                                        <label>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        8 -
                                                        Name
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        8 +
                                                        <span class="required-asterisk">Title</span>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            9  
                                                            <input type="text" name="title" required>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            10  
                                                        </label>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            11  
                                                        <label>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        12 -
                                                        Description
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        12 +
                                                        <span class="required-asterisk">Description</span>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            13  
                                                            <textarea name="description" required></textarea>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            14  
                                                        </label>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            15  
                                                        <label>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            16  
                                                            Origin URL
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        17 -
                                                        <input type="url" name="origin_url" required>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        17 +
                                                        <input type="url" name="origin_url">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        18 +
                                                        Can be left blank if not applicable.
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            19  
                                                        </label>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            20  
                                                        <x-vbox>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        20 -
                                                        Licence
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        21 +
                                                        <span class="required-asterisk">Licences</span>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            22  
                                                            <div class="multi-select" style="height: clamp(320px, 50vh, 640px)">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            23  
                                                                {% for licence in licences %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            24  
                                                                    <div class="licence-selection">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -67,7 +68,7 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            68  
                                                            </div>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            69  
                                                        </x-vbox>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            70  
                                                        <label>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        70 -
                                                        File
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        71 +
                                                        <span class="required-asterisk">File</span>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            72  
                                                            <input type="file" name="file" required>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            73  
                                                        </label>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            74  
                                                        <button type="submit">Upload</button>