Merge remote-tracking branch 'origin/master' into hunternif

# Conflicts:
#	client/css/post-content-control.styl
#	client/css/post-list-view.styl
#	client/html/post_edit_sidebar.tpl
#	client/js/controllers/post_list_controller.js
#	client/js/controllers/post_main_controller.js
#	client/js/controllers/post_upload_controller.js
#	client/js/controllers/tag_controller.js
#	client/js/controllers/user_list_controller.js
#	client/js/controls/expander_control.js
#	client/js/controls/post_content_control.js
#	client/js/controls/post_edit_sidebar_control.js
#	client/js/controls/post_readonly_sidebar_control.js
#	client/js/controls/tag_input_control.js
#	client/js/main.js
#	client/js/models/abstract_list.js
#	client/js/models/post.js
#	client/js/models/post_list.js
#	client/js/models/settings.js
#	client/js/models/tag.js
#	client/js/models/tag_list.js
#	client/js/tags.js
#	client/js/util/search.js
#	client/js/util/touch.js
#	client/js/util/uri.js
#	client/js/util/views.js
#	client/js/views/post_main_view.js
#	client/js/views/post_upload_view.js
#	client/js/views/posts_header_view.js
#	client/js/views/posts_page_view.js
#	client/js/views/settings_view.js
#	client/js/views/tag_view.js
#	client/package-lock.json
#	client/package.json
#	server/config.yaml.dist
#	server/szurubooru/api/__init__.py
#	server/szurubooru/api/post_api.py
#	server/szurubooru/api/tag_api.py
#	server/szurubooru/func/posts.py
#	server/szurubooru/func/tags.py
#	server/szurubooru/model/__init__.py
#	server/szurubooru/model/post.py
#	server/szurubooru/model/tag.py
#	server/szurubooru/search/configs/__init__.py
#	server/szurubooru/search/configs/post_search_config.py
#	server/szurubooru/search/executor.py
#	server/szurubooru/tests/api/test_post_retrieving.py
#	server/szurubooru/tests/api/test_post_updating.py
#	server/szurubooru/tests/api/test_tag_updating.py
#	server/szurubooru/tests/conftest.py
#	server/szurubooru/tests/func/test_posts.py
#	server/szurubooru/tests/func/test_tags.py
#	server/szurubooru/tests/search/configs/test_post_search_config.py

1 files changed, 131 insertions, 0 deletions

diff --git a/server/szuru-admin b/server/szuru-admin
new file mode 100755
index 0000000..004a751
--- /dev/null
+++ b/server/szuru-admin
@@ -0,0 +1,131 @@
+#!/usr/bin/env python3
+
+"""
+Collection of CLI commands for an administrator to use
+"""
+
+import logging
+import os
+import re
+import time
+from argparse import ArgumentParser
+from getpass import getpass
+from sys import stderr
+
+from szurubooru import config, db, errors, model
+from szurubooru.func import files, images
+from szurubooru.func import posts as postfuncs
+from szurubooru.func import users as userfuncs
+
+
+def reset_password(username: str) -> None:
+    user = userfuncs.get_user_by_name_or_email(username)
+
+    new_password = getpass("Enter new password for '%s': " % user.name)
+    check_password = getpass("Re-enter password: ")
+
+    if check_password != new_password:
+        raise errors.ValidationError("Passwords do not match")
+
+    userfuncs.update_user_password(user, new_password)
+    db.get_session().commit()
+    print("Sucessfully changed password for '%s'" % user.name)
+
+
+def check_audio() -> None:
+    post_list = (
+        db.session.query(model.Post)
+        .filter(model.Post.type == model.Post.TYPE_VIDEO)
+        .order_by(model.Post.post_id)
+        .all()
+    )
+
+    for post in post_list:
+        print("Checking post %d ..." % post.post_id, end="\r", file=stderr)
+        content = files.get(postfuncs.get_post_content_path(post))
+
+        has_existing_flag = model.Post.FLAG_SOUND in post.flags
+        try:
+            has_sound_data = images.Image(content).check_for_sound()
+        except errors.ProcessingError:
+            print(
+                "Post %d caused an error when checking for sound"
+                % post.post_id
+            )
+
+        if has_sound_data and not has_existing_flag:
+            print("Post %d has sound data but is not flagged" % post.post_id)
+        if not has_sound_data and has_existing_flag:
+            print("Post %d has no sound data but is flagged" % post.post_id)
+
+
+def reset_filenames() -> None:
+    regex = re.compile(r"(\d+)_[0-9a-f]{16}\.(\S+)")
+
+    def convert_to_new_filename(old_name: str) -> str:
+        matches = regex.match(old_name)
+        if not matches:
+            return None
+        post_id = int(matches.group(1))
+        post_ext = matches.group(2)
+        return "%d_%s.%s" % (
+            post_id,
+            postfuncs.get_post_security_hash(post_id),
+            post_ext,
+        )
+
+    def rename_in_dir(dir: str) -> None:
+        for old_path in os.listdir(config.config["data_dir"] + dir):
+            new_path = convert_to_new_filename(old_path)
+            if not new_path:
+                continue
+            if old_path != new_path:
+                print("%s -> %s" % (dir + old_path, dir + new_path))
+                os.rename(
+                    config.config["data_dir"] + dir + old_path,
+                    config.config["data_dir"] + dir + new_path,
+                )
+
+    rename_in_dir("posts/")
+    rename_in_dir("generated-thumbnails/")
+    rename_in_dir("posts/custom-thumbnails/")
+
+
+def main() -> None:
+    parser_top = ArgumentParser(
+        description="Collection of CLI commands for an administrator to use",
+        epilog="Look at README.md for more info",
+    )
+    parser = parser_top.add_mutually_exclusive_group(required=True)
+    parser.add_argument(
+        "--change-password",
+        metavar="<username>",
+        help="change the password of specified user",
+    )
+    parser.add_argument(
+        "--check-all-audio",
+        action="store_true",
+        help="check the audio flags of all posts, "
+        "noting discrepancies, without modifying posts",
+    )
+    parser.add_argument(
+        "--reset-filenames",
+        action="store_true",
+        help="reset and rename the content and thumbnail "
+        "filenames in case of a lost/changed secret key",
+    )
+    command = parser_top.parse_args()
+
+    try:
+        if command.change_password:
+            reset_password(command.change_password)
+        elif command.check_all_audio:
+            check_audio()
+        elif command.reset_filenames:
+            reset_filenames()
+    except errors.BaseError as e:
+        print(e, file=stderr)
+
+
+if __name__ == "__main__":
+    main()