)?%%%SJIS(\d+)(?:<\/p>)?/, (match, capture) => { - return '
' + this.buf[capture] + '
';
- });
+ return '' + this.buf[capture] + "
";
+ }
+ );
}
}
// fix \ before ~ being stripped away
class TildeWrapper extends BaseMarkdownWrapper {
preprocess(text) {
- return text.replace(/\\~/g, '%%%T');
+ return text.replace(/\\~/g, "%%%T");
}
postprocess(text) {
- return text.replace(/%%%T/g, '\\~');
+ return text.replace(/%%%T/g, "\\~");
}
}
// prevent ^#... from being treated as headers, due to tag permalinks
class TagPermalinkFixWrapper extends BaseMarkdownWrapper {
preprocess(text) {
- return text.replace(/^#/g, '%%%#');
+ return text.replace(/^#/g, "%%%#");
}
postprocess(text) {
- return text.replace(/%%%#/g, '#');
+ return text.replace(/%%%#/g, "#");
}
}
@@ -63,19 +65,23 @@ class TagPermalinkFixWrapper extends BaseMarkdownWrapper {
class EntityPermalinkWrapper extends BaseMarkdownWrapper {
preprocess(text) {
// URL-based permalinks
+ text = text.replace(new RegExp("\\b/post/(\\d+)/?\\b", "g"), "@$1");
text = text.replace(
- new RegExp('\\b/post/(\\d+)/?\\b', 'g'), '@$1');
- text = text.replace(
- new RegExp('\\b/tag/([a-zA-Z0-9_-]+?)/?', 'g'), '#$1');
+ new RegExp("\\b/tag/([a-zA-Z0-9_-]+?)/?", "g"),
+ "#$1"
+ );
text = text.replace(
- new RegExp('\\b/user/([a-zA-Z0-9_-]+?)/?', 'g'), '+$1');
+ new RegExp("\\b/user/([a-zA-Z0-9_-]+?)/?", "g"),
+ "+$1"
+ );
text = text.replace(
/(^|^\(|(?:[^\]])\(|[\s<>\[\]\)])([+#@][a-zA-Z0-9_-]+)/g,
- '$1[$2]($2)');
- text = text.replace(/\]\(@(\d+)\)/g, '](/post/$1)');
- text = text.replace(/\]\(\+([a-zA-Z0-9_-]+)\)/g, '](/user/$1)');
- text = text.replace(/\]\(#([a-zA-Z0-9_-]+)\)/g, '](/posts/query=$1)');
+ "$1[$2]($2)"
+ );
+ text = text.replace(/\]\(@(\d+)\)/g, "](/post/$1)");
+ text = text.replace(/\]\(\+([a-zA-Z0-9_-]+)\)/g, "](/user/$1)");
+ text = text.replace(/\]\(#([a-zA-Z0-9_-]+)\)/g, "](/posts/query=$1)");
return text;
}
}
@@ -83,51 +89,58 @@ class EntityPermalinkWrapper extends BaseMarkdownWrapper {
class SearchPermalinkWrapper extends BaseMarkdownWrapper {
postprocess(text) {
return text.replace(
- /\[search\]((?:[^\[]|\[(?!\/?search\]))+)\[\/search\]/ig,
- '$1');
+ /\[search\]((?:[^\[]|\[(?!\/?search\]))+)\[\/search\]/gi,
+ '$1'
+ );
}
}
class SpoilersWrapper extends BaseMarkdownWrapper {
postprocess(text) {
return text.replace(
- /\[spoiler\]((?:[^\[]|\[(?!\/?spoiler\]))+)\[\/spoiler\]/ig,
- '$1');
+ /\[spoiler\]((?:[^\[]|\[(?!\/?spoiler\]))+)\[\/spoiler\]/gi,
+ '$1'
+ );
}
}
class SmallWrapper extends BaseMarkdownWrapper {
postprocess(text) {
return text.replace(
- /\[small\]((?:[^\[]|\[(?!\/?small\]))+)\[\/small\]/ig,
- '$1');
+ /\[small\]((?:[^\[]|\[(?!\/?small\]))+)\[\/small\]/gi,
+ "$1"
+ );
}
}
class StrikeThroughWrapper extends BaseMarkdownWrapper {
postprocess(text) {
- text = text.replace(/(^|[^\\])(~~|~)([^~]+)\2/g, '$1'); - textNode.classList.add('message'); + const textNode = document.createElement("div"); + textNode.innerHTML = message.replace(/\n/g, "
"); + textNode.classList.add("message"); textNode.classList.add(className); - const wrapperNode = document.createElement('div'); - wrapperNode.classList.add('message-wrapper'); + const wrapperNode = document.createElement("div"); + wrapperNode.classList.add("message-wrapper"); wrapperNode.appendChild(textNode); messagesHolderNode.appendChild(wrapperNode); return true; } function appendExclamationMark() { - if (!document.title.startsWith('!')) { + if (!document.title.startsWith("!")) { document.oldTitle = document.title; document.title = `! ${document.title}`; } @@ -328,15 +359,15 @@ function appendExclamationMark() { function showError(target, message) { appendExclamationMark(); - return showMessage(target, misc.formatInlineMarkdown(message), 'error'); + return showMessage(target, misc.formatInlineMarkdown(message), "error"); } function showSuccess(target, message) { - return showMessage(target, misc.formatInlineMarkdown(message), 'success'); + return showMessage(target, misc.formatInlineMarkdown(message), "success"); } function showInfo(target, message) { - return showMessage(target, misc.formatInlineMarkdown(message), 'info'); + return showMessage(target, misc.formatInlineMarkdown(message), "info"); } function clearMessages(target) { @@ -344,7 +375,7 @@ function clearMessages(target) { document.title = document.oldTitle; document.oldTitle = null; } - for (let messagesHolderNode of target.querySelectorAll('.messages')) { + for (let messagesHolderNode of target.querySelectorAll(".messages")) { emptyContent(messagesHolderNode); } } @@ -352,15 +383,15 @@ function clearMessages(target) { function htmlToDom(html) { // code taken from jQuery + Krasimir Tsonev's blog const wrapMap = { - _: [1, '
', '
'],
- option: [1, ''],
- legend: [1, ''],
- area: [1, ''],
- param: [1, ''],
- thead: [1, '", "
"],
+ option: [1, ""],
+ legend: [1, ""],
+ area: [1, ""],
+ param: [1, ""],
+ thead: [1, "');
+ '
'
+ );
};
class EmptyView {
constructor() {
- this._hostNode = document.getElementById('content-holder');
+ this._hostNode = document.getElementById("content-holder");
views.replaceContent(this._hostNode, template());
views.syncScrollPosition();
}
diff --git a/client/js/views/endless_page_view.js b/client/js/views/endless_page_view.js
index f30b8fb..f94c371 100644
--- a/client/js/views/endless_page_view.js
+++ b/client/js/views/endless_page_view.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
-const router = require('../router.js');
-const views = require('../util/views.js');
+const router = require("../router.js");
+const views = require("../util/views.js");
-const holderTemplate = views.getTemplate('endless-pager');
-const pageTemplate = views.getTemplate('endless-pager-page');
+const holderTemplate = views.getTemplate("endless-pager");
+const pageTemplate = views.getTemplate("endless-pager-page");
function isScrolledIntoView(element) {
let top = 0;
@@ -12,14 +12,12 @@ function isScrolledIntoView(element) {
top += element.offsetTop || 0;
element = element.offsetParent;
} while (element);
- return (
- (top >= window.scrollY) &&
- (top <= window.scrollY + window.innerHeight));
+ return top >= window.scrollY && top <= window.scrollY + window.innerHeight;
}
class EndlessPageView {
constructor(ctx) {
- this._hostNode = document.getElementById('content-holder');
+ this._hostNode = document.getElementById("content-holder");
views.replaceContent(this._hostNode, holderTemplate());
}
@@ -40,12 +38,13 @@ class EndlessPageView {
this.defaultLimit = parseInt(ctx.parameters.limit || ctx.defaultLimit);
const initialOffset = parseInt(ctx.parameters.offset || 0);
- this._loadPage(ctx, initialOffset, this.defaultLimit, true)
- .then(pageNode => {
+ this._loadPage(ctx, initialOffset, this.defaultLimit, true).then(
+ (pageNode) => {
if (initialOffset !== 0) {
pageNode.scrollIntoView();
}
- });
+ }
+ );
this._timeout = window.setInterval(() => {
window.requestAnimationFrame(() => {
@@ -58,19 +57,19 @@ class EndlessPageView {
}
get pageHeaderHolderNode() {
- return this._hostNode.querySelector('.page-header-holder');
+ return this._hostNode.querySelector(".page-header-holder");
}
get topPageGuardNode() {
- return this._hostNode.querySelector('.page-guard.top');
+ return this._hostNode.querySelector(".page-guard.top");
}
get bottomPageGuardNode() {
- return this._hostNode.querySelector('.page-guard.bottom');
+ return this._hostNode.querySelector(".page-guard.bottom");
}
get _pagesHolderNode() {
- return this._hostNode.querySelector('.pages-holder');
+ return this._hostNode.querySelector(".pages-holder");
}
_destroy() {
@@ -82,9 +81,10 @@ class EndlessPageView {
let topPageNode = null;
let element = document.elementFromPoint(
window.innerWidth / 2,
- window.innerHeight / 2);
+ window.innerHeight / 2
+ );
while (element.parentNode !== null) {
- if (element.classList.contains('page')) {
+ if (element.classList.contains("page")) {
topPageNode = element;
break;
}
@@ -93,15 +93,17 @@ class EndlessPageView {
if (!topPageNode) {
return;
}
- let topOffset = parseInt(topPageNode.getAttribute('data-offset'));
- let topLimit = parseInt(topPageNode.getAttribute('data-limit'));
+ let topOffset = parseInt(topPageNode.getAttribute("data-offset"));
+ let topLimit = parseInt(topPageNode.getAttribute("data-limit"));
if (topOffset !== this.currentOffset) {
router.replace(
ctx.getClientUrlForPage(
topOffset,
- topLimit === ctx.defaultLimit ? null : topLimit),
+ topLimit === ctx.defaultLimit ? null : topLimit
+ ),
ctx.state,
- false);
+ false
+ );
this.currentOffset = topOffset;
}
}
@@ -115,43 +117,47 @@ class EndlessPageView {
return;
}
- if (this.minOffsetShown > 0 &&
- isScrolledIntoView(this.topPageGuardNode)) {
+ if (
+ this.minOffsetShown > 0 &&
+ isScrolledIntoView(this.topPageGuardNode)
+ ) {
this._loadPage(
ctx,
this.minOffsetShown - this.defaultLimit,
this.defaultLimit,
- false);
+ false
+ );
}
- if (this.maxOffsetShown < this.totalRecords &&
- isScrolledIntoView(this.bottomPageGuardNode)) {
- this._loadPage(
- ctx,
- this.maxOffsetShown,
- this.defaultLimit,
- true);
+ if (
+ this.maxOffsetShown < this.totalRecords &&
+ isScrolledIntoView(this.bottomPageGuardNode)
+ ) {
+ this._loadPage(ctx, this.maxOffsetShown, this.defaultLimit, true);
}
}
_loadPage(ctx, offset, limit, append) {
this._runningRequests++;
return new Promise((resolve, reject) => {
- ctx.requestPage(offset, limit).then(response => {
- if (!this._active) {
+ ctx.requestPage(offset, limit).then(
+ (response) => {
+ if (!this._active) {
+ this._runningRequests--;
+ return Promise.reject();
+ }
+ window.requestAnimationFrame(() => {
+ let pageNode = this._renderPage(ctx, append, response);
+ this._runningRequests--;
+ resolve(pageNode);
+ });
+ },
+ (error) => {
+ this.showError(error.message);
this._runningRequests--;
- return Promise.reject();
+ reject();
}
- window.requestAnimationFrame(() => {
- let pageNode = this._renderPage(ctx, append, response);
- this._runningRequests--;
- resolve(pageNode);
- });
- }, error => {
- this.showError(error.message);
- this._runningRequests--;
- reject();
- });
+ );
});
}
@@ -162,30 +168,35 @@ class EndlessPageView {
pageNode = pageTemplate({
totalPages: Math.ceil(response.total / response.limit),
page: Math.ceil(
- (response.offset + response.limit) / response.limit),
+ (response.offset + response.limit) / response.limit
+ ),
});
- pageNode.setAttribute('data-offset', response.offset);
- pageNode.setAttribute('data-limit', response.limit);
+ pageNode.setAttribute("data-offset", response.offset);
+ pageNode.setAttribute("data-limit", response.limit);
ctx.pageRenderer({
parameters: ctx.parameters,
response: response,
- hostNode: pageNode.querySelector('.page-content-holder'),
+ hostNode: pageNode.querySelector(".page-content-holder"),
});
this.totalRecords = response.total;
- if (response.offset < this.minOffsetShown ||
- this.minOffsetShown === null) {
+ if (
+ response.offset < this.minOffsetShown ||
+ this.minOffsetShown === null
+ ) {
this.minOffsetShown = response.offset;
}
- if (response.offset + response.results.length
- > this.maxOffsetShown ||
- this.maxOffsetShown === null) {
+ if (
+ response.offset + response.results.length >
+ this.maxOffsetShown ||
+ this.maxOffsetShown === null
+ ) {
this.maxOffsetShown =
response.offset + response.results.length;
}
- response.results.addEventListener('remove', e => {
+ response.results.addEventListener("remove", (e) => {
this.maxOffsetShown--;
this.totalRecords--;
});
@@ -200,10 +211,11 @@ class EndlessPageView {
window.scroll(
window.scrollX,
- window.scrollY + pageNode.offsetHeight);
+ window.scrollY + pageNode.offsetHeight
+ );
}
} else if (!response.results.length) {
- this.showInfo('No data to show');
+ this.showInfo("No data to show");
}
this._initialPageLoad = false;
diff --git a/client/js/views/help_view.js b/client/js/views/help_view.js
index 1ab016d..a88b016 100644
--- a/client/js/views/help_view.js
+++ b/client/js/views/help_view.js
@@ -1,73 +1,81 @@
-'use strict';
+"use strict";
-const api = require('../api.js');
-const views = require('../util/views.js');
+const api = require("../api.js");
+const views = require("../util/views.js");
-const template = views.getTemplate('help');
+const template = views.getTemplate("help");
const sectionTemplates = {
- 'about': views.getTemplate('help-about'),
- 'keyboard': views.getTemplate('help-keyboard'),
- 'search': views.getTemplate('help-search'),
- 'comments': views.getTemplate('help-comments'),
- 'tos': views.getTemplate('help-tos'),
+ about: views.getTemplate("help-about"),
+ keyboard: views.getTemplate("help-keyboard"),
+ search: views.getTemplate("help-search"),
+ comments: views.getTemplate("help-comments"),
+ tos: views.getTemplate("help-tos"),
};
const subsectionTemplates = {
- 'search': {
- 'default': views.getTemplate('help-search-general'),
- 'posts': views.getTemplate('help-search-posts'),
- 'users': views.getTemplate('help-search-users'),
- 'tags': views.getTemplate('help-search-tags'),
- 'pools': views.getTemplate('help-search-pools'),
+ search: {
+ default: views.getTemplate("help-search-general"),
+ posts: views.getTemplate("help-search-posts"),
+ users: views.getTemplate("help-search-users"),
+ tags: views.getTemplate("help-search-tags"),
+ pools: views.getTemplate("help-search-pools"),
},
};
class HelpView {
constructor(section, subsection) {
- this._hostNode = document.getElementById('content-holder');
+ this._hostNode = document.getElementById("content-holder");
const sourceNode = template();
const ctx = {
name: api.getName(),
};
- section = section || 'about';
+ section = section || "about";
if (section in sectionTemplates) {
views.replaceContent(
- sourceNode.querySelector('.content'),
- sectionTemplates[section](ctx));
+ sourceNode.querySelector(".content"),
+ sectionTemplates[section](ctx)
+ );
}
- subsection = subsection || 'default';
- if (section in subsectionTemplates &&
- subsection in subsectionTemplates[section]) {
+ subsection = subsection || "default";
+ if (
+ section in subsectionTemplates &&
+ subsection in subsectionTemplates[section]
+ ) {
views.replaceContent(
- sourceNode.querySelector('.subcontent'),
- subsectionTemplates[section][subsection](ctx));
+ sourceNode.querySelector(".subcontent"),
+ subsectionTemplates[section][subsection](ctx)
+ );
}
views.replaceContent(this._hostNode, sourceNode);
- for (let itemNode of
- sourceNode.querySelectorAll('.primary [data-name]')) {
+ for (let itemNode of sourceNode.querySelectorAll(
+ ".primary [data-name]"
+ )) {
itemNode.classList.toggle(
- 'active',
- itemNode.getAttribute('data-name') === section);
- if (itemNode.getAttribute('data-name') === section) {
+ "active",
+ itemNode.getAttribute("data-name") === section
+ );
+ if (itemNode.getAttribute("data-name") === section) {
itemNode.parentNode.scrollLeft =
itemNode.getBoundingClientRect().left -
- itemNode.parentNode.getBoundingClientRect().left
+ itemNode.parentNode.getBoundingClientRect().left;
}
}
- for (let itemNode of
- sourceNode.querySelectorAll('.secondary [data-name]')) {
+ for (let itemNode of sourceNode.querySelectorAll(
+ ".secondary [data-name]"
+ )) {
itemNode.classList.toggle(
- 'active',
- itemNode.getAttribute('data-name') === subsection);
- if (itemNode.getAttribute('data-name') === subsection) {
+ "active",
+ itemNode.getAttribute("data-name") === subsection
+ );
+ if (itemNode.getAttribute("data-name") === subsection) {
itemNode.parentNode.scrollLeft =
itemNode.getBoundingClientRect().left -
- itemNode.parentNode.getBoundingClientRect().left
+ itemNode.parentNode.getBoundingClientRect().left;
}
}
diff --git a/client/js/views/home_view.js b/client/js/views/home_view.js
index 35d4742..c91363b 100644
--- a/client/js/views/home_view.js
+++ b/client/js/views/home_view.js
@@ -1,22 +1,20 @@
-'use strict';
-
-const router = require('../router.js');
-const uri = require('../util/uri.js');
-const misc = require('../util/misc.js');
-const views = require('../util/views.js');
-const PostContentControl = require('../controls/post_content_control.js');
-const PostNotesOverlayControl
- = require('../controls/post_notes_overlay_control.js');
-const TagAutoCompleteControl =
- require('../controls/tag_auto_complete_control.js');
-
-const template = views.getTemplate('home');
-const footerTemplate = views.getTemplate('home-footer');
-const featuredPostTemplate = views.getTemplate('home-featured-post');
+"use strict";
+
+const router = require("../router.js");
+const uri = require("../util/uri.js");
+const misc = require("../util/misc.js");
+const views = require("../util/views.js");
+const PostContentControl = require("../controls/post_content_control.js");
+const PostNotesOverlayControl = require("../controls/post_notes_overlay_control.js");
+const TagAutoCompleteControl = require("../controls/tag_auto_complete_control.js");
+
+const template = views.getTemplate("home");
+const footerTemplate = views.getTemplate("home-footer");
+const featuredPostTemplate = views.getTemplate("home-featured-post");
class HomeView {
constructor(ctx) {
- this._hostNode = document.getElementById('content-holder');
+ this._hostNode = document.getElementById("content-holder");
this._ctx = ctx;
const sourceNode = template(ctx);
@@ -27,11 +25,16 @@ class HomeView {
this._autoCompleteControl = new TagAutoCompleteControl(
this._searchInputNode,
{
- confirm: tag => this._autoCompleteControl.replaceSelectedText(
- misc.escapeSearchTerm(tag.names[0]), true),
- });
- this._formNode.addEventListener(
- 'submit', e => this._evtFormSubmit(e));
+ confirm: (tag) =>
+ this._autoCompleteControl.replaceSelectedText(
+ misc.escapeSearchTerm(tag.names[0]),
+ true
+ ),
+ }
+ );
+ this._formNode.addEventListener("submit", (e) =>
+ this._evtFormSubmit(e)
+ );
}
}
@@ -46,59 +49,67 @@ class HomeView {
setStats(stats) {
views.replaceContent(
this._footerContainerNode,
- footerTemplate(Object.assign({}, stats, this._ctx)));
+ footerTemplate(Object.assign({}, stats, this._ctx))
+ );
}
setFeaturedPost(postInfo) {
views.replaceContent(
- this._postInfoContainerNode, featuredPostTemplate(postInfo));
+ this._postInfoContainerNode,
+ featuredPostTemplate(postInfo)
+ );
if (this._postContainerNode && postInfo.featuredPost) {
this._postContentControl = new PostContentControl(
this._postContainerNode,
postInfo.featuredPost,
() => {
- return [
- window.innerWidth * 0.8,
- window.innerHeight * 0.7,
- ];
+ return [window.innerWidth * 0.8, window.innerHeight * 0.7];
},
- 'fit-both');
+ "fit-both"
+ );
this._postNotesOverlay = new PostNotesOverlayControl(
- this._postContainerNode.querySelector('.post-overlay'),
- postInfo.featuredPost);
-
- if (postInfo.featuredPost.type === 'video'
- || postInfo.featuredPost.type === 'flash') {
+ this._postContainerNode.querySelector(".post-overlay"),
+ postInfo.featuredPost
+ );
+
+ if (
+ postInfo.featuredPost.type === "video" ||
+ postInfo.featuredPost.type === "flash"
+ ) {
this._postContentControl.disableOverlay();
}
}
}
get _footerContainerNode() {
- return this._hostNode.querySelector('.footer-container');
+ return this._hostNode.querySelector(".footer-container");
}
get _postInfoContainerNode() {
- return this._hostNode.querySelector('.post-info-container');
+ return this._hostNode.querySelector(".post-info-container");
}
get _postContainerNode() {
- return this._hostNode.querySelector('.post-container');
+ return this._hostNode.querySelector(".post-container");
}
get _formNode() {
- return this._hostNode.querySelector('form');
+ return this._hostNode.querySelector("form");
}
get _searchInputNode() {
- return this._formNode.querySelector('input[name=search-text]');
+ return this._formNode.querySelector("input[name=search-text]");
}
_evtFormSubmit(e) {
e.preventDefault();
this._searchInputNode.blur();
- router.show(uri.formatClientLink('posts', {query: this._searchInputNode.value}));
+ router.show(
+ uri.formatClientLink("posts", {
+ query: this._searchInputNode.value,
+ })
+ );
}
}
diff --git a/client/js/views/login_view.js b/client/js/views/login_view.js
index 2c05332..64d49f9 100644
--- a/client/js/views/login_view.js
+++ b/client/js/views/login_view.js
@@ -1,52 +1,63 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const api = require('../api.js');
-const views = require('../util/views.js');
+const events = require("../events.js");
+const api = require("../api.js");
+const views = require("../util/views.js");
-const template = views.getTemplate('login');
+const template = views.getTemplate("login");
class LoginView extends events.EventTarget {
constructor() {
super();
- this._hostNode = document.getElementById('content-holder');
+ this._hostNode = document.getElementById("content-holder");
- views.replaceContent(this._hostNode, template({
- userNamePattern: api.getUserNameRegex(),
- passwordPattern: api.getPasswordRegex(),
- canSendMails: api.canSendMails(),
- }));
+ views.replaceContent(
+ this._hostNode,
+ template({
+ userNamePattern: api.getUserNameRegex(),
+ passwordPattern: api.getPasswordRegex(),
+ canSendMails: api.canSendMails(),
+ })
+ );
views.syncScrollPosition();
views.decorateValidator(this._formNode);
- this._userNameInputNode.setAttribute('pattern', api.getUserNameRegex());
- this._passwordInputNode.setAttribute('pattern', api.getPasswordRegex());
- this._formNode.addEventListener('submit', e => {
+ this._userNameInputNode.setAttribute(
+ "pattern",
+ api.getUserNameRegex()
+ );
+ this._passwordInputNode.setAttribute(
+ "pattern",
+ api.getPasswordRegex()
+ );
+ this._formNode.addEventListener("submit", (e) => {
e.preventDefault();
- this.dispatchEvent(new CustomEvent('submit', {
- detail: {
- name: this._userNameInputNode.value,
- password: this._passwordInputNode.value,
- remember: this._rememberInputNode.checked,
- },
- }));
+ this.dispatchEvent(
+ new CustomEvent("submit", {
+ detail: {
+ name: this._userNameInputNode.value,
+ password: this._passwordInputNode.value,
+ remember: this._rememberInputNode.checked,
+ },
+ })
+ );
});
}
get _formNode() {
- return this._hostNode.querySelector('form');
+ return this._hostNode.querySelector("form");
}
get _userNameInputNode() {
- return this._formNode.querySelector('[name=name]');
+ return this._formNode.querySelector("[name=name]");
}
get _passwordInputNode() {
- return this._formNode.querySelector('[name=password]');
+ return this._formNode.querySelector("[name=password]");
}
get _rememberInputNode() {
- return this._formNode.querySelector('[name=remember-user]');
+ return this._formNode.querySelector("[name=remember-user]");
}
disableForm() {
diff --git a/client/js/views/manual_page_view.js b/client/js/views/manual_page_view.js
index 6798e9b..390994d 100644
--- a/client/js/views/manual_page_view.js
+++ b/client/js/views/manual_page_view.js
@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
-const router = require('../router.js');
-const keyboard = require('../util/keyboard.js');
-const views = require('../util/views.js');
+const router = require("../router.js");
+const keyboard = require("../util/keyboard.js");
+const views = require("../util/views.js");
-const holderTemplate = views.getTemplate('manual-pager');
-const navTemplate = views.getTemplate('manual-pager-nav');
+const holderTemplate = views.getTemplate("manual-pager");
+const navTemplate = views.getTemplate("manual-pager-nav");
function _removeConsecutiveDuplicates(a) {
return a.filter((item, pos, ary) => {
@@ -22,9 +22,7 @@ function _getVisiblePageNumbers(currentPage, totalPages) {
for (let i = totalPages - threshold; i <= totalPages; i++) {
pagesVisible.push(i);
}
- for (let i = currentPage - threshold;
- i <= currentPage + threshold;
- i++) {
+ for (let i = currentPage - threshold; i <= currentPage + threshold; i++) {
pagesVisible.push(i);
}
pagesVisible = pagesVisible.filter((item, pos, ary) => {
@@ -38,18 +36,22 @@ function _getVisiblePageNumbers(currentPage, totalPages) {
}
function _getPages(
- currentPage, pageNumbers, limit, defaultLimit, removedItems) {
+ currentPage,
+ pageNumbers,
+ limit,
+ defaultLimit,
+ removedItems
+) {
const pages = new Map();
let prevPage = 0;
for (let page of pageNumbers) {
if (page !== prevPage + 1) {
- pages.set(page - 1, {ellipsis: true});
+ pages.set(page - 1, { ellipsis: true });
}
pages.set(page, {
number: page,
offset:
- ((page - 1) * limit) -
- (page > currentPage ? removedItems : 0),
+ (page - 1) * limit - (page > currentPage ? removedItems : 0),
limit: limit === defaultLimit ? null : limit,
active: currentPage === page,
});
@@ -60,7 +62,7 @@ function _getPages(
class ManualPageView {
constructor(ctx) {
- this._hostNode = document.getElementById('content-holder');
+ this._hostNode = document.getElementById("content-holder");
views.replaceContent(this._hostNode, holderTemplate());
}
@@ -70,52 +72,65 @@ class ManualPageView {
this.clearMessages();
views.emptyContent(this._pageNavNode);
- ctx.requestPage(offset, limit).then(response => {
- ctx.pageRenderer({
- parameters: ctx.parameters,
- response: response,
- hostNode: this._pageContentHolderNode,
- });
-
- keyboard.bind(['a', 'left'], () => {
- this._navigateToPrevNextPage('prev');
- });
- keyboard.bind(['d', 'right'], () => {
- this._navigateToPrevNextPage('next');
- });
-
- let removedItems = 0;
- if (response.total) {
- this._refreshNav(
- offset, limit, response.total, removedItems, ctx);
+ ctx.requestPage(offset, limit).then(
+ (response) => {
+ ctx.pageRenderer({
+ parameters: ctx.parameters,
+ response: response,
+ hostNode: this._pageContentHolderNode,
+ });
+
+ keyboard.bind(["a", "left"], () => {
+ this._navigateToPrevNextPage("prev");
+ });
+ keyboard.bind(["d", "right"], () => {
+ this._navigateToPrevNextPage("next");
+ });
+
+ let removedItems = 0;
+ if (response.total) {
+ this._refreshNav(
+ offset,
+ limit,
+ response.total,
+ removedItems,
+ ctx
+ );
+ }
+
+ if (!response.results.length) {
+ this.showInfo("No data to show");
+ }
+
+ response.results.addEventListener("remove", (e) => {
+ removedItems++;
+ this._refreshNav(
+ offset,
+ limit,
+ response.total,
+ removedItems,
+ ctx
+ );
+ });
+
+ views.syncScrollPosition();
+ },
+ (response) => {
+ this.showError(response.message);
}
-
- if (!response.results.length) {
- this.showInfo('No data to show');
- }
-
- response.results.addEventListener('remove', e => {
- removedItems++;
- this._refreshNav(
- offset, limit, response.total, removedItems, ctx);
- });
-
- views.syncScrollPosition();
- }, response => {
- this.showError(response.message);
- });
+ );
}
get pageHeaderHolderNode() {
- return this._hostNode.querySelector('.page-header-holder');
+ return this._hostNode.querySelector(".page-header-holder");
}
get _pageContentHolderNode() {
- return this._hostNode.querySelector('.page-content-holder');
+ return this._hostNode.querySelector(".page-content-holder");
}
get _pageNavNode() {
- return this._hostNode.querySelector('.page-nav');
+ return this._hostNode.querySelector(".page-nav");
}
clearMessages() {
@@ -135,11 +150,11 @@ class ManualPageView {
}
_navigateToPrevNextPage(className) {
- const linkNode = this._hostNode.querySelector('a.' + className);
- if (linkNode.classList.contains('disabled')) {
+ const linkNode = this._hostNode.querySelector("a." + className);
+ if (linkNode.classList.contains("disabled")) {
return;
}
- router.show(linkNode.getAttribute('href'));
+ router.show(linkNode.getAttribute("href"));
}
_refreshNav(offset, limit, total, removedItems, ctx) {
@@ -147,7 +162,12 @@ class ManualPageView {
const totalPages = Math.ceil((total - removedItems) / limit);
const pageNumbers = _getVisiblePageNumbers(currentPage, totalPages);
const pages = _getPages(
- currentPage, pageNumbers, limit, ctx.defaultLimit, removedItems);
+ currentPage,
+ pageNumbers,
+ limit,
+ ctx.defaultLimit,
+ removedItems
+ );
views.replaceContent(
this._pageNavNode,
@@ -158,7 +178,8 @@ class ManualPageView {
currentPage: currentPage,
totalPages: totalPages,
pages: pages,
- }));
+ })
+ );
}
}
diff --git a/client/js/views/not_found_view.js b/client/js/views/not_found_view.js
index 487613b..c930b09 100644
--- a/client/js/views/not_found_view.js
+++ b/client/js/views/not_found_view.js
@@ -1,14 +1,14 @@
-'use strict';
+"use strict";
-const views = require('../util/views.js');
+const views = require("../util/views.js");
-const template = views.getTemplate('not-found');
+const template = views.getTemplate("not-found");
class NotFoundView {
constructor(path) {
- this._hostNode = document.getElementById('content-holder');
+ this._hostNode = document.getElementById("content-holder");
- const sourceNode = template({path: path});
+ const sourceNode = template({ path: path });
views.replaceContent(this._hostNode, sourceNode);
views.syncScrollPosition();
}
diff --git a/client/js/views/password_reset_view.js b/client/js/views/password_reset_view.js
index 685fe5a..82a7d50 100644
--- a/client/js/views/password_reset_view.js
+++ b/client/js/views/password_reset_view.js
@@ -1,30 +1,35 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const api = require('../api.js');
-const views = require('../util/views.js');
+const events = require("../events.js");
+const api = require("../api.js");
+const views = require("../util/views.js");
-const template = views.getTemplate('password-reset');
+const template = views.getTemplate("password-reset");
class PasswordResetView extends events.EventTarget {
constructor() {
super();
- this._hostNode = document.getElementById('content-holder');
+ this._hostNode = document.getElementById("content-holder");
- views.replaceContent(this._hostNode, template({
- canSendMails: api.canSendMails(),
- contactEmail: api.getContactEmail(),
- }));
+ views.replaceContent(
+ this._hostNode,
+ template({
+ canSendMails: api.canSendMails(),
+ contactEmail: api.getContactEmail(),
+ })
+ );
views.syncScrollPosition();
views.decorateValidator(this._formNode);
- this._formNode.addEventListener('submit', e => {
+ this._formNode.addEventListener("submit", (e) => {
e.preventDefault();
- this.dispatchEvent(new CustomEvent('submit', {
- detail: {
- userNameOrEmail: this._userNameOrEmailFieldNode.value,
- },
- }));
+ this.dispatchEvent(
+ new CustomEvent("submit", {
+ detail: {
+ userNameOrEmail: this._userNameOrEmailFieldNode.value,
+ },
+ })
+ );
});
}
@@ -49,11 +54,11 @@ class PasswordResetView extends events.EventTarget {
}
get _formNode() {
- return this._hostNode.querySelector('form');
+ return this._hostNode.querySelector("form");
}
get _userNameOrEmailFieldNode() {
- return this._formNode.querySelector('[name=user-name]');
+ return this._formNode.querySelector("[name=user-name]");
}
}
diff --git a/client/js/views/pool_categories_view.js b/client/js/views/pool_categories_view.js
index 1928358..ac381d5 100644
--- a/client/js/views/pool_categories_view.js
+++ b/client/js/views/pool_categories_view.js
@@ -1,17 +1,17 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const views = require('../util/views.js');
-const PoolCategory = require('../models/pool_category.js');
+const events = require("../events.js");
+const views = require("../util/views.js");
+const PoolCategory = require("../models/pool_category.js");
-const template = views.getTemplate('pool-categories');
-const rowTemplate = views.getTemplate('pool-category-row');
+const template = views.getTemplate("pool-categories");
+const rowTemplate = views.getTemplate("pool-category-row");
class PoolCategoriesView extends events.EventTarget {
constructor(ctx) {
super();
this._ctx = ctx;
- this._hostNode = document.getElementById('content-holder');
+ this._hostNode = document.getElementById("content-holder");
views.replaceContent(this._hostNode, template(ctx));
views.syncScrollPosition();
@@ -31,18 +31,22 @@ class PoolCategoriesView extends events.EventTarget {
}
if (this._addLinkNode) {
- this._addLinkNode.addEventListener(
- 'click', e => this._evtAddButtonClick(e));
+ this._addLinkNode.addEventListener("click", (e) =>
+ this._evtAddButtonClick(e)
+ );
}
- ctx.poolCategories.addEventListener(
- 'add', e => this._evtPoolCategoryAdded(e));
+ ctx.poolCategories.addEventListener("add", (e) =>
+ this._evtPoolCategoryAdded(e)
+ );
- ctx.poolCategories.addEventListener(
- 'remove', e => this._evtPoolCategoryDeleted(e));
+ ctx.poolCategories.addEventListener("remove", (e) =>
+ this._evtPoolCategoryDeleted(e)
+ );
- this._formNode.addEventListener(
- 'submit', e => this._evtSaveButtonClick(e, ctx));
+ this._formNode.addEventListener("submit", (e) =>
+ this._evtSaveButtonClick(e, ctx)
+ );
}
enableForm() {
@@ -66,44 +70,48 @@ class PoolCategoriesView extends events.EventTarget {
}
get _formNode() {
- return this._hostNode.querySelector('form');
+ return this._hostNode.querySelector("form");
}
get _tableBodyNode() {
- return this._hostNode.querySelector('tbody');
+ return this._hostNode.querySelector("tbody");
}
get _addLinkNode() {
- return this._hostNode.querySelector('a.add');
+ return this._hostNode.querySelector("a.add");
}
_addPoolCategoryRowNode(poolCategory) {
const rowNode = rowTemplate(
- Object.assign(
- {}, this._ctx, {poolCategory: poolCategory}));
+ Object.assign({}, this._ctx, { poolCategory: poolCategory })
+ );
- const nameInput = rowNode.querySelector('.name input');
+ const nameInput = rowNode.querySelector(".name input");
if (nameInput) {
- nameInput.addEventListener(
- 'change', e => this._evtNameChange(e, rowNode));
+ nameInput.addEventListener("change", (e) =>
+ this._evtNameChange(e, rowNode)
+ );
}
- const colorInput = rowNode.querySelector('.color input');
+ const colorInput = rowNode.querySelector(".color input");
if (colorInput) {
- colorInput.addEventListener(
- 'change', e => this._evtColorChange(e, rowNode));
+ colorInput.addEventListener("change", (e) =>
+ this._evtColorChange(e, rowNode)
+ );
}
- const removeLinkNode = rowNode.querySelector('.remove a');
+ const removeLinkNode = rowNode.querySelector(".remove a");
if (removeLinkNode) {
- removeLinkNode.addEventListener(
- 'click', e => this._evtDeleteButtonClick(e, rowNode));
+ removeLinkNode.addEventListener("click", (e) =>
+ this._evtDeleteButtonClick(e, rowNode)
+ );
}
- const defaultLinkNode = rowNode.querySelector('.set-default a');
+ const defaultLinkNode = rowNode.querySelector(".set-default a");
if (defaultLinkNode) {
- defaultLinkNode.addEventListener(
- 'click', e => this._evtSetDefaultButtonClick(e, rowNode));
+ defaultLinkNode.addEventListener("click", (e) =>
+ this._evtSetDefaultButtonClick(e, rowNode)
+ );
}
this._tableBodyNode.appendChild(rowNode);
@@ -141,7 +149,7 @@ class PoolCategoriesView extends events.EventTarget {
_evtDeleteButtonClick(e, rowNode, link) {
e.preventDefault();
- if (e.target.classList.contains('inactive')) {
+ if (e.target.classList.contains("inactive")) {
return;
}
this._ctx.poolCategories.remove(rowNode._poolCategory);
@@ -150,16 +158,16 @@ class PoolCategoriesView extends events.EventTarget {
_evtSetDefaultButtonClick(e, rowNode) {
e.preventDefault();
this._ctx.poolCategories.defaultCategory = rowNode._poolCategory;
- const oldRowNode = rowNode.parentNode.querySelector('tr.default');
+ const oldRowNode = rowNode.parentNode.querySelector("tr.default");
if (oldRowNode) {
- oldRowNode.classList.remove('default');
+ oldRowNode.classList.remove("default");
}
- rowNode.classList.add('default');
+ rowNode.classList.add("default");
}
_evtSaveButtonClick(e, ctx) {
e.preventDefault();
- this.dispatchEvent(new CustomEvent('submit'));
+ this.dispatchEvent(new CustomEvent("submit"));
}
}
diff --git a/client/js/views/pool_create_view.js b/client/js/views/pool_create_view.js
index f22cf71..fc75f45 100644
--- a/client/js/views/pool_create_view.js
+++ b/client/js/views/pool_create_view.js
@@ -1,41 +1,43 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const api = require('../api.js');
-const misc = require('../util/misc.js');
-const views = require('../util/views.js');
-const Pool = require('../models/pool.js')
+const events = require("../events.js");
+const api = require("../api.js");
+const misc = require("../util/misc.js");
+const views = require("../util/views.js");
+const Pool = require("../models/pool.js");
-const template = views.getTemplate('pool-create');
+const template = views.getTemplate("pool-create");
class PoolCreateView extends events.EventTarget {
constructor(ctx) {
super();
- this._hostNode = document.getElementById('content-holder');
+ this._hostNode = document.getElementById("content-holder");
views.replaceContent(this._hostNode, template(ctx));
views.decorateValidator(this._formNode);
if (this._namesFieldNode) {
- this._namesFieldNode.addEventListener(
- 'input', e => this._evtNameInput(e));
+ this._namesFieldNode.addEventListener("input", (e) =>
+ this._evtNameInput(e)
+ );
}
if (this._postsFieldNode) {
- this._postsFieldNode.addEventListener(
- 'input', e => this._evtPostsInput(e));
+ this._postsFieldNode.addEventListener("input", (e) =>
+ this._evtPostsInput(e)
+ );
}
for (let node of this._formNode.querySelectorAll(
- 'input, select, textarea, posts')) {
- node.addEventListener(
- 'change', e => {
- this.dispatchEvent(new CustomEvent('change'));
- });
+ "input, select, textarea, posts"
+ )) {
+ node.addEventListener("change", (e) => {
+ this.dispatchEvent(new CustomEvent("change"));
+ });
}
- this._formNode.addEventListener('submit', e => this._evtSubmit(e));
+ this._formNode.addEventListener("submit", (e) => this._evtSubmit(e));
}
clearMessages() {
@@ -64,19 +66,21 @@ class PoolCreateView extends events.EventTarget {
if (!list.length) {
this._namesFieldNode.setCustomValidity(
- 'Pools must have at least one name.');
+ "Pools must have at least one name."
+ );
return;
}
for (let item of list) {
if (!regex.test(item)) {
this._namesFieldNode.setCustomValidity(
- `Pool name "${item}" contains invalid symbols.`);
+ `Pool name "${item}" contains invalid symbols.`
+ );
return;
}
}
- this._namesFieldNode.setCustomValidity('');
+ this._namesFieldNode.setCustomValidity("");
}
_evtPostsInput(e) {
@@ -86,46 +90,50 @@ class PoolCreateView extends events.EventTarget {
for (let item of list) {
if (!regex.test(item)) {
this._postsFieldNode.setCustomValidity(
- `Pool ID "${item}" is not an integer.`);
+ `Pool ID "${item}" is not an integer.`
+ );
return;
}
}
- this._postsFieldNode.setCustomValidity('');
+ this._postsFieldNode.setCustomValidity("");
}
_evtSubmit(e) {
e.preventDefault();
- this.dispatchEvent(new CustomEvent('submit', {
- detail: {
- names: misc.splitByWhitespace(this._namesFieldNode.value),
- category: this._categoryFieldNode.value,
- description: this._descriptionFieldNode.value,
- posts: misc.splitByWhitespace(this._postsFieldNode.value)
- .map(i => parseInt(i))
- },
- }));
+ this.dispatchEvent(
+ new CustomEvent("submit", {
+ detail: {
+ names: misc.splitByWhitespace(this._namesFieldNode.value),
+ category: this._categoryFieldNode.value,
+ description: this._descriptionFieldNode.value,
+ posts: misc
+ .splitByWhitespace(this._postsFieldNode.value)
+ .map((i) => parseInt(i)),
+ },
+ })
+ );
}
get _formNode() {
- return this._hostNode.querySelector('form');
+ return this._hostNode.querySelector("form");
}
get _namesFieldNode() {
- return this._formNode.querySelector('.names input');
+ return this._formNode.querySelector(".names input");
}
get _categoryFieldNode() {
- return this._formNode.querySelector('.category select');
+ return this._formNode.querySelector(".category select");
}
get _descriptionFieldNode() {
- return this._formNode.querySelector('.description textarea');
+ return this._formNode.querySelector(".description textarea");
}
get _postsFieldNode() {
- return this._formNode.querySelector('.posts input');
+ return this._formNode.querySelector(".posts input");
}
}
diff --git a/client/js/views/pool_delete_view.js b/client/js/views/pool_delete_view.js
index d3707db..fa92a49 100644
--- a/client/js/views/pool_delete_view.js
+++ b/client/js/views/pool_delete_view.js
@@ -1,9 +1,9 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const views = require('../util/views.js');
+const events = require("../events.js");
+const views = require("../util/views.js");
-const template = views.getTemplate('pool-delete');
+const template = views.getTemplate("pool-delete");
class PoolDeleteView extends events.EventTarget {
constructor(ctx) {
@@ -13,7 +13,7 @@ class PoolDeleteView extends events.EventTarget {
this._pool = ctx.pool;
views.replaceContent(this._hostNode, template(ctx));
views.decorateValidator(this._formNode);
- this._formNode.addEventListener('submit', e => this._evtSubmit(e));
+ this._formNode.addEventListener("submit", (e) => this._evtSubmit(e));
}
clearMessages() {
@@ -38,15 +38,17 @@ class PoolDeleteView extends events.EventTarget {
_evtSubmit(e) {
e.preventDefault();
- this.dispatchEvent(new CustomEvent('submit', {
- detail: {
- pool: this._pool,
- },
- }));
+ this.dispatchEvent(
+ new CustomEvent("submit", {
+ detail: {
+ pool: this._pool,
+ },
+ })
+ );
}
get _formNode() {
- return this._hostNode.querySelector('form');
+ return this._hostNode.querySelector("form");
}
}
diff --git a/client/js/views/pool_edit_view.js b/client/js/views/pool_edit_view.js
index 9c118b3..b30ab9b 100644
--- a/client/js/views/pool_edit_view.js
+++ b/client/js/views/pool_edit_view.js
@@ -1,12 +1,12 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const api = require('../api.js');
-const misc = require('../util/misc.js');
-const views = require('../util/views.js');
-const Post = require('../models/post.js');
+const events = require("../events.js");
+const api = require("../api.js");
+const misc = require("../util/misc.js");
+const views = require("../util/views.js");
+const Post = require("../models/post.js");
-const template = views.getTemplate('pool-edit');
+const template = views.getTemplate("pool-edit");
class PoolEditView extends events.EventTarget {
constructor(ctx) {
@@ -19,24 +19,26 @@ class PoolEditView extends events.EventTarget {
views.decorateValidator(this._formNode);
if (this._namesFieldNode) {
- this._namesFieldNode.addEventListener(
- 'input', e => this._evtNameInput(e));
+ this._namesFieldNode.addEventListener("input", (e) =>
+ this._evtNameInput(e)
+ );
}
if (this._postsFieldNode) {
- this._postsFieldNode.addEventListener(
- 'input', e => this._evtPostsInput(e));
+ this._postsFieldNode.addEventListener("input", (e) =>
+ this._evtPostsInput(e)
+ );
}
for (let node of this._formNode.querySelectorAll(
- 'input, select, textarea, posts')) {
- node.addEventListener(
- 'change', e => {
- this.dispatchEvent(new CustomEvent('change'));
- });
+ "input, select, textarea, posts"
+ )) {
+ node.addEventListener("change", (e) => {
+ this.dispatchEvent(new CustomEvent("change"));
+ });
}
- this._formNode.addEventListener('submit', e => this._evtSubmit(e));
+ this._formNode.addEventListener("submit", (e) => this._evtSubmit(e));
}
clearMessages() {
@@ -65,19 +67,21 @@ class PoolEditView extends events.EventTarget {
if (!list.length) {
this._namesFieldNode.setCustomValidity(
- 'Pools must have at least one name.');
+ "Pools must have at least one name."
+ );
return;
}
for (let item of list) {
if (!regex.test(item)) {
this._namesFieldNode.setCustomValidity(
- `Pool name "${item}" contains invalid symbols.`);
+ `Pool name "${item}" contains invalid symbols.`
+ );
return;
}
}
- this._namesFieldNode.setCustomValidity('');
+ this._namesFieldNode.setCustomValidity("");
}
_evtPostsInput(e) {
@@ -87,57 +91,60 @@ class PoolEditView extends events.EventTarget {
for (let item of list) {
if (!regex.test(item)) {
this._postsFieldNode.setCustomValidity(
- `Pool ID "${item}" is not an integer.`);
+ `Pool ID "${item}" is not an integer.`
+ );
return;
}
}
- this._postsFieldNode.setCustomValidity('');
+ this._postsFieldNode.setCustomValidity("");
}
_evtSubmit(e) {
e.preventDefault();
- this.dispatchEvent(new CustomEvent('submit', {
- detail: {
- pool: this._pool,
-
- names: this._namesFieldNode ?
- misc.splitByWhitespace(this._namesFieldNode.value) :
- undefined,
-
- category: this._categoryFieldNode ?
- this._categoryFieldNode.value :
- undefined,
-
- description: this._descriptionFieldNode ?
- this._descriptionFieldNode.value :
- undefined,
-
- posts: this._postsFieldNode ?
- misc.splitByWhitespace(this._postsFieldNode.value) :
- undefined,
- },
- }));
+ this.dispatchEvent(
+ new CustomEvent("submit", {
+ detail: {
+ pool: this._pool,
+
+ names: this._namesFieldNode
+ ? misc.splitByWhitespace(this._namesFieldNode.value)
+ : undefined,
+
+ category: this._categoryFieldNode
+ ? this._categoryFieldNode.value
+ : undefined,
+
+ description: this._descriptionFieldNode
+ ? this._descriptionFieldNode.value
+ : undefined,
+
+ posts: this._postsFieldNode
+ ? misc.splitByWhitespace(this._postsFieldNode.value)
+ : undefined,
+ },
+ })
+ );
}
get _formNode() {
- return this._hostNode.querySelector('form');
+ return this._hostNode.querySelector("form");
}
get _namesFieldNode() {
- return this._formNode.querySelector('.names input');
+ return this._formNode.querySelector(".names input");
}
get _categoryFieldNode() {
- return this._formNode.querySelector('.category select');
+ return this._formNode.querySelector(".category select");
}
get _descriptionFieldNode() {
- return this._formNode.querySelector('.description textarea');
+ return this._formNode.querySelector(".description textarea");
}
get _postsFieldNode() {
- return this._formNode.querySelector('.posts input');
+ return this._formNode.querySelector(".posts input");
}
}
diff --git a/client/js/views/pool_merge_view.js b/client/js/views/pool_merge_view.js
index 09c4e8d..f0ca15a 100644
--- a/client/js/views/pool_merge_view.js
+++ b/client/js/views/pool_merge_view.js
@@ -1,12 +1,11 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const api = require('../api.js');
-const views = require('../util/views.js');
-const PoolAutoCompleteControl =
- require('../controls/pool_auto_complete_control.js');
+const events = require("../events.js");
+const api = require("../api.js");
+const views = require("../util/views.js");
+const PoolAutoCompleteControl = require("../controls/pool_auto_complete_control.js");
-const template = views.getTemplate('pool-merge');
+const template = views.getTemplate("pool-merge");
class PoolMergeView extends events.EventTarget {
constructor(ctx) {
@@ -23,15 +22,18 @@ class PoolMergeView extends events.EventTarget {
this._autoCompleteControl = new PoolAutoCompleteControl(
this._targetPoolFieldNode,
{
- confirm: pool => {
+ confirm: (pool) => {
this._targetPoolId = pool.id;
this._autoCompleteControl.replaceSelectedText(
- pool.names[0], false);
- }
- });
+ pool.names[0],
+ false
+ );
+ },
+ }
+ );
}
- this._formNode.addEventListener('submit', e => this._evtSubmit(e));
+ this._formNode.addEventListener("submit", (e) => this._evtSubmit(e));
}
clearMessages() {
@@ -56,24 +58,26 @@ class PoolMergeView extends events.EventTarget {
_evtSubmit(e) {
e.preventDefault();
- this.dispatchEvent(new CustomEvent('submit', {
- detail: {
- pool: this._pool,
- targetPoolId: this._targetPoolId
- },
- }));
+ this.dispatchEvent(
+ new CustomEvent("submit", {
+ detail: {
+ pool: this._pool,
+ targetPoolId: this._targetPoolId,
+ },
+ })
+ );
}
get _formNode() {
- return this._hostNode.querySelector('form');
+ return this._hostNode.querySelector("form");
}
get _targetPoolFieldNode() {
- return this._formNode.querySelector('input[name=target-pool]');
+ return this._formNode.querySelector("input[name=target-pool]");
}
get _addAliasCheckboxNode() {
- return this._formNode.querySelector('input[name=alias]');
+ return this._formNode.querySelector("input[name=alias]");
}
}
diff --git a/client/js/views/pool_summary_view.js b/client/js/views/pool_summary_view.js
index a5808cc..37ce1c2 100644
--- a/client/js/views/pool_summary_view.js
+++ b/client/js/views/pool_summary_view.js
@@ -1,8 +1,8 @@
-'use strict';
+"use strict";
-const views = require('../util/views.js');
+const views = require("../util/views.js");
-const template = views.getTemplate('pool-summary');
+const template = views.getTemplate("pool-summary");
class PoolSummaryView {
constructor(ctx) {
diff --git a/client/js/views/pool_view.js b/client/js/views/pool_view.js
index f296e90..12b7704 100644
--- a/client/js/views/pool_view.js
+++ b/client/js/views/pool_view.js
@@ -1,26 +1,26 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const views = require('../util/views.js');
-const misc = require('../util/misc.js');
-const PoolSummaryView = require('./pool_summary_view.js');
-const PoolEditView = require('./pool_edit_view.js');
-const PoolMergeView = require('./pool_merge_view.js');
-const PoolDeleteView = require('./pool_delete_view.js');
-const EmptyView = require('../views/empty_view.js');
+const events = require("../events.js");
+const views = require("../util/views.js");
+const misc = require("../util/misc.js");
+const PoolSummaryView = require("./pool_summary_view.js");
+const PoolEditView = require("./pool_edit_view.js");
+const PoolMergeView = require("./pool_merge_view.js");
+const PoolDeleteView = require("./pool_delete_view.js");
+const EmptyView = require("../views/empty_view.js");
-const template = views.getTemplate('pool');
+const template = views.getTemplate("pool");
class PoolView extends events.EventTarget {
constructor(ctx) {
super();
this._ctx = ctx;
- ctx.pool.addEventListener('change', e => this._evtChange(e));
- ctx.section = ctx.section || 'summary';
+ ctx.pool.addEventListener("change", (e) => this._evtChange(e));
+ ctx.section = ctx.section || "summary";
ctx.getPrettyPoolName = misc.getPrettyPoolName;
- this._hostNode = document.getElementById('content-holder');
+ this._hostNode = document.getElementById("content-holder");
this._install();
}
@@ -28,52 +28,54 @@ class PoolView extends events.EventTarget {
const ctx = this._ctx;
views.replaceContent(this._hostNode, template(ctx));
- for (let item of this._hostNode.querySelectorAll('[data-name]')) {
+ for (let item of this._hostNode.querySelectorAll("[data-name]")) {
item.classList.toggle(
- 'active', item.getAttribute('data-name') === ctx.section);
- if (item.getAttribute('data-name') === ctx.section) {
+ "active",
+ item.getAttribute("data-name") === ctx.section
+ );
+ if (item.getAttribute("data-name") === ctx.section) {
item.parentNode.scrollLeft =
item.getBoundingClientRect().left -
- item.parentNode.getBoundingClientRect().left
+ item.parentNode.getBoundingClientRect().left;
}
}
- ctx.hostNode = this._hostNode.querySelector('.pool-content-holder');
- if (ctx.section === 'edit') {
+ ctx.hostNode = this._hostNode.querySelector(".pool-content-holder");
+ if (ctx.section === "edit") {
if (!this._ctx.canEditAnything) {
this._view = new EmptyView();
this._view.showError(
- 'You don\'t have privileges to edit pools.');
+ "You don't have privileges to edit pools."
+ );
} else {
this._view = new PoolEditView(ctx);
- events.proxyEvent(this._view, this, 'submit');
+ events.proxyEvent(this._view, this, "submit");
}
-
- } else if (ctx.section === 'merge') {
+ } else if (ctx.section === "merge") {
if (!this._ctx.canMerge) {
this._view = new EmptyView();
this._view.showError(
- 'You don\'t have privileges to merge pools.');
+ "You don't have privileges to merge pools."
+ );
} else {
this._view = new PoolMergeView(ctx);
- events.proxyEvent(this._view, this, 'submit', 'merge');
+ events.proxyEvent(this._view, this, "submit", "merge");
}
-
- } else if (ctx.section === 'delete') {
+ } else if (ctx.section === "delete") {
if (!this._ctx.canDelete) {
this._view = new EmptyView();
this._view.showError(
- 'You don\'t have privileges to delete pools.');
+ "You don't have privileges to delete pools."
+ );
} else {
this._view = new PoolDeleteView(ctx);
- events.proxyEvent(this._view, this, 'submit', 'delete');
+ events.proxyEvent(this._view, this, "submit", "delete");
}
-
} else {
this._view = new PoolSummaryView(ctx);
}
- events.proxyEvent(this._view, this, 'change');
+ events.proxyEvent(this._view, this, "change");
views.syncScrollPosition();
}
diff --git a/client/js/views/pools_header_view.js b/client/js/views/pools_header_view.js
index 65bbe1b..cfc6c8b 100644
--- a/client/js/views/pools_header_view.js
+++ b/client/js/views/pools_header_view.js
@@ -1,13 +1,12 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const misc = require('../util/misc.js');
-const search = require('../util/search.js');
-const views = require('../util/views.js');
-const PoolAutoCompleteControl =
- require('../controls/pool_auto_complete_control.js');
+const events = require("../events.js");
+const misc = require("../util/misc.js");
+const search = require("../util/search.js");
+const views = require("../util/views.js");
+const PoolAutoCompleteControl = require("../controls/pool_auto_complete_control.js");
-const template = views.getTemplate('pools-header');
+const template = views.getTemplate("pools-header");
class PoolsHeaderView extends events.EventTarget {
constructor(ctx) {
@@ -20,31 +19,41 @@ class PoolsHeaderView extends events.EventTarget {
this._autoCompleteControl = new PoolAutoCompleteControl(
this._queryInputNode,
{
- confirm: pool => this._autoCompleteControl.replaceSelectedText(
- misc.escapeSearchTerm(pool.names[0]), true),
- });
+ confirm: (pool) =>
+ this._autoCompleteControl.replaceSelectedText(
+ misc.escapeSearchTerm(pool.names[0]),
+ true
+ ),
+ }
+ );
}
search.searchInputNodeFocusHelper(this._queryInputNode);
- this._formNode.addEventListener('submit', e => this._evtSubmit(e));
+ this._formNode.addEventListener("submit", (e) => this._evtSubmit(e));
}
get _formNode() {
- return this._hostNode.querySelector('form');
+ return this._hostNode.querySelector("form");
}
get _queryInputNode() {
- return this._hostNode.querySelector('[name=search-text]');
+ return this._hostNode.querySelector("[name=search-text]");
}
_evtSubmit(e) {
e.preventDefault();
this._queryInputNode.blur();
- this.dispatchEvent(new CustomEvent('navigate', {detail: {parameters: {
- query: this._queryInputNode.value,
- page: 1,
- }}}));
+ this.dispatchEvent(
+ new CustomEvent("navigate", {
+ detail: {
+ parameters: {
+ query: this._queryInputNode.value,
+ page: 1,
+ },
+ },
+ })
+ );
}
}
diff --git a/client/js/views/pools_page_view.js b/client/js/views/pools_page_view.js
index 234d446..6230ef6 100644
--- a/client/js/views/pools_page_view.js
+++ b/client/js/views/pools_page_view.js
@@ -1,8 +1,8 @@
-'use strict';
+"use strict";
-const views = require('../util/views.js');
+const views = require("../util/views.js");
-const template = views.getTemplate('pools-page');
+const template = views.getTemplate("pools-page");
class PoolsPageView {
constructor(ctx) {
diff --git a/client/js/views/post_detail_view.js b/client/js/views/post_detail_view.js
index 14786d3..587c41f 100644
--- a/client/js/views/post_detail_view.js
+++ b/client/js/views/post_detail_view.js
@@ -1,21 +1,21 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const views = require('../util/views.js');
-const PostMergeView = require('./post_merge_view.js');
-const EmptyView = require('../views/empty_view.js');
+const events = require("../events.js");
+const views = require("../util/views.js");
+const PostMergeView = require("./post_merge_view.js");
+const EmptyView = require("../views/empty_view.js");
-const template = views.getTemplate('post-detail');
+const template = views.getTemplate("post-detail");
class PostDetailView extends events.EventTarget {
constructor(ctx) {
super();
this._ctx = ctx;
- ctx.post.addEventListener('change', e => this._evtChange(e));
- ctx.section = ctx.section || 'summary';
+ ctx.post.addEventListener("change", (e) => this._evtChange(e));
+ ctx.section = ctx.section || "summary";
- this._hostNode = document.getElementById('content-holder');
+ this._hostNode = document.getElementById("content-holder");
this._install();
}
@@ -23,28 +23,30 @@ class PostDetailView extends events.EventTarget {
const ctx = this._ctx;
views.replaceContent(this._hostNode, template(ctx));
- for (let item of this._hostNode.querySelectorAll('[data-name]')) {
+ for (let item of this._hostNode.querySelectorAll("[data-name]")) {
item.classList.toggle(
- 'active', item.getAttribute('data-name') === ctx.section);
- if (item.getAttribute('data-name') === ctx.section) {
+ "active",
+ item.getAttribute("data-name") === ctx.section
+ );
+ if (item.getAttribute("data-name") === ctx.section) {
item.parentNode.scrollLeft =
item.getBoundingClientRect().left -
- item.parentNode.getBoundingClientRect().left
+ item.parentNode.getBoundingClientRect().left;
}
}
- ctx.hostNode = this._hostNode.querySelector('.post-content-holder');
- if (ctx.section === 'merge') {
+ ctx.hostNode = this._hostNode.querySelector(".post-content-holder");
+ if (ctx.section === "merge") {
if (!this._ctx.canMerge) {
this._view = new EmptyView();
this._view.showError(
- 'You don\'t have privileges to merge posts.');
+ "You don't have privileges to merge posts."
+ );
} else {
this._view = new PostMergeView(ctx);
- events.proxyEvent(this._view, this, 'select');
- events.proxyEvent(this._view, this, 'submit', 'merge');
+ events.proxyEvent(this._view, this, "select");
+ events.proxyEvent(this._view, this, "submit", "merge");
}
-
} else {
// this._view = new PostSummaryView(ctx);
}
diff --git a/client/js/views/post_main_view.js b/client/js/views/post_main_view.js
index 6a7472c..73bb324 100644
--- a/client/js/views/post_main_view.js
+++ b/client/js/views/post_main_view.js
@@ -1,35 +1,33 @@
-'use strict';
-
-const iosCorrectedInnerHeight = require('ios-inner-height');
-const router = require('../router.js');
-const views = require('../util/views.js');
-const uri = require('../util/uri.js');
-const keyboard = require('../util/keyboard.js');
-const Touch = require('../util/touch.js');
-const PostContentControl = require('../controls/post_content_control.js');
-const PostNotesOverlayControl =
- require('../controls/post_notes_overlay_control.js');
-const PostReadonlySidebarControl =
- require('../controls/post_readonly_sidebar_control.js');
-const PostEditSidebarControl =
- require('../controls/post_edit_sidebar_control.js');
-const CommentControl = require('../controls/comment_control.js');
-const CommentListControl = require('../controls/comment_list_control.js');
-
-const template = views.getTemplate('post-main');
+"use strict";
+
+const iosCorrectedInnerHeight = require("ios-inner-height");
+const router = require("../router.js");
+const views = require("../util/views.js");
+const uri = require("../util/uri.js");
+const keyboard = require("../util/keyboard.js");
+const Touch = require("../util/touch.js");
+const PostContentControl = require("../controls/post_content_control.js");
+const PostNotesOverlayControl = require("../controls/post_notes_overlay_control.js");
+const PostReadonlySidebarControl = require("../controls/post_readonly_sidebar_control.js");
+const PostEditSidebarControl = require("../controls/post_edit_sidebar_control.js");
+const CommentControl = require("../controls/comment_control.js");
+const CommentListControl = require("../controls/comment_list_control.js");
+
+const template = views.getTemplate("post-main");
class PostMainView {
constructor(ctx) {
- this._hostNode = document.getElementById('content-holder');
+ this._hostNode = document.getElementById("content-holder");
const sourceNode = template(ctx);
- const postContainerNode = sourceNode.querySelector('.post-container');
- const sidebarNode = sourceNode.querySelector('.sidebar');
+ const postContainerNode = sourceNode.querySelector(".post-container");
+ const sidebarNode = sourceNode.querySelector(".sidebar");
views.replaceContent(this._hostNode, sourceNode);
views.syncScrollPosition();
- const topNavigationNode =
- document.body.querySelector('#top-navigation');
+ const topNavigationNode = document.body.querySelector(
+ "#top-navigation"
+ );
this._postContentControl = new PostContentControl(
postContainerNode,
@@ -43,15 +41,17 @@ class PostMainView {
margin,
iosCorrectedInnerHeight() -
topNavigationNode.getBoundingClientRect().height -
- (margin * 2),
+ margin * 2,
];
- });
+ }
+ );
this._postNotesOverlayControl = new PostNotesOverlayControl(
- postContainerNode.querySelector('.post-overlay'),
- ctx.post);
+ postContainerNode.querySelector(".post-overlay"),
+ ctx.post
+ );
- if (ctx.post.type === 'video' || ctx.post.type === 'flash') {
+ if (ctx.post.type === "video" || ctx.post.type === "flash") {
this._postContentControl.disableOverlay();
}
@@ -71,16 +71,16 @@ class PostMainView {
}
};
- keyboard.bind('e', () => {
+ keyboard.bind("e", () => {
if (ctx.editMode) {
- router.show(uri.formatClientLink('post', ctx.post.id));
+ router.show(uri.formatClientLink("post", ctx.post.id));
} else {
- router.show(uri.formatClientLink('post', ctx.post.id, 'edit'));
+ router.show(uri.formatClientLink("post", ctx.post.id, "edit"));
}
});
- keyboard.bind(['a', 'left'], showPreviousImage);
- keyboard.bind(['d', 'right'], showNextImage);
- keyboard.bind('del', e => {
+ keyboard.bind(["a", "left"], showPreviousImage);
+ keyboard.bind(["d", "right"], showNextImage);
+ keyboard.bind("del", (e) => {
if (ctx.editMode) {
this.sidebarControl._evtDeleteClick(e);
}
@@ -90,53 +90,65 @@ class PostMainView {
postContainerNode,
() => {
if (!ctx.editMode) {
- showPreviousImage()
+ showPreviousImage();
}
},
() => {
if (!ctx.editMode) {
- showNextImage()
+ showNextImage();
}
}
- )
+ );
}
_installSidebar(ctx) {
const sidebarContainerNode = document.querySelector(
- '#content-holder .sidebar-container');
+ "#content-holder .sidebar-container"
+ );
if (ctx.editMode) {
this.sidebarControl = new PostEditSidebarControl(
sidebarContainerNode,
ctx.post,
this._postContentControl,
- this._postNotesOverlayControl);
+ this._postNotesOverlayControl
+ );
} else {
this.sidebarControl = new PostReadonlySidebarControl(
- sidebarContainerNode, ctx.post, this._postContentControl);
+ sidebarContainerNode,
+ ctx.post,
+ this._postContentControl
+ );
}
}
_installCommentForm() {
const commentFormContainer = document.querySelector(
- '#content-holder .comment-form-container');
+ "#content-holder .comment-form-container"
+ );
if (!commentFormContainer) {
return;
}
this.commentControl = new CommentControl(
- commentFormContainer, null, true);
+ commentFormContainer,
+ null,
+ true
+ );
}
_installComments(comments) {
const commentsContainerNode = document.querySelector(
- '#content-holder .comments-container');
+ "#content-holder .comments-container"
+ );
if (!commentsContainerNode) {
return;
}
this.commentListControl = new CommentListControl(
- commentsContainerNode, comments);
+ commentsContainerNode,
+ comments
+ );
}
}
diff --git a/client/js/views/post_merge_view.js b/client/js/views/post_merge_view.js
index 952e3a3..20924d3 100644
--- a/client/js/views/post_merge_view.js
+++ b/client/js/views/post_merge_view.js
@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const views = require('../util/views.js');
+const events = require("../events.js");
+const views = require("../util/views.js");
const KEY_RETURN = 13;
-const template = views.getTemplate('post-merge');
-const sideTemplate = views.getTemplate('post-merge-side');
+const template = views.getTemplate("post-merge");
+const sideTemplate = views.getTemplate("post-merge-side");
class PostMergeView extends events.EventTarget {
constructor(ctx) {
@@ -23,7 +23,7 @@ class PostMergeView extends events.EventTarget {
this._refreshLeftSide();
this._refreshRightSide();
- this._formNode.addEventListener('submit', e => this._evtSubmit(e));
+ this._formNode.addEventListener("submit", (e) => this._evtSubmit(e));
}
clearMessages() {
@@ -52,47 +52,61 @@ class PostMergeView extends events.EventTarget {
}
_refreshLeftSide() {
- this._refreshSide(this._leftPost, this._leftSideNode, 'left', false);
+ this._refreshSide(this._leftPost, this._leftSideNode, "left", false);
}
_refreshRightSide() {
- this._refreshSide(this._rightPost, this._rightSideNode, 'right', true);
+ this._refreshSide(this._rightPost, this._rightSideNode, "right", true);
}
_refreshSide(post, sideNode, sideName, isEditable) {
views.replaceContent(
sideNode,
- sideTemplate(Object.assign({}, this._ctx, {post: post,
- name: sideName,
- editable: isEditable})));
-
- let postIdNode = sideNode.querySelector('input[type=text]');
- let searchButtonNode = sideNode.querySelector('input[type=button]');
+ sideTemplate(
+ Object.assign({}, this._ctx, {
+ post: post,
+ name: sideName,
+ editable: isEditable,
+ })
+ )
+ );
+
+ let postIdNode = sideNode.querySelector("input[type=text]");
+ let searchButtonNode = sideNode.querySelector("input[type=button]");
if (isEditable) {
- postIdNode.addEventListener(
- 'keydown', e => this._evtPostSearchFieldKeyDown(e));
- searchButtonNode.addEventListener(
- 'click', e => this._evtPostSearchButtonClick(e, postIdNode));
+ postIdNode.addEventListener("keydown", (e) =>
+ this._evtPostSearchFieldKeyDown(e)
+ );
+ searchButtonNode.addEventListener("click", (e) =>
+ this._evtPostSearchButtonClick(e, postIdNode)
+ );
}
}
_evtSubmit(e) {
e.preventDefault();
const checkedTargetPost = this._formNode.querySelector(
- '.target-post :checked').value;
+ ".target-post :checked"
+ ).value;
const checkedTargetPostContent = this._formNode.querySelector(
- '.target-post-content :checked').value;
- this.dispatchEvent(new CustomEvent('submit', {
- detail: {
- post: checkedTargetPost === 'left' ?
- this._rightPost :
- this._leftPost,
- targetPost: checkedTargetPost === 'left' ?
- this._leftPost :
- this._rightPost,
- useOldContent: checkedTargetPostContent !== checkedTargetPost,
- },
- }));
+ ".target-post-content :checked"
+ ).value;
+ this.dispatchEvent(
+ new CustomEvent("submit", {
+ detail: {
+ post:
+ checkedTargetPost === "left"
+ ? this._rightPost
+ : this._leftPost,
+ targetPost:
+ checkedTargetPost === "left"
+ ? this._leftPost
+ : this._rightPost,
+ useOldContent:
+ checkedTargetPostContent !== checkedTargetPost,
+ },
+ })
+ );
}
_evtPostSearchFieldKeyDown(e) {
@@ -102,33 +116,37 @@ class PostMergeView extends events.EventTarget {
}
e.target.blur();
e.preventDefault();
- this.dispatchEvent(new CustomEvent('select', {
- detail: {
- postId: e.target.value,
- },
- }));
+ this.dispatchEvent(
+ new CustomEvent("select", {
+ detail: {
+ postId: e.target.value,
+ },
+ })
+ );
}
_evtPostSearchButtonClick(e, textNode) {
e.target.blur();
e.preventDefault();
- this.dispatchEvent(new CustomEvent('select', {
- detail: {
- postId: textNode.value,
- },
- }));
+ this.dispatchEvent(
+ new CustomEvent("select", {
+ detail: {
+ postId: textNode.value,
+ },
+ })
+ );
}
get _formNode() {
- return this._hostNode.querySelector('form');
+ return this._hostNode.querySelector("form");
}
get _leftSideNode() {
- return this._hostNode.querySelector('.left-post-container');
+ return this._hostNode.querySelector(".left-post-container");
}
get _rightSideNode() {
- return this._hostNode.querySelector('.right-post-container');
+ return this._hostNode.querySelector(".right-post-container");
}
}
diff --git a/client/js/views/post_upload_view.js b/client/js/views/post_upload_view.js
index f1d465f..7daf4fb 100644
--- a/client/js/views/post_upload_view.js
+++ b/client/js/views/post_upload_view.js
@@ -1,22 +1,24 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const views = require('../util/views.js');
-const FileDropperControl = require('../controls/file_dropper_control.js');
+const events = require("../events.js");
+const views = require("../util/views.js");
+const FileDropperControl = require("../controls/file_dropper_control.js");
-const template = views.getTemplate('post-upload');
-const rowTemplate = views.getTemplate('post-upload-row');
+const template = views.getTemplate("post-upload");
+const rowTemplate = views.getTemplate("post-upload-row");
function _mimeTypeToPostType(mimeType) {
- return {
- 'application/x-shockwave-flash': 'flash',
- 'image/gif': 'image',
- 'image/jpeg': 'image',
- 'image/png': 'image',
- 'image/webp': 'image',
- 'video/mp4': 'video',
- 'video/webm': 'video',
- }[mimeType] || 'unknown';
+ return (
+ {
+ "application/x-shockwave-flash": "flash",
+ "image/gif": "image",
+ "image/jpeg": "image",
+ "image/png": "image",
+ "image/webp": "image",
+ "video/mp4": "video",
+ "video/webm": "video",
+ }[mimeType] || "unknown"
+ );
}
class Uploadable extends events.EventTarget {
@@ -24,18 +26,17 @@ class Uploadable extends events.EventTarget {
super();
this.lookalikes = [];
this.lookalikesConfirmed = false;
- this.safety = 'safe';
+ this.safety = "safe";
this.flags = [];
this.tags = [];
this.relations = [];
this.anonymous = false;
}
- destroy() {
- }
+ destroy() {}
get mimeType() {
- return 'application/octet-stream';
+ return "application/octet-stream";
}
get type() {
@@ -43,11 +44,11 @@ class Uploadable extends events.EventTarget {
}
get key() {
- throw new Error('Not implemented');
+ throw new Error("Not implemented");
}
get name() {
- throw new Error('Not implemented');
+ throw new Error("Not implemented");
}
}
@@ -62,10 +63,11 @@ class File extends Uploadable {
} else {
let reader = new FileReader();
reader.readAsDataURL(file);
- reader.addEventListener('load', e => {
+ reader.addEventListener("load", (e) => {
this._previewUrl = e.target.result;
this.dispatchEvent(
- new CustomEvent('finish', {detail: {uploadable: this}}));
+ new CustomEvent("finish", { detail: { uploadable: this } })
+ );
});
}
}
@@ -97,25 +99,25 @@ class Url extends Uploadable {
constructor(url) {
super();
this.url = url;
- this.dispatchEvent(new CustomEvent('finish'));
+ this.dispatchEvent(new CustomEvent("finish"));
}
get mimeType() {
let mime = {
- 'swf': 'application/x-shockwave-flash',
- 'jpg': 'image/jpeg',
- 'png': 'image/png',
- 'gif': 'image/gif',
- 'webp': 'image/webp',
- 'mp4': 'video/mp4',
- 'webm': 'video/webm',
+ swf: "application/x-shockwave-flash",
+ jpg: "image/jpeg",
+ png: "image/png",
+ gif: "image/gif",
+ webp: "image/webp",
+ mp4: "video/mp4",
+ webm: "video/webm",
};
for (let extension of Object.keys(mime)) {
- if (this.url.toLowerCase().indexOf('.' + extension) !== -1) {
+ if (this.url.toLowerCase().indexOf("." + extension) !== -1) {
return mime[extension];
}
}
- return 'unknown';
+ return "unknown";
}
get previewUrl() {
@@ -135,7 +137,7 @@ class PostUploadView extends events.EventTarget {
constructor(ctx) {
super();
this._ctx = ctx;
- this._hostNode = document.getElementById('content-holder');
+ this._hostNode = document.getElementById("content-holder");
views.replaceContent(this._hostNode, template());
views.syncScrollPosition();
@@ -143,40 +145,46 @@ class PostUploadView extends events.EventTarget {
this._cancelButtonNode.disabled = true;
this._uploadables = [];
- this._uploadables.find = u => {
- return this._uploadables.findIndex(u2 => u.key === u2.key);
+ this._uploadables.find = (u) => {
+ return this._uploadables.findIndex((u2) => u.key === u2.key);
};
this._contentFileDropper = new FileDropperControl(
this._contentInputNode,
{
extraText:
- 'Allowed extensions: .jpg, .png, .gif, .webm, .mp4, .swf',
+ "Allowed extensions: .jpg, .png, .gif, .webm, .mp4, .swf",
allowUrls: true,
allowMultiple: true,
lock: false,
- });
- this._contentFileDropper.addEventListener(
- 'fileadd', e => this._evtFilesAdded(e));
- this._contentFileDropper.addEventListener(
- 'urladd', e => this._evtUrlsAdded(e));
-
- this._cancelButtonNode.addEventListener(
- 'click', e => this._evtCancelButtonClick(e));
- this._formNode.addEventListener('submit', e => this._evtFormSubmit(e));
- this._formNode.classList.add('inactive');
+ }
+ );
+ this._contentFileDropper.addEventListener("fileadd", (e) =>
+ this._evtFilesAdded(e)
+ );
+ this._contentFileDropper.addEventListener("urladd", (e) =>
+ this._evtUrlsAdded(e)
+ );
+
+ this._cancelButtonNode.addEventListener("click", (e) =>
+ this._evtCancelButtonClick(e)
+ );
+ this._formNode.addEventListener("submit", (e) =>
+ this._evtFormSubmit(e)
+ );
+ this._formNode.classList.add("inactive");
}
enableForm() {
views.enableForm(this._formNode);
this._cancelButtonNode.disabled = true;
- this._formNode.classList.remove('uploading');
+ this._formNode.classList.remove("uploading");
}
disableForm() {
views.disableForm(this._formNode);
this._cancelButtonNode.disabled = false;
- this._formNode.classList.add('uploading');
+ this._formNode.classList.add("uploading");
}
clearMessages() {
@@ -201,7 +209,7 @@ class PostUploadView extends events.EventTarget {
}
addUploadables(uploadables) {
- this._formNode.classList.remove('inactive');
+ this._formNode.classList.remove("inactive");
let duplicatesFound = 0;
for (let uploadable of uploadables) {
if (this._uploadables.find(uploadable) !== -1) {
@@ -209,20 +217,22 @@ class PostUploadView extends events.EventTarget {
continue;
}
this._uploadables.push(uploadable);
- this._emit('change');
+ this._emit("change");
this._renderRowNode(uploadable);
- uploadable.addEventListener(
- 'finish', e => this._updateThumbnailNode(e.detail.uploadable));
+ uploadable.addEventListener("finish", (e) =>
+ this._updateThumbnailNode(e.detail.uploadable)
+ );
}
if (duplicatesFound) {
let message = null;
if (duplicatesFound < uploadables.length) {
- message = 'Some of the files were already added ' +
- 'and have been skipped.';
+ message =
+ "Some of the files were already added " +
+ "and have been skipped.";
} else if (duplicatesFound === 1) {
- message = 'This file was already added.';
+ message = "This file was already added.";
} else {
- message = 'These files were already added.';
+ message = "These files were already added.";
}
alert(message);
}
@@ -235,10 +245,10 @@ class PostUploadView extends events.EventTarget {
uploadable.destroy();
uploadable.rowNode.parentNode.removeChild(uploadable.rowNode);
this._uploadables.splice(this._uploadables.find(uploadable), 1);
- this._emit('change');
+ this._emit("change");
if (!this._uploadables.length) {
- this._formNode.classList.add('inactive');
- this._submitButtonNode.value = 'Upload all';
+ this._formNode.classList.add("inactive");
+ this._submitButtonNode.value = "Upload all";
}
}
@@ -248,16 +258,16 @@ class PostUploadView extends events.EventTarget {
}
_evtFilesAdded(e) {
- this.addUploadables(e.detail.files.map(file => new File(file)));
+ this.addUploadables(e.detail.files.map((file) => new File(file)));
}
_evtUrlsAdded(e) {
- this.addUploadables(e.detail.urls.map(url => new Url(url)));
+ this.addUploadables(e.detail.urls.map((url) => new Url(url)));
}
_evtCancelButtonClick(e) {
e.preventDefault();
- this._emit('cancel');
+ this._emit("cancel");
}
_evtFormSubmit(e) {
@@ -265,19 +275,21 @@ class PostUploadView extends events.EventTarget {
for (let uploadable of this._uploadables) {
this._updateUploadableFromDom(uploadable);
}
- this._submitButtonNode.value = 'Resume upload';
- this._emit('submit');
+ this._submitButtonNode.value = "Resume upload";
+ this._emit("submit");
}
_updateUploadableFromDom(uploadable) {
const rowNode = uploadable.rowNode;
- const safetyNode = rowNode.querySelector('.safety input:checked');
+ const safetyNode = rowNode.querySelector(".safety input:checked");
if (safetyNode) {
uploadable.safety = safetyNode.value;
}
- const anonymousNode = rowNode.querySelector('.anonymous input:checked');
+ const anonymousNode = rowNode.querySelector(
+ ".anonymous input:checked"
+ );
if (anonymousNode) {
uploadable.anonymous = true;
}
@@ -286,11 +298,14 @@ class PostUploadView extends events.EventTarget {
uploadable.relations = [];
for (let [i, lookalike] of uploadable.lookalikes.entries()) {
let lookalikeNode = rowNode.querySelector(
- `.lookalikes li:nth-child(${i + 1})`);
- if (lookalikeNode.querySelector('[name=copy-tags]').checked) {
- uploadable.tags = uploadable.tags.concat(lookalike.post.tagNames);
+ `.lookalikes li:nth-child(${i + 1})`
+ );
+ if (lookalikeNode.querySelector("[name=copy-tags]").checked) {
+ uploadable.tags = uploadable.tags.concat(
+ lookalike.post.tagNames
+ );
}
- if (lookalikeNode.querySelector('[name=add-relation]').checked) {
+ if (lookalikeNode.querySelector("[name=add-relation]").checked) {
uploadable.relations.push(lookalike.post.id);
}
}
@@ -317,78 +332,97 @@ class PostUploadView extends events.EventTarget {
this._uploadables[index + delta] = uploadable1;
if (delta === 1) {
this._listNode.insertBefore(
- uploadable2.rowNode, uploadable1.rowNode);
+ uploadable2.rowNode,
+ uploadable1.rowNode
+ );
} else {
this._listNode.insertBefore(
- uploadable1.rowNode, uploadable2.rowNode);
+ uploadable1.rowNode,
+ uploadable2.rowNode
+ );
}
}
}
_emit(eventType) {
this.dispatchEvent(
- new CustomEvent(
- eventType,
- {detail: {
+ new CustomEvent(eventType, {
+ detail: {
uploadables: this._uploadables,
skipDuplicates: this._skipDuplicatesCheckboxNode.checked,
- }}));
+ },
+ })
+ );
}
_renderRowNode(uploadable) {
- const rowNode = rowTemplate(Object.assign(
- {}, this._ctx, {uploadable: uploadable}));
+ const rowNode = rowTemplate(
+ Object.assign({}, this._ctx, { uploadable: uploadable })
+ );
if (uploadable.rowNode) {
uploadable.rowNode.parentNode.replaceChild(
- rowNode, uploadable.rowNode);
+ rowNode,
+ uploadable.rowNode
+ );
} else {
this._listNode.appendChild(rowNode);
}
uploadable.rowNode = rowNode;
- rowNode.querySelector('a.remove').addEventListener('click',
- e => this._evtRemoveClick(e, uploadable));
- rowNode.querySelector('a.move-up').addEventListener('click',
- e => this._evtMoveClick(e, uploadable, -1));
- rowNode.querySelector('a.move-down').addEventListener('click',
- e => this._evtMoveClick(e, uploadable, 1));
+ rowNode
+ .querySelector("a.remove")
+ .addEventListener("click", (e) =>
+ this._evtRemoveClick(e, uploadable)
+ );
+ rowNode
+ .querySelector("a.move-up")
+ .addEventListener("click", (e) =>
+ this._evtMoveClick(e, uploadable, -1)
+ );
+ rowNode
+ .querySelector("a.move-down")
+ .addEventListener("click", (e) =>
+ this._evtMoveClick(e, uploadable, 1)
+ );
}
_updateThumbnailNode(uploadable) {
- const rowNode = rowTemplate(Object.assign(
- {}, this._ctx, {uploadable: uploadable}));
+ const rowNode = rowTemplate(
+ Object.assign({}, this._ctx, { uploadable: uploadable })
+ );
views.replaceContent(
- uploadable.rowNode.querySelector('.thumbnail'),
- rowNode.querySelector('.thumbnail').childNodes);
+ uploadable.rowNode.querySelector(".thumbnail"),
+ rowNode.querySelector(".thumbnail").childNodes
+ );
}
get _uploading() {
- return this._formNode.classList.contains('uploading');
+ return this._formNode.classList.contains("uploading");
}
get _listNode() {
- return this._hostNode.querySelector('.uploadables-container');
+ return this._hostNode.querySelector(".uploadables-container");
}
get _formNode() {
- return this._hostNode.querySelector('form');
+ return this._hostNode.querySelector("form");
}
get _skipDuplicatesCheckboxNode() {
- return this._hostNode.querySelector('form [name=skip-duplicates]');
+ return this._hostNode.querySelector("form [name=skip-duplicates]");
}
get _submitButtonNode() {
- return this._hostNode.querySelector('form [type=submit]');
+ return this._hostNode.querySelector("form [type=submit]");
}
get _cancelButtonNode() {
- return this._hostNode.querySelector('form .cancel');
+ return this._hostNode.querySelector("form .cancel");
}
get _contentInputNode() {
- return this._formNode.querySelector('.dropper-container');
+ return this._formNode.querySelector(".dropper-container");
}
}
diff --git a/client/js/views/posts_header_view.js b/client/js/views/posts_header_view.js
index 0797fff..81546a7 100644
--- a/client/js/views/posts_header_view.js
+++ b/client/js/views/posts_header_view.js
@@ -1,53 +1,56 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const settings = require('../models/settings.js');
-const keyboard = require('../util/keyboard.js');
-const misc = require('../util/misc.js');
-const search = require('../util/search.js');
-const views = require('../util/views.js');
-const TagAutoCompleteControl =
- require('../controls/tag_auto_complete_control.js');
+const events = require("../events.js");
+const settings = require("../models/settings.js");
+const keyboard = require("../util/keyboard.js");
+const misc = require("../util/misc.js");
+const search = require("../util/search.js");
+const views = require("../util/views.js");
+const TagAutoCompleteControl = require("../controls/tag_auto_complete_control.js");
-const template = views.getTemplate('posts-header');
+const template = views.getTemplate("posts-header");
class BulkEditor extends events.EventTarget {
constructor(hostNode) {
super();
this._hostNode = hostNode;
- this._openLinkNode.addEventListener(
- 'click', e => this._evtOpenLinkClick(e));
- this._closeLinkNode.addEventListener(
- 'click', e => this._evtCloseLinkClick(e));
+ this._openLinkNode.addEventListener("click", (e) =>
+ this._evtOpenLinkClick(e)
+ );
+ this._closeLinkNode.addEventListener("click", (e) =>
+ this._evtCloseLinkClick(e)
+ );
}
get opened() {
- return this._hostNode.classList.contains('opened') &&
- !this._hostNode.classList.contains('hidden');
+ return (
+ this._hostNode.classList.contains("opened") &&
+ !this._hostNode.classList.contains("hidden")
+ );
}
get _openLinkNode() {
- return this._hostNode.querySelector('.open');
+ return this._hostNode.querySelector(".open");
}
get _closeLinkNode() {
- return this._hostNode.querySelector('.close');
+ return this._hostNode.querySelector(".close");
}
toggleOpen(state) {
- this._hostNode.classList.toggle('opened', state);
+ this._hostNode.classList.toggle("opened", state);
}
toggleHide(state) {
- this._hostNode.classList.toggle('hidden', state);
+ this._hostNode.classList.toggle("hidden", state);
}
_evtOpenLinkClick(e) {
- throw new Error('Not implemented');
+ throw new Error("Not implemented");
}
_evtCloseLinkClick(e) {
- throw new Error('Not implemented');
+ throw new Error("Not implemented");
}
}
@@ -55,13 +58,13 @@ class BulkSafetyEditor extends BulkEditor {
_evtOpenLinkClick(e) {
e.preventDefault();
this.toggleOpen(true);
- this.dispatchEvent(new CustomEvent('open', {detail: {}}));
+ this.dispatchEvent(new CustomEvent("open", { detail: {} }));
}
_evtCloseLinkClick(e) {
e.preventDefault();
this.toggleOpen(false);
- this.dispatchEvent(new CustomEvent('close', {detail: {}}));
+ this.dispatchEvent(new CustomEvent("close", { detail: {} }));
}
}
@@ -71,10 +74,16 @@ class BulkTagEditor extends BulkEditor {
this._autoCompleteControl = new TagAutoCompleteControl(
this._inputNode,
{
- confirm: tag => this._autoCompleteControl.replaceSelectedText(
- tag.names[0], false),
- });
- this._hostNode.addEventListener('submit', e => this._evtFormSubmit(e));
+ confirm: (tag) =>
+ this._autoCompleteControl.replaceSelectedText(
+ tag.names[0],
+ false
+ ),
+ }
+ );
+ this._hostNode.addEventListener("submit", (e) =>
+ this._evtFormSubmit(e)
+ );
}
get value() {
@@ -82,7 +91,7 @@ class BulkTagEditor extends BulkEditor {
}
get _inputNode() {
- return this._hostNode.querySelector('input[name=tag]');
+ return this._hostNode.querySelector("input[name=tag]");
}
focus() {
@@ -96,22 +105,22 @@ class BulkTagEditor extends BulkEditor {
_evtFormSubmit(e) {
e.preventDefault();
- this.dispatchEvent(new CustomEvent('submit', {detail: {}}));
+ this.dispatchEvent(new CustomEvent("submit", { detail: {} }));
}
_evtOpenLinkClick(e) {
e.preventDefault();
this.toggleOpen(true);
this.focus();
- this.dispatchEvent(new CustomEvent('open', {detail: {}}));
+ this.dispatchEvent(new CustomEvent("open", { detail: {} }));
}
_evtCloseLinkClick(e) {
e.preventDefault();
- this._inputNode.value = '';
+ this._inputNode.value = "";
this.toggleOpen(false);
this.blur();
- this.dispatchEvent(new CustomEvent('close', {detail: {}}));
+ this.dispatchEvent(new CustomEvent("close", { detail: {} }));
}
}
@@ -127,18 +136,25 @@ class PostsHeaderView extends events.EventTarget {
this._autoCompleteControl = new TagAutoCompleteControl(
this._queryInputNode,
{
- confirm: tag => this._autoCompleteControl.replaceSelectedText(
- misc.escapeSearchTerm(tag.names[0]), true),
- });
+ confirm: (tag) =>
+ this._autoCompleteControl.replaceSelectedText(
+ misc.escapeSearchTerm(tag.names[0]),
+ true
+ ),
+ }
+ );
- keyboard.bind('p', () => this._focusFirstPostNode());
+ keyboard.bind("p", () => this._focusFirstPostNode());
search.searchInputNodeFocusHelper(this._queryInputNode);
for (let safetyButtonNode of this._safetyButtonNodes) {
- safetyButtonNode.addEventListener(
- 'click', e => this._evtSafetyButtonClick(e));
+ safetyButtonNode.addEventListener("click", (e) =>
+ this._evtSafetyButtonClick(e)
+ );
}
- this._formNode.addEventListener('submit', e => this._evtFormSubmit(e));
+ this._formNode.addEventListener("submit", (e) =>
+ this._evtFormSubmit(e)
+ );
this._bulkEditors = [];
if (this._bulkEditTagsNode) {
@@ -148,19 +164,20 @@ class PostsHeaderView extends events.EventTarget {
if (this._bulkEditSafetyNode) {
this._bulkSafetyEditor = new BulkSafetyEditor(
- this._bulkEditSafetyNode);
+ this._bulkEditSafetyNode
+ );
this._bulkEditors.push(this._bulkSafetyEditor);
}
for (let editor of this._bulkEditors) {
- editor.addEventListener('submit', e => {
+ editor.addEventListener("submit", (e) => {
this._navigate();
});
- editor.addEventListener('open', e => {
+ editor.addEventListener("open", (e) => {
this._hideBulkEditorsExcept(editor);
this._navigate();
});
- editor.addEventListener('close', e => {
+ editor.addEventListener("close", (e) => {
this._closeAndShowAllBulkEditors();
this._navigate();
});
@@ -174,23 +191,23 @@ class PostsHeaderView extends events.EventTarget {
}
get _formNode() {
- return this._hostNode.querySelector('form.search');
+ return this._hostNode.querySelector("form.search");
}
get _safetyButtonNodes() {
- return this._hostNode.querySelectorAll('form .safety');
+ return this._hostNode.querySelectorAll("form .safety");
}
get _queryInputNode() {
- return this._hostNode.querySelector('form [name=search-text]');
+ return this._hostNode.querySelector("form [name=search-text]");
}
get _bulkEditTagsNode() {
- return this._hostNode.querySelector('.bulk-edit-tags');
+ return this._hostNode.querySelector(".bulk-edit-tags");
}
get _bulkEditSafetyNode() {
- return this._hostNode.querySelector('.bulk-edit-safety');
+ return this._hostNode.querySelector(".bulk-edit-safety");
}
_openBulkEditor(editor) {
@@ -216,20 +233,23 @@ class PostsHeaderView extends events.EventTarget {
_evtSafetyButtonClick(e, url) {
e.preventDefault();
- e.target.classList.toggle('disabled');
- const safety = e.target.getAttribute('data-safety');
+ e.target.classList.toggle("disabled");
+ const safety = e.target.getAttribute("data-safety");
let browsingSettings = settings.get();
- browsingSettings.listPosts[safety] =
- !browsingSettings.listPosts[safety];
+ browsingSettings.listPosts[safety] = !browsingSettings.listPosts[
+ safety
+ ];
settings.save(browsingSettings, true);
this.dispatchEvent(
- new CustomEvent(
- 'navigate', {
- detail: {
- parameters: Object.assign(
- {}, this._ctx.parameters, {tag: null, offset: 0}),
- },
- }));
+ new CustomEvent("navigate", {
+ detail: {
+ parameters: Object.assign({}, this._ctx.parameters, {
+ tag: null,
+ offset: 0,
+ }),
+ },
+ })
+ );
}
_evtFormSubmit(e) {
@@ -239,27 +259,33 @@ class PostsHeaderView extends events.EventTarget {
_navigate() {
this._autoCompleteControl.hide();
- let parameters = {query: this._queryInputNode.value};
+ let parameters = { query: this._queryInputNode.value };
// convert falsy values to an empty string "" so that we can correctly compare with the current query
- const prevQuery = this._ctx.parameters.query ? this._ctx.parameters.query : "";
- parameters.offset = parameters.query === prevQuery ? this._ctx.parameters.offset : 0;
+ const prevQuery = this._ctx.parameters.query
+ ? this._ctx.parameters.query
+ : "";
+ parameters.offset =
+ parameters.query === prevQuery ? this._ctx.parameters.offset : 0;
if (this._bulkTagEditor && this._bulkTagEditor.opened) {
parameters.tag = this._bulkTagEditor.value;
this._bulkTagEditor.blur();
} else {
parameters.tag = null;
}
- parameters.safety = (
- this._bulkSafetyEditor &&
- this._bulkSafetyEditor.opened ? '1' : null);
+ parameters.safety =
+ this._bulkSafetyEditor && this._bulkSafetyEditor.opened
+ ? "1"
+ : null;
this.dispatchEvent(
- new CustomEvent('navigate', {detail: {parameters: parameters}}));
+ new CustomEvent("navigate", { detail: { parameters: parameters } })
+ );
}
_focusFirstPostNode() {
- const firstPostNode =
- document.body.querySelector('.post-list li:first-child a');
+ const firstPostNode = document.body.querySelector(
+ ".post-list li:first-child a"
+ );
if (firstPostNode) {
firstPostNode.focus();
}
diff --git a/client/js/views/posts_page_view.js b/client/js/views/posts_page_view.js
index 84521e3..ba07a63 100644
--- a/client/js/views/posts_page_view.js
+++ b/client/js/views/posts_page_view.js
@@ -1,9 +1,9 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const views = require('../util/views.js');
+const events = require("../events.js");
+const views = require("../util/views.js");
-const template = views.getTemplate('posts-page');
+const template = views.getTemplate("posts-page");
class PostsPageView extends events.EventTarget {
constructor(ctx) {
@@ -15,26 +15,28 @@ class PostsPageView extends events.EventTarget {
this._postIdToPost = {};
for (let post of ctx.response.results) {
this._postIdToPost[post.id] = post;
- post.addEventListener('change', e => this._evtPostChange(e));
+ post.addEventListener("change", (e) => this._evtPostChange(e));
}
this._postIdToListItemNode = {};
for (let listItemNode of this._listItemNodes) {
- const postId = listItemNode.getAttribute('data-post-id');
+ const postId = listItemNode.getAttribute("data-post-id");
const post = this._postIdToPost[postId];
this._postIdToListItemNode[postId] = listItemNode;
const tagFlipperNode = this._getTagFlipperNode(listItemNode);
if (tagFlipperNode) {
- tagFlipperNode.addEventListener(
- 'click', e => this._evtBulkEditTagsClick(e, post));
+ tagFlipperNode.addEventListener("click", (e) =>
+ this._evtBulkEditTagsClick(e, post)
+ );
}
const safetyFlipperNode = this._getSafetyFlipperNode(listItemNode);
if (safetyFlipperNode) {
- for (let linkNode of safetyFlipperNode.querySelectorAll('a')) {
- linkNode.addEventListener(
- 'click', e => this._evtBulkEditSafetyClick(e, post));
+ for (let linkNode of safetyFlipperNode.querySelectorAll("a")) {
+ linkNode.addEventListener("click", (e) =>
+ this._evtBulkEditSafetyClick(e, post)
+ );
}
}
}
@@ -43,21 +45,21 @@ class PostsPageView extends events.EventTarget {
}
get _listItemNodes() {
- return this._hostNode.querySelectorAll('li');
+ return this._hostNode.querySelectorAll("li");
}
_getTagFlipperNode(listItemNode) {
- return listItemNode.querySelector('.tag-flipper');
+ return listItemNode.querySelector(".tag-flipper");
}
_getSafetyFlipperNode(listItemNode) {
- return listItemNode.querySelector('.safety-flipper');
+ return listItemNode.querySelector(".safety-flipper");
}
_evtPostChange(e) {
const listItemNode = this._postIdToListItemNode[e.detail.post.id];
- for (let node of listItemNode.querySelectorAll('[data-disabled]')) {
- node.removeAttribute('data-disabled');
+ for (let node of listItemNode.querySelectorAll("[data-disabled]")) {
+ node.removeAttribute("data-disabled");
}
this._syncBulkEditorsHighlights();
}
@@ -65,35 +67,41 @@ class PostsPageView extends events.EventTarget {
_evtBulkEditTagsClick(e, post) {
e.preventDefault();
const linkNode = e.target;
- if (linkNode.getAttribute('data-disabled')) {
+ if (linkNode.getAttribute("data-disabled")) {
return;
}
- linkNode.setAttribute('data-disabled', true);
+ linkNode.setAttribute("data-disabled", true);
this.dispatchEvent(
new CustomEvent(
- linkNode.classList.contains('tagged') ? 'untag' : 'tag',
- {detail: {post: post}}));
+ linkNode.classList.contains("tagged") ? "untag" : "tag",
+ {
+ detail: { post: post },
+ }
+ )
+ );
}
_evtBulkEditSafetyClick(e, post) {
e.preventDefault();
const linkNode = e.target;
- if (linkNode.getAttribute('data-disabled')) {
+ if (linkNode.getAttribute("data-disabled")) {
return;
}
- const newSafety = linkNode.getAttribute('data-safety');
+ const newSafety = linkNode.getAttribute("data-safety");
if (post.safety === newSafety) {
return;
}
- linkNode.setAttribute('data-disabled', true);
+ linkNode.setAttribute("data-disabled", true);
this.dispatchEvent(
- new CustomEvent(
- 'changeSafety', {detail: {post: post, safety: newSafety}}));
+ new CustomEvent("changeSafety", {
+ detail: { post: post, safety: newSafety },
+ })
+ );
}
_syncBulkEditorsHighlights() {
for (let listItemNode of this._listItemNodes) {
- const postId = listItemNode.getAttribute('data-post-id');
+ const postId = listItemNode.getAttribute("data-post-id");
const post = this._postIdToPost[postId];
const tagFlipperNode = this._getTagFlipperNode(listItemNode);
@@ -102,14 +110,17 @@ class PostsPageView extends events.EventTarget {
for (let tag of this._ctx.bulkEdit.tags) {
tagged &= post.tags.isTaggedWith(tag);
}
- tagFlipperNode.classList.toggle('tagged', tagged);
+ tagFlipperNode.classList.toggle("tagged", tagged);
}
const safetyFlipperNode = this._getSafetyFlipperNode(listItemNode);
if (safetyFlipperNode) {
- for (let linkNode of safetyFlipperNode.querySelectorAll('a')) {
- const safety = linkNode.getAttribute('data-safety');
- linkNode.classList.toggle('active', post.safety === safety);
+ for (let linkNode of safetyFlipperNode.querySelectorAll("a")) {
+ const safety = linkNode.getAttribute("data-safety");
+ linkNode.classList.toggle(
+ "active",
+ post.safety === safety
+ );
}
}
}
diff --git a/client/js/views/registration_view.js b/client/js/views/registration_view.js
index 1db5fcb..0a08de2 100644
--- a/client/js/views/registration_view.js
+++ b/client/js/views/registration_view.js
@@ -1,22 +1,25 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const api = require('../api.js');
-const views = require('../util/views.js');
+const events = require("../events.js");
+const api = require("../api.js");
+const views = require("../util/views.js");
-const template = views.getTemplate('user-registration');
+const template = views.getTemplate("user-registration");
class RegistrationView extends events.EventTarget {
constructor() {
super();
- this._hostNode = document.getElementById('content-holder');
- views.replaceContent(this._hostNode, template({
- userNamePattern: api.getUserNameRegex(),
- passwordPattern: api.getPasswordRegex(),
- }));
+ this._hostNode = document.getElementById("content-holder");
+ views.replaceContent(
+ this._hostNode,
+ template({
+ userNamePattern: api.getUserNameRegex(),
+ passwordPattern: api.getPasswordRegex(),
+ })
+ );
views.syncScrollPosition();
views.decorateValidator(this._formNode);
- this._formNode.addEventListener('submit', e => this._evtSubmit(e));
+ this._formNode.addEventListener("submit", (e) => this._evtSubmit(e));
}
clearMessages() {
@@ -37,29 +40,31 @@ class RegistrationView extends events.EventTarget {
_evtSubmit(e) {
e.preventDefault();
- this.dispatchEvent(new CustomEvent('submit', {
- detail: {
- name: this._userNameFieldNode.value,
- password: this._passwordFieldNode.value,
- email: this._emailFieldNode.value,
- },
- }));
+ this.dispatchEvent(
+ new CustomEvent("submit", {
+ detail: {
+ name: this._userNameFieldNode.value,
+ password: this._passwordFieldNode.value,
+ email: this._emailFieldNode.value,
+ },
+ })
+ );
}
get _formNode() {
- return this._hostNode.querySelector('form');
+ return this._hostNode.querySelector("form");
}
get _userNameFieldNode() {
- return this._formNode.querySelector('[name=name]');
+ return this._formNode.querySelector("[name=name]");
}
get _passwordFieldNode() {
- return this._formNode.querySelector('[name=password]');
+ return this._formNode.querySelector("[name=password]");
}
get _emailFieldNode() {
- return this._formNode.querySelector('[name=email]');
+ return this._formNode.querySelector("[name=email]");
}
}
diff --git a/client/js/views/settings_view.js b/client/js/views/settings_view.js
index 5ab7316..184028e 100644
--- a/client/js/views/settings_view.js
+++ b/client/js/views/settings_view.js
@@ -1,21 +1,23 @@
-'use strict';
+"use strict";
-const events = require('../events.js');
-const views = require('../util/views.js');
+const events = require("../events.js");
+const views = require("../util/views.js");
-const template = views.getTemplate('settings');
+const template = views.getTemplate("settings");
class SettingsView extends events.EventTarget {
constructor(ctx) {
super();
- this._hostNode = document.getElementById('content-holder');
+ this._hostNode = document.getElementById("content-holder");
views.replaceContent(
- this._hostNode, template({browsingSettings: ctx.settings}));
+ this._hostNode,
+ template({ browsingSettings: ctx.settings })
+ );
views.syncScrollPosition();
views.decorateValidator(this._formNode);
- this._formNode.addEventListener('submit', e => this._evtSubmit(e));
+ this._formNode.addEventListener("submit", (e) => this._evtSubmit(e));
}
clearMessages() {
@@ -28,26 +30,32 @@ class SettingsView extends events.EventTarget {
_evtSubmit(e) {
e.preventDefault();
- this.dispatchEvent(new CustomEvent('submit', {
- detail: {
- upscaleSmallPosts: this._find('upscale-small-posts').checked,
- endlessScroll: this._find('endless-scroll').checked,
- keyboardShortcuts: this._find('keyboard-shortcuts').checked,
- transparencyGrid: this._find('transparency-grid').checked,
- tagSuggestions: this._find('tag-suggestions').checked,
- autoplayVideos: this._find('autoplay-videos').checked,
- postsPerPage: this._find('posts-per-page').value,
- tagUnderscoresAsSpaces: this._find('tag-underscores-as-spaces').checked,
- },
- }));
+ this.dispatchEvent(
+ new CustomEvent("submit", {
+ detail: {
+ upscaleSmallPosts: this._find("upscale-small-posts")
+ .checked,
+ endlessScroll: this._find("endless-scroll").checked,
+ keyboardShortcuts: this._find("keyboard-shortcuts")
+ .checked,
+ transparencyGrid: this._find("transparency-grid").checked,
+ tagSuggestions: this._find("tag-suggestions").checked,
+ autoplayVideos: this._find("autoplay-videos").checked,
+ postsPerPage: this._find("posts-per-page").value,
+ tagUnderscoresAsSpaces: this._find(
+ "tag-underscores-as-spaces"
+ ).checked,
+ },
+ })
+ );
}
get _formNode() {
- return this._hostNode.querySelector('form');
+ return this._hostNode.querySelector("form");
}
_find(nodeName) {
- return this._formNode.querySelector('[name=' + nodeName + ']');
+ return this._formNode.querySelector("[name=" + nodeName + "]");
}
}
diff --git a/client/js/views/snapshots_page_view.js b/client/js/views/snapshots_page_view.js
index e7ea264..a665ea0 100644
--- a/client/js/views/snapshots_page_view.js
+++ b/client/js/views/snapshots_page_view.js
@@ -1,8 +1,8 @@
-'use strict';
+"use strict";
-const views = require('../util/views.js');
+const views = require("../util/views.js");
-const template = views.getTemplate('snapshots-page');
+const template = views.getTemplate("snapshots-page");
function _extend(target, source) {
target.push.apply(target, source);
@@ -10,18 +10,18 @@ function _extend(target, source) {
function _formatBasicChange(diff, text) {
const lines = [];
- if (diff.type === 'list change') {
+ if (diff.type === "list change") {
const addedItems = diff.added;
const removedItems = diff.removed;
if (addedItems && addedItems.length) {
- lines.push(`Added ${text} (${addedItems.join(', ')})`);
+ lines.push(`Added ${text} (${addedItems.join(", ")})`);
}
if (removedItems && removedItems.length) {
- lines.push(`Removed ${text} (${removedItems.join(', ')})`);
+ lines.push(`Removed ${text} (${removedItems.join(", ")})`);
}
- } else if (diff.type === 'primitive change') {
- const oldValue = diff['old-value'];
- const newValue = diff['new-value'];
+ } else if (diff.type === "primitive change") {
+ const oldValue = diff["old-value"];
+ const newValue = diff["new-value"];
lines.push(`Changed ${text} (${oldValue} → ${newValue})`);
} else {
lines.push(`Changed ${text}`);
@@ -30,13 +30,13 @@ function _formatBasicChange(diff, text) {
}
function _makeResourceLink(type, id) {
- if (type === 'post') {
+ if (type === "post") {
return views.makePostLink(id, true);
- } else if (type === 'tag') {
+ } else if (type === "tag") {
return views.makeTagLink(id, true);
- } else if (type === 'tag_category') {
+ } else if (type === "tag_category") {
return 'category "' + id + '"';
- } else if (type === 'pool') {
+ } else if (type === "pool") {
return views.makePoolLink(id, true);
}
}
@@ -50,96 +50,102 @@ function _makeItemCreation(type, data) {
let text = key[0].toUpperCase() + key.substr(1).toLowerCase();
if (Array.isArray(data[key])) {
if (data[key].length) {
- lines.push(`${text}: ${data[key].join(', ')}`);
+ lines.push(`${text}: ${data[key].join(", ")}`);
}
} else {
lines.push(`${text}: ${data[key]}`);
}
}
- return lines.join('
'); + return lines.join("
"); } function _makeItemModification(type, data) { const lines = []; const diff = data.value; - if (type === 'tag_category') { + if (type === "tag_category") { if (diff.name) { - _extend(lines, _formatBasicChange(diff.name, 'name')); + _extend(lines, _formatBasicChange(diff.name, "name")); } if (diff.color) { - _extend(lines, _formatBasicChange(diff.color, 'color')); + _extend(lines, _formatBasicChange(diff.color, "color")); } if (diff.default) { - _extend(lines, ['Made into default category']); + _extend(lines, ["Made into default category"]); } - - } else if (type === 'tag') { + } else if (type === "tag") { if (diff.names) { - _extend(lines, _formatBasicChange(diff.names, 'names')); + _extend(lines, _formatBasicChange(diff.names, "names")); } if (diff.category) { - _extend( - lines, _formatBasicChange(diff.category, 'category')); + _extend(lines, _formatBasicChange(diff.category, "category")); } if (diff.suggestions) { _extend( - lines, _formatBasicChange(diff.suggestions, 'suggestions')); + lines, + _formatBasicChange(diff.suggestions, "suggestions") + ); } if (diff.implications) { _extend( - lines, _formatBasicChange(diff.implications, 'implications')); + lines, + _formatBasicChange(diff.implications, "implications") + ); } - - } else if (type === 'post') { + } else if (type === "post") { if (diff.checksum) { - _extend(lines, ['Changed content']); + _extend(lines, ["Changed content"]); } if (diff.featured) { - _extend(lines, ['Featured on front page']); + _extend(lines, ["Featured on front page"]); } if (diff.source) { - _extend(lines, _formatBasicChange(diff.source, 'source')); + _extend(lines, _formatBasicChange(diff.source, "source")); } if (diff.safety) { - _extend(lines, _formatBasicChange(diff.safety, 'safety')); + _extend(lines, _formatBasicChange(diff.safety, "safety")); } if (diff.tags) { - _extend(lines, _formatBasicChange(diff.tags, 'tags')); + _extend(lines, _formatBasicChange(diff.tags, "tags")); } if (diff.relations) { - _extend(lines, _formatBasicChange(diff.relations, 'relations')); + _extend(lines, _formatBasicChange(diff.relations, "relations")); } if (diff.notes) { - _extend(lines, ['Changed notes']); + _extend(lines, ["Changed notes"]); } if (diff.flags) { - _extend(lines, ['Changed flags']); + _extend(lines, ["Changed flags"]); } - - } else if (type === 'pool') { + } else if (type === "pool") { if (diff.names) { - _extend(lines, _formatBasicChange(diff.names, 'names')); + _extend(lines, _formatBasicChange(diff.names, "names")); } if (diff.category) { - _extend( - lines, _formatBasicChange(diff.category, 'category')); + _extend(lines, _formatBasicChange(diff.category, "category")); } if (diff.posts) { - _extend( - lines, _formatBasicChange(diff.posts, 'posts')); + _extend(lines, _formatBasicChange(diff.posts, "posts")); } } - return lines.join('
'); + return lines.join("
"); } class SnapshotsPageView { constructor(ctx) { - views.replaceContent(ctx.hostNode, template(Object.assign({ - makeResourceLink: _makeResourceLink, - makeItemCreation: _makeItemCreation, - makeItemModification: _makeItemModification, - }, ctx))); + views.replaceContent( + ctx.hostNode, + template( + Object.assign( + { + makeResourceLink: _makeResourceLink, + makeItemCreation: _makeItemCreation, + makeItemModification: _makeItemModification, + }, + ctx + ) + ) + ); } } diff --git a/client/js/views/tag_categories_view.js b/client/js/views/tag_categories_view.js index 7e1000d..1f1a4da 100644 --- a/client/js/views/tag_categories_view.js +++ b/client/js/views/tag_categories_view.js @@ -1,17 +1,17 @@ -'use strict'; +"use strict"; -const events = require('../events.js'); -const views = require('../util/views.js'); -const TagCategory = require('../models/tag_category.js'); +const events = require("../events.js"); +const views = require("../util/views.js"); +const TagCategory = require("../models/tag_category.js"); -const template = views.getTemplate('tag-categories'); -const rowTemplate = views.getTemplate('tag-category-row'); +const template = views.getTemplate("tag-categories"); +const rowTemplate = views.getTemplate("tag-category-row"); class TagCategoriesView extends events.EventTarget { constructor(ctx) { super(); this._ctx = ctx; - this._hostNode = document.getElementById('content-holder'); + this._hostNode = document.getElementById("content-holder"); views.replaceContent(this._hostNode, template(ctx)); views.syncScrollPosition(); @@ -31,18 +31,22 @@ class TagCategoriesView extends events.EventTarget { } if (this._addLinkNode) { - this._addLinkNode.addEventListener( - 'click', e => this._evtAddButtonClick(e)); + this._addLinkNode.addEventListener("click", (e) => + this._evtAddButtonClick(e) + ); } - ctx.tagCategories.addEventListener( - 'add', e => this._evtTagCategoryAdded(e)); + ctx.tagCategories.addEventListener("add", (e) => + this._evtTagCategoryAdded(e) + ); - ctx.tagCategories.addEventListener( - 'remove', e => this._evtTagCategoryDeleted(e)); + ctx.tagCategories.addEventListener("remove", (e) => + this._evtTagCategoryDeleted(e) + ); - this._formNode.addEventListener( - 'submit', e => this._evtSaveButtonClick(e, ctx)); + this._formNode.addEventListener("submit", (e) => + this._evtSaveButtonClick(e, ctx) + ); } enableForm() { @@ -66,44 +70,48 @@ class TagCategoriesView extends events.EventTarget { } get _formNode() { - return this._hostNode.querySelector('form'); + return this._hostNode.querySelector("form"); } get _tableBodyNode() { - return this._hostNode.querySelector('tbody'); + return this._hostNode.querySelector("tbody"); } get _addLinkNode() { - return this._hostNode.querySelector('a.add'); + return this._hostNode.querySelector("a.add"); } _addTagCategoryRowNode(tagCategory) { const rowNode = rowTemplate( - Object.assign( - {}, this._ctx, {tagCategory: tagCategory})); + Object.assign({}, this._ctx, { tagCategory: tagCategory }) + ); - const nameInput = rowNode.querySelector('.name input'); + const nameInput = rowNode.querySelector(".name input"); if (nameInput) { - nameInput.addEventListener( - 'change', e => this._evtNameChange(e, rowNode)); + nameInput.addEventListener("change", (e) => + this._evtNameChange(e, rowNode) + ); } - const colorInput = rowNode.querySelector('.color input'); + const colorInput = rowNode.querySelector(".color input"); if (colorInput) { - colorInput.addEventListener( - 'change', e => this._evtColorChange(e, rowNode)); + colorInput.addEventListener("change", (e) => + this._evtColorChange(e, rowNode) + ); } - const removeLinkNode = rowNode.querySelector('.remove a'); + const removeLinkNode = rowNode.querySelector(".remove a"); if (removeLinkNode) { - removeLinkNode.addEventListener( - 'click', e => this._evtDeleteButtonClick(e, rowNode)); + removeLinkNode.addEventListener("click", (e) => + this._evtDeleteButtonClick(e, rowNode) + ); } - const defaultLinkNode = rowNode.querySelector('.set-default a'); + const defaultLinkNode = rowNode.querySelector(".set-default a"); if (defaultLinkNode) { - defaultLinkNode.addEventListener( - 'click', e => this._evtSetDefaultButtonClick(e, rowNode)); + defaultLinkNode.addEventListener("click", (e) => + this._evtSetDefaultButtonClick(e, rowNode) + ); } this._tableBodyNode.appendChild(rowNode); @@ -141,7 +149,7 @@ class TagCategoriesView extends events.EventTarget { _evtDeleteButtonClick(e, rowNode, link) { e.preventDefault(); - if (e.target.classList.contains('inactive')) { + if (e.target.classList.contains("inactive")) { return; } this._ctx.tagCategories.remove(rowNode._tagCategory); @@ -150,16 +158,16 @@ class TagCategoriesView extends events.EventTarget { _evtSetDefaultButtonClick(e, rowNode) { e.preventDefault(); this._ctx.tagCategories.defaultCategory = rowNode._tagCategory; - const oldRowNode = rowNode.parentNode.querySelector('tr.default'); + const oldRowNode = rowNode.parentNode.querySelector("tr.default"); if (oldRowNode) { - oldRowNode.classList.remove('default'); + oldRowNode.classList.remove("default"); } - rowNode.classList.add('default'); + rowNode.classList.add("default"); } _evtSaveButtonClick(e, ctx) { e.preventDefault(); - this.dispatchEvent(new CustomEvent('submit')); + this.dispatchEvent(new CustomEvent("submit")); } } diff --git a/client/js/views/tag_delete_view.js b/client/js/views/tag_delete_view.js index 4d27f15..4246ec3 100644 --- a/client/js/views/tag_delete_view.js +++ b/client/js/views/tag_delete_view.js @@ -1,9 +1,9 @@ -'use strict'; +"use strict"; -const events = require('../events.js'); -const views = require('../util/views.js'); +const events = require("../events.js"); +const views = require("../util/views.js"); -const template = views.getTemplate('tag-delete'); +const template = views.getTemplate("tag-delete"); class TagDeleteView extends events.EventTarget { constructor(ctx) { @@ -13,7 +13,7 @@ class TagDeleteView extends events.EventTarget { this._tag = ctx.tag; views.replaceContent(this._hostNode, template(ctx)); views.decorateValidator(this._formNode); - this._formNode.addEventListener('submit', e => this._evtSubmit(e)); + this._formNode.addEventListener("submit", (e) => this._evtSubmit(e)); } clearMessages() { @@ -38,15 +38,17 @@ class TagDeleteView extends events.EventTarget { _evtSubmit(e) { e.preventDefault(); - this.dispatchEvent(new CustomEvent('submit', { - detail: { - tag: this._tag, - }, - })); + this.dispatchEvent( + new CustomEvent("submit", { + detail: { + tag: this._tag, + }, + }) + ); } get _formNode() { - return this._hostNode.querySelector('form'); + return this._hostNode.querySelector("form"); } } diff --git a/client/js/views/tag_edit_view.js b/client/js/views/tag_edit_view.js index bb4a382..58c1bc4 100644 --- a/client/js/views/tag_edit_view.js +++ b/client/js/views/tag_edit_view.js @@ -1,12 +1,12 @@ -'use strict'; +"use strict"; -const events = require('../events.js'); -const api = require('../api.js'); -const misc = require('../util/misc.js'); -const views = require('../util/views.js'); -const TagInputControl = require('../controls/tag_input_control.js'); +const events = require("../events.js"); +const api = require("../api.js"); +const misc = require("../util/misc.js"); +const views = require("../util/views.js"); +const TagInputControl = require("../controls/tag_input_control.js"); -const template = views.getTemplate('tag-edit'); +const template = views.getTemplate("tag-edit"); class TagEditView extends events.EventTarget { constructor(ctx) { @@ -19,28 +19,33 @@ class TagEditView extends events.EventTarget { views.decorateValidator(this._formNode); if (this._namesFieldNode) { - this._namesFieldNode.addEventListener( - 'input', e => this._evtNameInput(e)); + this._namesFieldNode.addEventListener("input", (e) => + this._evtNameInput(e) + ); } if (this._implicationsFieldNode) { new TagInputControl( - this._implicationsFieldNode, this._tag.implications); + this._implicationsFieldNode, + this._tag.implications + ); } if (this._suggestionsFieldNode) { new TagInputControl( - this._suggestionsFieldNode, this._tag.suggestions); + this._suggestionsFieldNode, + this._tag.suggestions + ); } for (let node of this._formNode.querySelectorAll( - 'input, select, textarea')) { - node.addEventListener( - 'change', e => { - this.dispatchEvent(new CustomEvent('change')); - }); + "input, select, textarea" + )) { + node.addEventListener("change", (e) => { + this.dispatchEvent(new CustomEvent("change")); + }); } - this._formNode.addEventListener('submit', e => this._evtSubmit(e)); + this._formNode.addEventListener("submit", (e) => this._evtSubmit(e)); } clearMessages() { @@ -69,72 +74,80 @@ class TagEditView extends events.EventTarget { if (!list.length) { this._namesFieldNode.setCustomValidity( - 'Tags must have at least one name.'); + "Tags must have at least one name." + ); return; } for (let item of list) { if (!regex.test(item)) { this._namesFieldNode.setCustomValidity( - `Tag name "${item}" contains invalid symbols.`); + `Tag name "${item}" contains invalid symbols.` + ); return; } } - this._namesFieldNode.setCustomValidity(''); + this._namesFieldNode.setCustomValidity(""); } _evtSubmit(e) { e.preventDefault(); - this.dispatchEvent(new CustomEvent('submit', { - detail: { - tag: this._tag, - - names: this._namesFieldNode ? - misc.splitByWhitespace(this._namesFieldNode.value) : - undefined, - - category: this._categoryFieldNode ? - this._categoryFieldNode.value : - undefined, - - implications: this._implicationsFieldNode ? - misc.splitByWhitespace(this._implicationsFieldNode.value) : - undefined, - - suggestions: this._suggestionsFieldNode ? - misc.splitByWhitespace(this._suggestionsFieldNode.value) : - undefined, - - description: this._descriptionFieldNode ? - this._descriptionFieldNode.value : - undefined, - }, - })); + this.dispatchEvent( + new CustomEvent("submit", { + detail: { + tag: this._tag, + + names: this._namesFieldNode + ? misc.splitByWhitespace(this._namesFieldNode.value) + : undefined, + + category: this._categoryFieldNode + ? this._categoryFieldNode.value + : undefined, + + implications: this._implicationsFieldNode + ? misc.splitByWhitespace( + this._implicationsFieldNode.value + ) + : undefined, + + suggestions: this._suggestionsFieldNode + ? misc.splitByWhitespace( + this._suggestionsFieldNode.value + ) + : undefined, + + description: this._descriptionFieldNode + ? this._descriptionFieldNode.value + : undefined, + }, + }) + ); } get _formNode() { - return this._hostNode.querySelector('form'); + return this._hostNode.querySelector("form"); } get _namesFieldNode() { - return this._formNode.querySelector('.names input'); + return this._formNode.querySelector(".names input"); } get _categoryFieldNode() { - return this._formNode.querySelector('.category select'); + return this._formNode.querySelector(".category select"); } get _implicationsFieldNode() { - return this._formNode.querySelector('.implications input'); + return this._formNode.querySelector(".implications input"); } get _suggestionsFieldNode() { - return this._formNode.querySelector('.suggestions input'); + return this._formNode.querySelector(".suggestions input"); } get _descriptionFieldNode() { - return this._formNode.querySelector('.description textarea'); + return this._formNode.querySelector(".description textarea"); } } diff --git a/client/js/views/tag_merge_view.js b/client/js/views/tag_merge_view.js index e29183a..f823ca4 100644 --- a/client/js/views/tag_merge_view.js +++ b/client/js/views/tag_merge_view.js @@ -1,12 +1,11 @@ -'use strict'; +"use strict"; -const events = require('../events.js'); -const api = require('../api.js'); -const views = require('../util/views.js'); -const TagAutoCompleteControl = - require('../controls/tag_auto_complete_control.js'); +const events = require("../events.js"); +const api = require("../api.js"); +const views = require("../util/views.js"); +const TagAutoCompleteControl = require("../controls/tag_auto_complete_control.js"); -const template = views.getTemplate('tag-merge'); +const template = views.getTemplate("tag-merge"); class TagMergeView extends events.EventTarget { constructor(ctx) { @@ -22,12 +21,16 @@ class TagMergeView extends events.EventTarget { this._autoCompleteControl = new TagAutoCompleteControl( this._targetTagFieldNode, { - confirm: tag => this._autoCompleteControl.replaceSelectedText( - tag.names[0], false), - }); + confirm: (tag) => + this._autoCompleteControl.replaceSelectedText( + tag.names[0], + false + ), + } + ); } - this._formNode.addEventListener('submit', e => this._evtSubmit(e)); + this._formNode.addEventListener("submit", (e) => this._evtSubmit(e)); } clearMessages() { @@ -52,25 +55,27 @@ class TagMergeView extends events.EventTarget { _evtSubmit(e) { e.preventDefault(); - this.dispatchEvent(new CustomEvent('submit', { - detail: { - tag: this._tag, - targetTagName: this._targetTagFieldNode.value, - addAlias: this._addAliasCheckboxNode.checked, - }, - })); + this.dispatchEvent( + new CustomEvent("submit", { + detail: { + tag: this._tag, + targetTagName: this._targetTagFieldNode.value, + addAlias: this._addAliasCheckboxNode.checked, + }, + }) + ); } get _formNode() { - return this._hostNode.querySelector('form'); + return this._hostNode.querySelector("form"); } get _targetTagFieldNode() { - return this._formNode.querySelector('input[name=target-tag]'); + return this._formNode.querySelector("input[name=target-tag]"); } get _addAliasCheckboxNode() { - return this._formNode.querySelector('input[name=alias]'); + return this._formNode.querySelector("input[name=alias]"); } } diff --git a/client/js/views/tag_summary_view.js b/client/js/views/tag_summary_view.js index 019e72b..11c6191 100644 --- a/client/js/views/tag_summary_view.js +++ b/client/js/views/tag_summary_view.js @@ -1,8 +1,8 @@ -'use strict'; +"use strict"; -const views = require('../util/views.js'); +const views = require("../util/views.js"); -const template = views.getTemplate('tag-summary'); +const template = views.getTemplate("tag-summary"); class TagSummaryView { constructor(ctx) { diff --git a/client/js/views/tag_view.js b/client/js/views/tag_view.js index 2aaa999..e6c3776 100644 --- a/client/js/views/tag_view.js +++ b/client/js/views/tag_view.js @@ -1,26 +1,26 @@ -'use strict'; +"use strict"; -const events = require('../events.js'); -const views = require('../util/views.js'); -const misc = require('../util/misc.js'); -const TagSummaryView = require('./tag_summary_view.js'); -const TagEditView = require('./tag_edit_view.js'); -const TagMergeView = require('./tag_merge_view.js'); -const TagDeleteView = require('./tag_delete_view.js'); -const EmptyView = require('../views/empty_view.js'); +const events = require("../events.js"); +const views = require("../util/views.js"); +const misc = require("../util/misc.js"); +const TagSummaryView = require("./tag_summary_view.js"); +const TagEditView = require("./tag_edit_view.js"); +const TagMergeView = require("./tag_merge_view.js"); +const TagDeleteView = require("./tag_delete_view.js"); +const EmptyView = require("../views/empty_view.js"); -const template = views.getTemplate('tag'); +const template = views.getTemplate("tag"); class TagView extends events.EventTarget { constructor(ctx) { super(); this._ctx = ctx; - ctx.tag.addEventListener('change', e => this._evtChange(e)); - ctx.section = ctx.section || 'summary'; + ctx.tag.addEventListener("change", (e) => this._evtChange(e)); + ctx.section = ctx.section || "summary"; ctx.getPrettyTagName = misc.getPrettyTagName; - this._hostNode = document.getElementById('content-holder'); + this._hostNode = document.getElementById("content-holder"); this._install(); } @@ -28,52 +28,54 @@ class TagView extends events.EventTarget { const ctx = this._ctx; views.replaceContent(this._hostNode, template(ctx)); - for (let item of this._hostNode.querySelectorAll('[data-name]')) { + for (let item of this._hostNode.querySelectorAll("[data-name]")) { item.classList.toggle( - 'active', item.getAttribute('data-name') === ctx.section); - if (item.getAttribute('data-name') === ctx.section) { + "active", + item.getAttribute("data-name") === ctx.section + ); + if (item.getAttribute("data-name") === ctx.section) { item.parentNode.scrollLeft = item.getBoundingClientRect().left - - item.parentNode.getBoundingClientRect().left + item.parentNode.getBoundingClientRect().left; } } - ctx.hostNode = this._hostNode.querySelector('.tag-content-holder'); - if (ctx.section === 'edit') { + ctx.hostNode = this._hostNode.querySelector(".tag-content-holder"); + if (ctx.section === "edit") { if (!this._ctx.canEditAnything) { this._view = new EmptyView(); this._view.showError( - 'You don\'t have privileges to edit tags.'); + "You don't have privileges to edit tags." + ); } else { this._view = new TagEditView(ctx); - events.proxyEvent(this._view, this, 'submit'); + events.proxyEvent(this._view, this, "submit"); } - - } else if (ctx.section === 'merge') { + } else if (ctx.section === "merge") { if (!this._ctx.canMerge) { this._view = new EmptyView(); this._view.showError( - 'You don\'t have privileges to merge tags.'); + "You don't have privileges to merge tags." + ); } else { this._view = new TagMergeView(ctx); - events.proxyEvent(this._view, this, 'submit', 'merge'); + events.proxyEvent(this._view, this, "submit", "merge"); } - - } else if (ctx.section === 'delete') { + } else if (ctx.section === "delete") { if (!this._ctx.canDelete) { this._view = new EmptyView(); this._view.showError( - 'You don\'t have privileges to delete tags.'); + "You don't have privileges to delete tags." + ); } else { this._view = new TagDeleteView(ctx); - events.proxyEvent(this._view, this, 'submit', 'delete'); + events.proxyEvent(this._view, this, "submit", "delete"); } - } else { this._view = new TagSummaryView(ctx); } - events.proxyEvent(this._view, this, 'change'); + events.proxyEvent(this._view, this, "change"); views.syncScrollPosition(); } diff --git a/client/js/views/tags_header_view.js b/client/js/views/tags_header_view.js index 425c811..6dd7626 100644 --- a/client/js/views/tags_header_view.js +++ b/client/js/views/tags_header_view.js @@ -1,13 +1,12 @@ -'use strict'; +"use strict"; -const events = require('../events.js'); -const misc = require('../util/misc.js'); -const search = require('../util/search.js'); -const views = require('../util/views.js'); -const TagAutoCompleteControl = - require('../controls/tag_auto_complete_control.js'); +const events = require("../events.js"); +const misc = require("../util/misc.js"); +const search = require("../util/search.js"); +const views = require("../util/views.js"); +const TagAutoCompleteControl = require("../controls/tag_auto_complete_control.js"); -const template = views.getTemplate('tags-header'); +const template = views.getTemplate("tags-header"); class TagsHeaderView extends events.EventTarget { constructor(ctx) { @@ -20,31 +19,41 @@ class TagsHeaderView extends events.EventTarget { this._autoCompleteControl = new TagAutoCompleteControl( this._queryInputNode, { - confirm: tag => this._autoCompleteControl.replaceSelectedText( - misc.escapeSearchTerm(tag.names[0]), true), - }); + confirm: (tag) => + this._autoCompleteControl.replaceSelectedText( + misc.escapeSearchTerm(tag.names[0]), + true + ), + } + ); } search.searchInputNodeFocusHelper(this._queryInputNode); - this._formNode.addEventListener('submit', e => this._evtSubmit(e)); + this._formNode.addEventListener("submit", (e) => this._evtSubmit(e)); } get _formNode() { - return this._hostNode.querySelector('form'); + return this._hostNode.querySelector("form"); } get _queryInputNode() { - return this._hostNode.querySelector('[name=search-text]'); + return this._hostNode.querySelector("[name=search-text]"); } _evtSubmit(e) { e.preventDefault(); this._queryInputNode.blur(); - this.dispatchEvent(new CustomEvent('navigate', {detail: {parameters: { - query: this._queryInputNode.value, - page: 1, - }}})); + this.dispatchEvent( + new CustomEvent("navigate", { + detail: { + parameters: { + query: this._queryInputNode.value, + page: 1, + }, + }, + }) + ); } } diff --git a/client/js/views/tags_page_view.js b/client/js/views/tags_page_view.js index cd335a4..e2b2820 100644 --- a/client/js/views/tags_page_view.js +++ b/client/js/views/tags_page_view.js @@ -1,8 +1,8 @@ -'use strict'; +"use strict"; -const views = require('../util/views.js'); +const views = require("../util/views.js"); -const template = views.getTemplate('tags-page'); +const template = views.getTemplate("tags-page"); class TagsPageView { constructor(ctx) { diff --git a/client/js/views/top_navigation_view.js b/client/js/views/top_navigation_view.js index 2f99187..efe75a9 100644 --- a/client/js/views/top_navigation_view.js +++ b/client/js/views/top_navigation_view.js @@ -1,24 +1,24 @@ -'use strict'; +"use strict"; -const views = require('../util/views.js'); +const views = require("../util/views.js"); -const template = views.getTemplate('top-navigation'); +const template = views.getTemplate("top-navigation"); class TopNavigationView { constructor() { - this._hostNode = document.getElementById('top-navigation-holder'); + this._hostNode = document.getElementById("top-navigation-holder"); } get _mobileNavigationToggleNode() { - return this._hostNode.querySelector('#mobile-navigation-toggle'); + return this._hostNode.querySelector("#mobile-navigation-toggle"); } get _navigationListNode() { - return this._hostNode.querySelector('nav > ul'); + return this._hostNode.querySelector("nav > ul"); } get _navigationLinkNodes() { - return this._navigationListNode.querySelectorAll('li > a'); + return this._navigationListNode.querySelectorAll("li > a"); } render(ctx) { @@ -28,28 +28,32 @@ class TopNavigationView { } activate(key) { - for (let itemNode of this._hostNode.querySelectorAll('[data-name]')) { + for (let itemNode of this._hostNode.querySelectorAll("[data-name]")) { itemNode.classList.toggle( - 'active', itemNode.getAttribute('data-name') === key); + "active", + itemNode.getAttribute("data-name") === key + ); } } _bindMobileNavigationEvents() { - this._mobileNavigationToggleNode.addEventListener( - 'click', e => this._mobileNavigationToggleClick(e)); + this._mobileNavigationToggleNode.addEventListener("click", (e) => + this._mobileNavigationToggleClick(e) + ); for (let navigationLinkNode of this._navigationLinkNodes) { - navigationLinkNode.addEventListener( - 'click', e => this._navigationLinkClick(e)); + navigationLinkNode.addEventListener("click", (e) => + this._navigationLinkClick(e) + ); } } _mobileNavigationToggleClick(e) { - this._navigationListNode.classList.toggle('opened'); + this._navigationListNode.classList.toggle("opened"); } _navigationLinkClick(e) { - this._navigationListNode.classList.remove('opened'); + this._navigationListNode.classList.remove("opened"); } } diff --git a/client/js/views/user_delete_view.js b/client/js/views/user_delete_view.js index bdaf9e6..37de52f 100644 --- a/client/js/views/user_delete_view.js +++ b/client/js/views/user_delete_view.js @@ -1,9 +1,9 @@ -'use strict'; +"use strict"; -const events = require('../events.js'); -const views = require('../util/views.js'); +const events = require("../events.js"); +const views = require("../util/views.js"); -const template = views.getTemplate('user-delete'); +const template = views.getTemplate("user-delete"); class UserDeleteView extends events.EventTarget { constructor(ctx) { @@ -14,7 +14,7 @@ class UserDeleteView extends events.EventTarget { views.replaceContent(this._hostNode, template(ctx)); views.decorateValidator(this._formNode); - this._formNode.addEventListener('submit', e => this._evtSubmit(e)); + this._formNode.addEventListener("submit", (e) => this._evtSubmit(e)); } clearMessages() { @@ -39,16 +39,17 @@ class UserDeleteView extends events.EventTarget { _evtSubmit(e) { e.preventDefault(); - this.dispatchEvent(new CustomEvent('submit', { - detail: { - user: this._user, - }, - })); + this.dispatchEvent( + new CustomEvent("submit", { + detail: { + user: this._user, + }, + }) + ); } get _formNode() { - return this._hostNode.querySelector('form'); - + return this._hostNode.querySelector("form"); } } diff --git a/client/js/views/user_edit_view.js b/client/js/views/user_edit_view.js index 317d8e1..4886726 100644 --- a/client/js/views/user_edit_view.js +++ b/client/js/views/user_edit_view.js @@ -1,18 +1,18 @@ -'use strict'; +"use strict"; -const events = require('../events.js'); -const api = require('../api.js'); -const views = require('../util/views.js'); -const FileDropperControl = require('../controls/file_dropper_control.js'); +const events = require("../events.js"); +const api = require("../api.js"); +const views = require("../util/views.js"); +const FileDropperControl = require("../controls/file_dropper_control.js"); -const template = views.getTemplate('user-edit'); +const template = views.getTemplate("user-edit"); class UserEditView extends events.EventTarget { constructor(ctx) { super(); - ctx.userNamePattern = api.getUserNameRegex() + (/|^$/).source; - ctx.passwordPattern = api.getPasswordRegex() + (/|^$/).source; + ctx.userNamePattern = api.getUserNameRegex() + /|^$/.source; + ctx.passwordPattern = api.getPasswordRegex() + /|^$/.source; this._user = ctx.user; this._hostNode = ctx.hostNode; @@ -22,24 +22,26 @@ class UserEditView extends events.EventTarget { this._avatarContent = null; if (this._avatarContentInputNode) { this._avatarFileDropper = new FileDropperControl( - this._avatarContentInputNode, {lock: true}); - this._avatarFileDropper.addEventListener('fileadd', e => { + this._avatarContentInputNode, + { lock: true } + ); + this._avatarFileDropper.addEventListener("fileadd", (e) => { this._hostNode.querySelector( - '[name=avatar-style][value=manual]').checked = true; + "[name=avatar-style][value=manual]" + ).checked = true; this._avatarContent = e.detail.files[0]; }); } - for (let node of this._formNode.querySelectorAll('input, select')) { - node.addEventListener( - 'change', e => { - if (!e.target.classList.contains('anticomplete')) { - this.dispatchEvent(new CustomEvent('change')); - } - }); + for (let node of this._formNode.querySelectorAll("input, select")) { + node.addEventListener("change", (e) => { + if (!e.target.classList.contains("anticomplete")) { + this.dispatchEvent(new CustomEvent("change")); + } + }); } - this._formNode.addEventListener('submit', e => this._evtSubmit(e)); + this._formNode.addEventListener("submit", (e) => this._evtSubmit(e)); } clearMessages() { @@ -64,61 +66,63 @@ class UserEditView extends events.EventTarget { _evtSubmit(e) { e.preventDefault(); - this.dispatchEvent(new CustomEvent('submit', { - detail: { - user: this._user, - - name: this._userNameInputNode ? - this._userNameInputNode.value : - undefined, - - email: this._emailInputNode ? - this._emailInputNode.value : - undefined, - - rank: this._rankInputNode ? - this._rankInputNode.value : - undefined, - - avatarStyle: this._avatarStyleInputNode ? - this._avatarStyleInputNode.value : - undefined, - - password: this._passwordInputNode ? - this._passwordInputNode.value : - undefined, - - avatarContent: this._avatarContent, - }, - })); + this.dispatchEvent( + new CustomEvent("submit", { + detail: { + user: this._user, + + name: this._userNameInputNode + ? this._userNameInputNode.value + : undefined, + + email: this._emailInputNode + ? this._emailInputNode.value + : undefined, + + rank: this._rankInputNode + ? this._rankInputNode.value + : undefined, + + avatarStyle: this._avatarStyleInputNode + ? this._avatarStyleInputNode.value + : undefined, + + password: this._passwordInputNode + ? this._passwordInputNode.value + : undefined, + + avatarContent: this._avatarContent, + }, + }) + ); } get _formNode() { - return this._hostNode.querySelector('form'); + return this._hostNode.querySelector("form"); } get _rankInputNode() { - return this._formNode.querySelector('[name=rank]'); + return this._formNode.querySelector("[name=rank]"); } get _emailInputNode() { - return this._formNode.querySelector('[name=email]'); + return this._formNode.querySelector("[name=email]"); } get _userNameInputNode() { - return this._formNode.querySelector('[name=name]'); + return this._formNode.querySelector("[name=name]"); } get _passwordInputNode() { - return this._formNode.querySelector('[name=password]'); + return this._formNode.querySelector("[name=password]"); } get _avatarContentInputNode() { - return this._formNode.querySelector('#avatar-content'); + return this._formNode.querySelector("#avatar-content"); } get _avatarStyleInputNode() { - return this._formNode.querySelector('[name=avatar-style]:checked'); + return this._formNode.querySelector("[name=avatar-style]:checked"); } } diff --git a/client/js/views/user_summary_view.js b/client/js/views/user_summary_view.js index d8463f3..eab827f 100644 --- a/client/js/views/user_summary_view.js +++ b/client/js/views/user_summary_view.js @@ -1,8 +1,8 @@ -'use strict'; +"use strict"; -const views = require('../util/views.js'); +const views = require("../util/views.js"); -const template = views.getTemplate('user-summary'); +const template = views.getTemplate("user-summary"); class UserSummaryView { constructor(ctx) { diff --git a/client/js/views/user_tokens_view.js b/client/js/views/user_tokens_view.js index 8e283bf..68707f0 100644 --- a/client/js/views/user_tokens_view.js +++ b/client/js/views/user_tokens_view.js @@ -1,9 +1,9 @@ -'use strict'; +"use strict"; -const events = require('../events.js'); -const views = require('../util/views.js'); +const events = require("../events.js"); +const views = require("../util/views.js"); -const template = views.getTemplate('user-tokens'); +const template = views.getTemplate("user-tokens"); class UserTokenView extends events.EventTarget { constructor(ctx) { @@ -16,7 +16,7 @@ class UserTokenView extends events.EventTarget { views.replaceContent(this._hostNode, template(ctx)); views.decorateValidator(this._formNode); - this._formNode.addEventListener('submit', e => this._evtSubmit(e)); + this._formNode.addEventListener("submit", (e) => this._evtSubmit(e)); this._decorateTokenForms(); this._decorateTokenNoteChangeLinks(); @@ -26,8 +26,9 @@ class UserTokenView extends events.EventTarget { this._tokenFormNodes = []; for (let i = 0; i < this._tokens.length; i++) { let formNode = this._hostNode.querySelector( - '.token[data-token-id=\"' + i + '\"]'); - formNode.addEventListener('submit', e => this._evtDelete(e)); + '.token[data-token-id="' + i + '"]' + ); + formNode.addEventListener("submit", (e) => this._evtDelete(e)); this._tokenFormNodes.push(formNode); } } @@ -35,9 +36,11 @@ class UserTokenView extends events.EventTarget { _decorateTokenNoteChangeLinks() { for (let i = 0; i < this._tokens.length; i++) { let linkNode = this._hostNode.querySelector( - '.token-change-note[data-token-id=\"' + i + '\"]'); - linkNode.addEventListener( - 'click', e => this._evtChangeNoteClick(e)); + '.token-change-note[data-token-id="' + i + '"]' + ); + linkNode.addEventListener("click", (e) => + this._evtChangeNoteClick(e) + ); } } @@ -69,65 +72,75 @@ class UserTokenView extends events.EventTarget { _evtDelete(e) { e.preventDefault(); - const userToken = this._tokens[parseInt( - e.target.getAttribute('data-token-id'))]; - this.dispatchEvent(new CustomEvent('delete', { - detail: { - user: this._user, - userToken: userToken, - }, - })); + const userToken = this._tokens[ + parseInt(e.target.getAttribute("data-token-id")) + ]; + this.dispatchEvent( + new CustomEvent("delete", { + detail: { + user: this._user, + userToken: userToken, + }, + }) + ); } _evtSubmit(e) { e.preventDefault(); - this.dispatchEvent(new CustomEvent('submit', { - detail: { - user: this._user, - - note: this._userTokenNoteInputNode ? - this._userTokenNoteInputNode.value : - undefined, - - expirationTime: - (this._userTokenExpirationTimeInputNode - && this._userTokenExpirationTimeInputNode.value) ? - new Date(this._userTokenExpirationTimeInputNode.value) - .toISOString() : - undefined, - }, - })); + this.dispatchEvent( + new CustomEvent("submit", { + detail: { + user: this._user, + + note: this._userTokenNoteInputNode + ? this._userTokenNoteInputNode.value + : undefined, + + expirationTime: + this._userTokenExpirationTimeInputNode && + this._userTokenExpirationTimeInputNode.value + ? new Date( + this._userTokenExpirationTimeInputNode.value + ).toISOString() + : undefined, + }, + }) + ); } _evtChangeNoteClick(e) { e.preventDefault(); const userToken = this._tokens[ - parseInt(e.target.getAttribute('data-token-id'))]; + parseInt(e.target.getAttribute("data-token-id")) + ]; const text = window.prompt( - 'Please enter the new name:', - userToken.note !== null ? userToken.note : undefined); + "Please enter the new name:", + userToken.note !== null ? userToken.note : undefined + ); if (!text) { return; } - this.dispatchEvent(new CustomEvent('update', { - detail: { - user: this._user, - userToken: userToken, - note: text ? text : undefined, - }, - })); + this.dispatchEvent( + new CustomEvent("update", { + detail: { + user: this._user, + userToken: userToken, + note: text ? text : undefined, + }, + }) + ); } get _formNode() { - return this._hostNode.querySelector('#create-token-form'); + return this._hostNode.querySelector("#create-token-form"); } get _userTokenNoteInputNode() { - return this._formNode.querySelector('.note input'); + return this._formNode.querySelector(".note input"); } get _userTokenExpirationTimeInputNode() { - return this._formNode.querySelector('.expirationTime input'); + return this._formNode.querySelector(".expirationTime input"); } } diff --git a/client/js/views/user_view.js b/client/js/views/user_view.js index d96ebe1..2eebfe9 100644 --- a/client/js/views/user_view.js +++ b/client/js/views/user_view.js @@ -1,24 +1,24 @@ -'use strict'; +"use strict"; -const events = require('../events.js'); -const views = require('../util/views.js'); -const UserDeleteView = require('./user_delete_view.js'); -const UserTokensView = require('./user_tokens_view.js'); -const UserSummaryView = require('./user_summary_view.js'); -const UserEditView = require('./user_edit_view.js'); -const EmptyView = require('../views/empty_view.js'); +const events = require("../events.js"); +const views = require("../util/views.js"); +const UserDeleteView = require("./user_delete_view.js"); +const UserTokensView = require("./user_tokens_view.js"); +const UserSummaryView = require("./user_summary_view.js"); +const UserEditView = require("./user_edit_view.js"); +const EmptyView = require("../views/empty_view.js"); -const template = views.getTemplate('user'); +const template = views.getTemplate("user"); class UserView extends events.EventTarget { constructor(ctx) { super(); this._ctx = ctx; - ctx.user.addEventListener('change', e => this._evtChange(e)); - ctx.section = ctx.section || 'summary'; + ctx.user.addEventListener("change", (e) => this._evtChange(e)); + ctx.section = ctx.section || "summary"; - this._hostNode = document.getElementById('content-holder'); + this._hostNode = document.getElementById("content-holder"); this._install(); } @@ -26,52 +26,56 @@ class UserView extends events.EventTarget { const ctx = this._ctx; views.replaceContent(this._hostNode, template(ctx)); - for (let item of this._hostNode.querySelectorAll('[data-name]')) { + for (let item of this._hostNode.querySelectorAll("[data-name]")) { item.classList.toggle( - 'active', item.getAttribute('data-name') === ctx.section); - if (item.getAttribute('data-name') === ctx.section) { + "active", + item.getAttribute("data-name") === ctx.section + ); + if (item.getAttribute("data-name") === ctx.section) { item.parentNode.scrollLeft = item.getBoundingClientRect().left - - item.parentNode.getBoundingClientRect().left + item.parentNode.getBoundingClientRect().left; } } - ctx.hostNode = this._hostNode.querySelector('#user-content-holder'); - if (ctx.section === 'edit') { + ctx.hostNode = this._hostNode.querySelector("#user-content-holder"); + if (ctx.section === "edit") { if (!this._ctx.canEditAnything) { this._view = new EmptyView(); this._view.showError( - 'You don\'t have privileges to edit users.'); + "You don't have privileges to edit users." + ); } else { this._view = new UserEditView(ctx); - events.proxyEvent(this._view, this, 'submit'); + events.proxyEvent(this._view, this, "submit"); } - } else if (ctx.section === 'list-tokens') { + } else if (ctx.section === "list-tokens") { if (!this._ctx.canListTokens) { this._view = new EmptyView(); this._view.showError( - 'You don\'t have privileges to view user tokens.'); + "You don't have privileges to view user tokens." + ); } else { this._view = new UserTokensView(ctx); - events.proxyEvent(this._view, this, 'delete', 'delete-token'); - events.proxyEvent(this._view, this, 'submit', 'create-token'); - events.proxyEvent(this._view, this, 'update', 'update-token'); + events.proxyEvent(this._view, this, "delete", "delete-token"); + events.proxyEvent(this._view, this, "submit", "create-token"); + events.proxyEvent(this._view, this, "update", "update-token"); } - } else if (ctx.section === 'delete') { + } else if (ctx.section === "delete") { if (!this._ctx.canDelete) { this._view = new EmptyView(); this._view.showError( - 'You don\'t have privileges to delete users.'); + "You don't have privileges to delete users." + ); } else { this._view = new UserDeleteView(ctx); - events.proxyEvent(this._view, this, 'submit', 'delete'); + events.proxyEvent(this._view, this, "submit", "delete"); } - } else { this._view = new UserSummaryView(ctx); } - events.proxyEvent(this._view, this, 'change'); + events.proxyEvent(this._view, this, "change"); views.syncScrollPosition(); } diff --git a/client/js/views/users_header_view.js b/client/js/views/users_header_view.js index 08b7620..d6b7c6a 100644 --- a/client/js/views/users_header_view.js +++ b/client/js/views/users_header_view.js @@ -1,10 +1,10 @@ -'use strict'; +"use strict"; -const events = require('../events.js'); -const search = require('../util/search.js'); -const views = require('../util/views.js'); +const events = require("../events.js"); +const search = require("../util/search.js"); +const views = require("../util/views.js"); -const template = views.getTemplate('users-header'); +const template = views.getTemplate("users-header"); class UsersHeaderView extends events.EventTarget { constructor(ctx) { @@ -15,23 +15,29 @@ class UsersHeaderView extends events.EventTarget { search.searchInputNodeFocusHelper(this._queryInputNode); - this._formNode.addEventListener('submit', e => this._evtSubmit(e)); + this._formNode.addEventListener("submit", (e) => this._evtSubmit(e)); } get _formNode() { - return this._hostNode.querySelector('form'); + return this._hostNode.querySelector("form"); } get _queryInputNode() { - return this._formNode.querySelector('[name=search-text]'); + return this._formNode.querySelector("[name=search-text]"); } _evtSubmit(e) { e.preventDefault(); - this.dispatchEvent(new CustomEvent('navigate', {detail: {parameters: { - query: this._queryInputNode.value, - page: 1, - }}})); + this.dispatchEvent( + new CustomEvent("navigate", { + detail: { + parameters: { + query: this._queryInputNode.value, + page: 1, + }, + }, + }) + ); } } diff --git a/client/js/views/users_page_view.js b/client/js/views/users_page_view.js index f772d4e..2689433 100644 --- a/client/js/views/users_page_view.js +++ b/client/js/views/users_page_view.js @@ -1,8 +1,8 @@ -'use strict'; +"use strict"; -const views = require('../util/views.js'); +const views = require("../util/views.js"); -const template = views.getTemplate('users-page'); +const template = views.getTemplate("users-page"); class UsersPageView { constructor(ctx) { diff --git a/server/.dockerignore b/server/.dockerignore index 0b6e9fc..cdfeafc 100644 --- a/server/.dockerignore +++ b/server/.dockerignore @@ -1,5 +1,6 @@ # Linter configs -setup.cfg +pyproject.toml +.flake8 # Python requirements files requirements.txt diff --git a/server/.flake8 b/server/.flake8 new file mode 100644 index 0000000..023ae12 --- /dev/null +++ b/server/.flake8 @@ -0,0 +1,5 @@ +[flake8] +filename = szurubooru/ +exclude = __pycache__ +ignore = F401, W503, W504, E203, E231 +max-line-length = 79 diff --git a/server/Dockerfile.test b/server/Dockerfile.test index d5b1133..16c6121 100644 --- a/server/Dockerfile.test +++ b/server/Dockerfile.test @@ -47,4 +47,4 @@ ENV POSTGRES_HOST=x \ COPY --chown=app:app ./ /opt/app/ ENTRYPOINT ["pytest", "--tb=short"] -CMD ["--cov-report=term-missing:skip-covered", "--cov=szurubooru", "szurubooru/"] +CMD ["szurubooru/"] diff --git a/server/hooks/test b/server/hooks/test index bf7776d..1edf701 100755 --- a/server/hooks/test +++ b/server/hooks/test @@ -1,8 +1,8 @@ #!/bin/sh set -e -docker build -f ${DOCKERFILE_PATH:-Dockerfile}.test -t ${IMAGE_NAME}-test . -docker run --rm -t ${IMAGE_NAME}-test -docker rmi ${IMAGE_NAME}-test +docker run --rm \ + -t $(docker build -f ${DOCKERFILE_PATH:-Dockerfile}.test -q .) \ + --color=no szurubooru/ exit $? diff --git a/server/pyproject.toml b/server/pyproject.toml new file mode 100644 index 0000000..ccf47fc --- /dev/null +++ b/server/pyproject.toml @@ -0,0 +1,10 @@ +[tool.black] +line-length = 79 + +[tool.isort] +known_first_party = ["szurubooru"] +known_third_party = ["PIL", "alembic", "coloredlogs", "freezegun", "nacl", "numpy", "pyrfc3339", "pytest", "pytz", "sqlalchemy", "yaml", "youtube_dl"] +multi_line_output = 3 +include_trailing_comma = true +force_grid_wrap = 0 +use_parentheses = true diff --git a/server/setup.cfg b/server/setup.cfg deleted file mode 100644 index 2179081..0000000 --- a/server/setup.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[flake8] -filename = szurubooru/ -exclude = __pycache__ -ignore = F401, W503, W504 -max-line-length = 79 - -[mypy] -ignore_missing_imports = True -follow_imports = skip -disallow_untyped_calls = True -disallow_untyped_defs = True -check_untyped_defs = True -disallow_subclassing_any = False -warn_redundant_casts = True -warn_unused_ignores = True -strict_optional = True -strict_boolean = False - -[mypy-szurubooru.tests.*] -ignore_errors=True diff --git a/server/szuru-admin b/server/szuru-admin index 6433fde..7abc69c 100755 --- a/server/szuru-admin +++ b/server/szuru-admin @@ -13,8 +13,9 @@ from getpass import getpass from sys import stderr from szurubooru import config, db, errors, model -from szurubooru.func import files, images, \ - posts as postfuncs, users as userfuncs +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: diff --git a/server/szurubooru/api/__init__.py b/server/szurubooru/api/__init__.py index 28f0e98..d9b7ecb 100644 --- a/server/szurubooru/api/__init__.py +++ b/server/szurubooru/api/__init__.py @@ -1,12 +1,12 @@ +import szurubooru.api.comment_api import szurubooru.api.info_api -import szurubooru.api.user_api -import szurubooru.api.user_token_api -import szurubooru.api.post_api -import szurubooru.api.tag_api -import szurubooru.api.tag_category_api +import szurubooru.api.password_reset_api import szurubooru.api.pool_api import szurubooru.api.pool_category_api -import szurubooru.api.comment_api -import szurubooru.api.password_reset_api +import szurubooru.api.post_api import szurubooru.api.snapshot_api +import szurubooru.api.tag_api +import szurubooru.api.tag_category_api import szurubooru.api.upload_api +import szurubooru.api.user_api +import szurubooru.api.user_token_api diff --git a/server/szurubooru/api/comment_api.py b/server/szurubooru/api/comment_api.py index cc8350a..d60d23e 100644 --- a/server/szurubooru/api/comment_api.py +++ b/server/szurubooru/api/comment_api.py @@ -1,44 +1,52 @@ -from typing import Dict from datetime import datetime -from szurubooru import search, rest, model -from szurubooru.func import ( - auth, comments, posts, scores, versions, serialization) +from typing import Dict +from szurubooru import model, rest, search +from szurubooru.func import ( + auth, + comments, + posts, + scores, + serialization, + versions, +) _search_executor = search.Executor(search.configs.CommentSearchConfig()) def _get_comment(params: Dict[str, str]) -> model.Comment: try: - comment_id = int(params['comment_id']) + comment_id = int(params["comment_id"]) except TypeError: raise comments.InvalidCommentIdError( - 'Invalid comment ID: %r.' % params['comment_id']) + "Invalid comment ID: %r." % params["comment_id"] + ) return comments.get_comment_by_id(comment_id) -def _serialize( - ctx: rest.Context, comment: model.Comment) -> rest.Response: +def _serialize(ctx: rest.Context, comment: model.Comment) -> rest.Response: return comments.serialize_comment( - comment, - ctx.user, - options=serialization.get_serialization_options(ctx)) + comment, ctx.user, options=serialization.get_serialization_options(ctx) + ) -@rest.routes.get('/comments/?') +@rest.routes.get("/comments/?") def get_comments( - ctx: rest.Context, _params: Dict[str, str] = {}) -> rest.Response: - auth.verify_privilege(ctx.user, 'comments:list') + ctx: rest.Context, _params: Dict[str, str] = {} +) -> rest.Response: + auth.verify_privilege(ctx.user, "comments:list") return _search_executor.execute_and_serialize( - ctx, lambda comment: _serialize(ctx, comment)) + ctx, lambda comment: _serialize(ctx, comment) + ) -@rest.routes.post('/comments/?') +@rest.routes.post("/comments/?") def create_comment( - ctx: rest.Context, _params: Dict[str, str] = {}) -> rest.Response: - auth.verify_privilege(ctx.user, 'comments:create') - text = ctx.get_param_as_string('text') - post_id = ctx.get_param_as_int('postId') + ctx: rest.Context, _params: Dict[str, str] = {} +) -> rest.Response: + auth.verify_privilege(ctx.user, "comments:create") + text = ctx.get_param_as_string("text") + post_id = ctx.get_param_as_int("postId") post = posts.get_post_by_id(post_id) comment = comments.create_comment(ctx.user, post, text) ctx.session.add(comment) @@ -46,53 +54,55 @@ def create_comment( return _serialize(ctx, comment) -@rest.routes.get('/comment/(?P
World Wide Web
The WorldWideWeb' + - b' (W3) is a wide-area\nEverything there is ' +
- b'online about\nW3 is linked directly or indirectly\nto this docum' +
- b'ent, including an \nEverything there is "
+ + b"online about\nW3 is linked directly or indirectly\nto this docum"
+ + b'ent, including an \n
\n\n')
+ b'World Wide Web
The WorldWideWeb'
+ + b' (W3) is a wide-area\n
\n\n'
+ )
actual_content = net.download(url)
assert actual_content == expected_content
-@pytest.mark.parametrize('url', [
- 'https://samples.ffmpeg.org/MPEG-4/video.mp4',
-])
+@pytest.mark.parametrize(
+ "url", ["https://samples.ffmpeg.org/MPEG-4/video.mp4",]
+)
def test_too_large_download(url):
- pytest.xfail('Download limit not implemented yet')
+ pytest.xfail("Download limit not implemented yet")
with pytest.raises(errors.ProcessingError):
net.download(url)
-@pytest.mark.parametrize('url,expected_sha1', [
- ('https://www.youtube.com/watch?v=C0DPdy98e4c',
- '365af1c8f59c6865e1a84c6e13e3e25ff89e0ba1'),
- ('https://gfycat.com/immaterialchillyiberianmole',
- '953000e81d7bd1da95ce264f872e7b6c4a6484be'),
-])
+@pytest.mark.parametrize(
+ "url,expected_sha1",
+ [
+ (
+ "https://www.youtube.com/watch?v=C0DPdy98e4c",
+ "365af1c8f59c6865e1a84c6e13e3e25ff89e0ba1",
+ ),
+ (
+ "https://gfycat.com/immaterialchillyiberianmole",
+ "953000e81d7bd1da95ce264f872e7b6c4a6484be",
+ ),
+ ],
+)
def test_video_download(url, expected_sha1):
actual_content = net.download(url, use_video_downloader=True)
assert get_sha1(actual_content) == expected_sha1
-@pytest.mark.parametrize('url', [
- 'https://samples.ffmpeg.org/flac/short.flac', # not a video
- 'https://www.youtube.com/watch?v=dQw4w9WgXcQ', # video too large
-])
+@pytest.mark.parametrize(
+ "url",
+ [
+ "https://samples.ffmpeg.org/flac/short.flac", # not a video
+ "https://www.youtube.com/watch?v=dQw4w9WgXcQ", # video too large
+ ],
+)
def test_failed_video_download(url):
with pytest.raises(errors.ThirdPartyError):
net.download(url, use_video_downloader=True)
diff --git a/server/szurubooru/tests/func/test_posts.py b/server/szurubooru/tests/func/test_posts.py
index ed00879..acedf6f 100644
--- a/server/szurubooru/tests/func/test_posts.py
+++ b/server/szurubooru/tests/func/test_posts.py
@@ -1,40 +1,58 @@
+import os
from datetime import datetime
from unittest.mock import patch
-import os
+
import pytest
+
from szurubooru import db, model
from szurubooru.func import (
- posts, users, comments, tags, images, files, util, image_hash)
+ comments,
+ files,
+ image_hash,
+ images,
+ posts,
+ tags,
+ users,
+ util,
+)
-@pytest.mark.parametrize('input_mime_type,expected_url', [
- ('image/jpeg', 'http://example.com/posts/1_244c8840887984c4.jpg'),
- ('image/gif', 'http://example.com/posts/1_244c8840887984c4.gif'),
- ('totally/unknown', 'http://example.com/posts/1_244c8840887984c4.dat'),
-])
+@pytest.mark.parametrize(
+ "input_mime_type,expected_url",
+ [
+ ("image/jpeg", "http://example.com/posts/1_244c8840887984c4.jpg"),
+ ("image/gif", "http://example.com/posts/1_244c8840887984c4.gif"),
+ ("totally/unknown", "http://example.com/posts/1_244c8840887984c4.dat"),
+ ],
+)
def test_get_post_url(input_mime_type, expected_url, config_injector):
- config_injector({'data_url': 'http://example.com/', 'secret': 'test'})
+ config_injector({"data_url": "http://example.com/", "secret": "test"})
post = model.Post()
post.post_id = 1
post.mime_type = input_mime_type
assert posts.get_post_content_url(post) == expected_url
-@pytest.mark.parametrize('input_mime_type', ['image/jpeg', 'image/gif'])
+@pytest.mark.parametrize("input_mime_type", ["image/jpeg", "image/gif"])
def test_get_post_thumbnail_url(input_mime_type, config_injector):
- config_injector({'data_url': 'http://example.com/', 'secret': 'test'})
+ config_injector({"data_url": "http://example.com/", "secret": "test"})
post = model.Post()
post.post_id = 1
post.mime_type = input_mime_type
- assert posts.get_post_thumbnail_url(post) \
- == 'http://example.com/generated-thumbnails/1_244c8840887984c4.jpg'
+ assert (
+ posts.get_post_thumbnail_url(post)
+ == "http://example.com/generated-thumbnails/1_244c8840887984c4.jpg"
+ )
-@pytest.mark.parametrize('input_mime_type,expected_path', [
- ('image/jpeg', 'posts/1_244c8840887984c4.jpg'),
- ('image/gif', 'posts/1_244c8840887984c4.gif'),
- ('totally/unknown', 'posts/1_244c8840887984c4.dat'),
-])
+@pytest.mark.parametrize(
+ "input_mime_type,expected_path",
+ [
+ ("image/jpeg", "posts/1_244c8840887984c4.jpg"),
+ ("image/gif", "posts/1_244c8840887984c4.gif"),
+ ("totally/unknown", "posts/1_244c8840887984c4.dat"),
+ ],
+)
def test_get_post_content_path(input_mime_type, expected_path):
post = model.Post()
post.post_id = 1
@@ -42,31 +60,35 @@ def test_get_post_content_path(input_mime_type, expected_path):
assert posts.get_post_content_path(post) == expected_path
-@pytest.mark.parametrize('input_mime_type', ['image/jpeg', 'image/gif'])
+@pytest.mark.parametrize("input_mime_type", ["image/jpeg", "image/gif"])
def test_get_post_thumbnail_path(input_mime_type):
post = model.Post()
post.post_id = 1
post.mime_type = input_mime_type
- assert posts.get_post_thumbnail_path(post) \
- == 'generated-thumbnails/1_244c8840887984c4.jpg'
+ assert (
+ posts.get_post_thumbnail_path(post)
+ == "generated-thumbnails/1_244c8840887984c4.jpg"
+ )
-@pytest.mark.parametrize('input_mime_type', ['image/jpeg', 'image/gif'])
+@pytest.mark.parametrize("input_mime_type", ["image/jpeg", "image/gif"])
def test_get_post_thumbnail_backup_path(input_mime_type):
post = model.Post()
post.post_id = 1
post.mime_type = input_mime_type
- assert posts.get_post_thumbnail_backup_path(post) \
- == 'posts/custom-thumbnails/1_244c8840887984c4.dat'
+ assert (
+ posts.get_post_thumbnail_backup_path(post)
+ == "posts/custom-thumbnails/1_244c8840887984c4.dat"
+ )
def test_serialize_note():
note = model.PostNote()
note.polygon = [[0, 1], [1, 1], [1, 0], [0, 0]]
- note.text = '...'
+ note.text = "..."
assert posts.serialize_note(note) == {
- 'polygon': [[0, 1], [1, 1], [1, 0], [0, 0]],
- 'text': '...'
+ "polygon": [[0, 1], [1, 1], [1, 0], [0, 0]],
+ "text": "...",
}
@@ -75,94 +97,110 @@ def test_serialize_post_when_empty():
def test_serialize_post(
- user_factory,
- comment_factory,
- tag_factory,
- tag_category_factory,
- pool_factory,
- pool_category_factory,
- config_injector):
- config_injector({'data_url': 'http://example.com/', 'secret': 'test'})
- with patch('szurubooru.func.comments.serialize_comment'), \
- patch('szurubooru.func.users.serialize_micro_user'), \
- patch('szurubooru.func.posts.files.has'):
+ user_factory,
+ comment_factory,
+ tag_factory,
+ tag_category_factory,
+ pool_factory,
+ pool_category_factory,
+ config_injector,
+):
+ config_injector({"data_url": "http://example.com/", "secret": "test"})
+ with patch("szurubooru.func.comments.serialize_comment"), patch(
+ "szurubooru.func.users.serialize_micro_user"
+ ), patch("szurubooru.func.posts.files.has"):
files.has.return_value = True
- users.serialize_micro_user.side_effect \
- = lambda user, auth_user: user.name
- comments.serialize_comment.side_effect \
- = lambda comment, auth_user: comment.user.name
-
- auth_user = user_factory(name='auth user')
+ users.serialize_micro_user.side_effect = (
+ lambda user, auth_user: user.name
+ )
+ comments.serialize_comment.side_effect = (
+ lambda comment, auth_user: comment.user.name
+ )
+
+ auth_user = user_factory(name="auth user")
post = model.Post()
post.post_id = 1
post.creation_time = datetime(1997, 1, 1)
post.last_edit_time = datetime(1998, 1, 1)
post.tags = [
tag_factory(
- names=['tag1', 'tag2'],
- category=tag_category_factory('test-cat1')),
+ names=["tag1", "tag2"],
+ category=tag_category_factory("test-cat1"),
+ ),
tag_factory(
- names=['tag3'],
- category=tag_category_factory('test-cat2'))
+ names=["tag3"], category=tag_category_factory("test-cat2")
+ ),
]
post.safety = model.Post.SAFETY_SAFE
- post.source = '4gag'
+ post.source = "4gag"
post.type = model.Post.TYPE_IMAGE
- post.checksum = 'deadbeef'
- post.mime_type = 'image/jpeg'
+ post.checksum = "deadbeef"
+ post.mime_type = "image/jpeg"
post.file_size = 100
- post.user = user_factory(name='post author')
+ post.user = user_factory(name="post author")
post.canvas_width = 200
post.canvas_height = 300
- post.flags = ['loop']
+ post.flags = ["loop"]
db.session.add(post)
db.session.flush()
- db.session.add_all([
- comment_factory(
- user=user_factory(name='commenter1'),
- post=post,
- time=datetime(1999, 1, 1)),
- comment_factory(
- user=user_factory(name='commenter2'),
- post=post,
- time=datetime(1999, 1, 2)),
- model.PostFavorite(
- post=post,
- user=user_factory(name='fav1'),
- time=datetime(1800, 1, 1)),
- model.PostFeature(
- post=post,
- user=user_factory(),
- time=datetime(1999, 1, 1)),
- model.PostScore(
- post=post,
- user=auth_user,
- score=-1,
- time=datetime(1800, 1, 1)),
- model.PostScore(
- post=post,
- user=user_factory(),
- score=1,
- time=datetime(1800, 1, 1)),
- model.PostScore(
- post=post,
- user=user_factory(),
- score=1,
- time=datetime(1800, 1, 1))])
+ db.session.add_all(
+ [
+ comment_factory(
+ user=user_factory(name="commenter1"),
+ post=post,
+ time=datetime(1999, 1, 1),
+ ),
+ comment_factory(
+ user=user_factory(name="commenter2"),
+ post=post,
+ time=datetime(1999, 1, 2),
+ ),
+ model.PostFavorite(
+ post=post,
+ user=user_factory(name="fav1"),
+ time=datetime(1800, 1, 1),
+ ),
+ model.PostFeature(
+ post=post, user=user_factory(), time=datetime(1999, 1, 1)
+ ),
+ model.PostScore(
+ post=post,
+ user=auth_user,
+ score=-1,
+ time=datetime(1800, 1, 1),
+ ),
+ model.PostScore(
+ post=post,
+ user=user_factory(),
+ score=1,
+ time=datetime(1800, 1, 1),
+ ),
+ model.PostScore(
+ post=post,
+ user=user_factory(),
+ score=1,
+ time=datetime(1800, 1, 1),
+ ),
+ ]
+ )
db.session.flush()
- pool1 = pool_factory(id=1,
- names=['pool1', 'pool2'],
- description='desc',
- category=pool_category_factory('test-cat1'))
+ pool1 = pool_factory(
+ id=1,
+ names=["pool1", "pool2"],
+ description="desc",
+ category=pool_category_factory("test-cat1"),
+ )
pool1.last_edit_time = datetime(1998, 1, 1)
pool1.posts.append(post)
- pool2 = pool_factory(id=2,
- names=['pool3'],
- description='desc2',
- category=pool_category_factory('test-cat2'))
+ pool2 = pool_factory(
+ id=2,
+ names=["pool3"],
+ description="desc2",
+ category=pool_category_factory("test-cat2"),
+ )
pool2.last_edit_time = datetime(1998, 1, 1)
pool2.posts.append(post)
@@ -170,105 +208,100 @@ def test_serialize_post(
db.session.flush()
result = posts.serialize_post(post, auth_user)
- result['tags'].sort(key=lambda tag: tag['names'][0])
+ result["tags"].sort(key=lambda tag: tag["names"][0])
assert result == {
- 'id': 1,
- 'version': 1,
- 'creationTime': datetime(1997, 1, 1),
- 'lastEditTime': datetime(1998, 1, 1),
- 'safety': 'safe',
- 'source': '4gag',
- 'type': 'image',
- 'checksum': 'deadbeef',
- 'fileSize': 100,
- 'canvasWidth': 200,
- 'canvasHeight': 300,
- 'contentUrl': 'http://example.com/posts/1_244c8840887984c4.jpg',
- 'thumbnailUrl':
- 'http://example.com/'
- 'generated-thumbnails/1_244c8840887984c4.jpg',
- 'flags': ['loop'],
- 'tags': [
- {
- 'names': ['tag1', 'tag2'],
- 'category': 'test-cat1', 'usages': 1,
- },
+ "id": 1,
+ "version": 1,
+ "creationTime": datetime(1997, 1, 1),
+ "lastEditTime": datetime(1998, 1, 1),
+ "safety": "safe",
+ "source": "4gag",
+ "type": "image",
+ "checksum": "deadbeef",
+ "fileSize": 100,
+ "canvasWidth": 200,
+ "canvasHeight": 300,
+ "contentUrl": "http://example.com/posts/1_244c8840887984c4.jpg",
+ "thumbnailUrl": "http://example.com/"
+ "generated-thumbnails/1_244c8840887984c4.jpg",
+ "flags": ["loop"],
+ "tags": [
{
- 'names': ['tag3'],
- 'category': 'test-cat2',
- 'usages': 1,
+ "names": ["tag1", "tag2"],
+ "category": "test-cat1",
+ "usages": 1,
},
+ {"names": ["tag3"], "category": "test-cat2", "usages": 1,},
],
- 'relations': [],
- 'notes': [],
- 'pools': [
+ "relations": [],
+ "notes": [],
+ "pools": [
{
- 'id': 1,
- 'names': ['pool1', 'pool2'],
- 'description': 'desc',
- 'category': 'test-cat1',
- 'postCount': 1,
- 'posts': [
+ "id": 1,
+ "names": ["pool1", "pool2"],
+ "description": "desc",
+ "category": "test-cat1",
+ "postCount": 1,
+ "posts": [
{
- 'id': 1,
- 'thumbnailUrl':
- 'http://example.com/'
- 'generated-thumbnails/1_244c8840887984c4.jpg',
+ "id": 1,
+ "thumbnailUrl": "http://example.com/"
+ "generated-thumbnails/1_244c8840887984c4.jpg",
}
],
- 'version': 1,
- 'creationTime': datetime(1996, 1, 1),
- 'lastEditTime': datetime(1998, 1, 1),
+ "version": 1,
+ "creationTime": datetime(1996, 1, 1),
+ "lastEditTime": datetime(1998, 1, 1),
},
{
- 'id': 2,
- 'names': ['pool3'],
- 'description': 'desc2',
- 'category': 'test-cat2',
- 'postCount': 1,
- 'posts': [
+ "id": 2,
+ "names": ["pool3"],
+ "description": "desc2",
+ "category": "test-cat2",
+ "postCount": 1,
+ "posts": [
{
- 'id': 1,
- 'thumbnailUrl':
- 'http://example.com/'
- 'generated-thumbnails/1_244c8840887984c4.jpg',
+ "id": 1,
+ "thumbnailUrl": "http://example.com/"
+ "generated-thumbnails/1_244c8840887984c4.jpg",
}
],
- 'version': 1,
- 'creationTime': datetime(1996, 1, 1),
- 'lastEditTime': datetime(1998, 1, 1),
- }
+ "version": 1,
+ "creationTime": datetime(1996, 1, 1),
+ "lastEditTime": datetime(1998, 1, 1),
+ },
],
- 'user': 'post author',
- 'score': 1,
- 'ownFavorite': False,
- 'ownScore': -1,
- 'tagCount': 2,
- 'favoriteCount': 1,
- 'commentCount': 2,
- 'noteCount': 0,
- 'featureCount': 1,
- 'relationCount': 0,
- 'lastFeatureTime': datetime(1999, 1, 1),
- 'favoritedBy': ['fav1'],
- 'hasCustomThumbnail': True,
- 'mimeType': 'image/jpeg',
- 'comments': ['commenter1', 'commenter2'],
+ "user": "post author",
+ "score": 1,
+ "ownFavorite": False,
+ "ownScore": -1,
+ "tagCount": 2,
+ "favoriteCount": 1,
+ "commentCount": 2,
+ "noteCount": 0,
+ "featureCount": 1,
+ "relationCount": 0,
+ "lastFeatureTime": datetime(1999, 1, 1),
+ "favoritedBy": ["fav1"],
+ "hasCustomThumbnail": True,
+ "mimeType": "image/jpeg",
+ "comments": ["commenter1", "commenter2"],
}
def test_serialize_micro_post(post_factory, user_factory):
- with patch('szurubooru.func.posts.get_post_thumbnail_url'):
- posts.get_post_thumbnail_url.return_value \
- = 'https://example.com/thumb.png'
+ with patch("szurubooru.func.posts.get_post_thumbnail_url"):
+ posts.get_post_thumbnail_url.return_value = (
+ "https://example.com/thumb.png"
+ )
auth_user = user_factory()
post = post_factory()
db.session.add(post)
db.session.flush()
assert posts.serialize_micro_post(post, auth_user) == {
- 'id': post.post_id,
- 'thumbnailUrl': 'https://example.com/thumb.png',
+ "id": post.post_id,
+ "thumbnailUrl": "https://example.com/thumb.png",
}
@@ -299,22 +332,25 @@ def test_get_post_by_id(post_factory):
def test_create_post(user_factory, fake_datetime):
- with patch('szurubooru.func.posts.update_post_content'), \
- patch('szurubooru.func.posts.update_post_tags'), \
- fake_datetime('1997-01-01'):
+ with patch("szurubooru.func.posts.update_post_content"), patch(
+ "szurubooru.func.posts.update_post_tags"
+ ), fake_datetime("1997-01-01"):
auth_user = user_factory()
- post, _new_tags = posts.create_post('content', ['tag'], auth_user)
+ post, _new_tags = posts.create_post("content", ["tag"], auth_user)
assert post.creation_time == datetime(1997, 1, 1)
assert post.last_edit_time is None
- posts.update_post_tags.assert_called_once_with(post, ['tag'])
- posts.update_post_content.assert_called_once_with(post, 'content')
+ posts.update_post_tags.assert_called_once_with(post, ["tag"])
+ posts.update_post_content.assert_called_once_with(post, "content")
-@pytest.mark.parametrize('input_safety,expected_safety', [
- ('safe', model.Post.SAFETY_SAFE),
- ('sketchy', model.Post.SAFETY_SKETCHY),
- ('unsafe', model.Post.SAFETY_UNSAFE),
-])
+@pytest.mark.parametrize(
+ "input_safety,expected_safety",
+ [
+ ("safe", model.Post.SAFETY_SAFE),
+ ("sketchy", model.Post.SAFETY_SKETCHY),
+ ("unsafe", model.Post.SAFETY_UNSAFE),
+ ],
+)
def test_update_post_safety(input_safety, expected_safety):
post = model.Post()
posts.update_post_safety(post, input_safety)
@@ -324,96 +360,104 @@ def test_update_post_safety(input_safety, expected_safety):
def test_update_post_safety_with_invalid_string():
post = model.Post()
with pytest.raises(posts.InvalidPostSafetyError):
- posts.update_post_safety(post, 'bad')
+ posts.update_post_safety(post, "bad")
def test_update_post_source():
post = model.Post()
- posts.update_post_source(post, 'x')
- assert post.source == 'x'
+ posts.update_post_source(post, "x")
+ assert post.source == "x"
def test_update_post_source_with_too_long_string():
post = model.Post()
with pytest.raises(posts.InvalidPostSourceError):
- posts.update_post_source(post, 'x' * 3000)
+ posts.update_post_source(post, "x" * 3000)
@pytest.mark.parametrize(
- 'is_existing,input_file,expected_mime_type,expected_type,output_file_name',
+ "is_existing,input_file,expected_mime_type,expected_type,output_file_name",
[
(
True,
- 'png.png',
- 'image/png',
+ "png.png",
+ "image/png",
model.Post.TYPE_IMAGE,
- '1_244c8840887984c4.png',
+ "1_244c8840887984c4.png",
),
(
False,
- 'png.png',
- 'image/png',
+ "png.png",
+ "image/png",
model.Post.TYPE_IMAGE,
- '1_244c8840887984c4.png',
+ "1_244c8840887984c4.png",
),
(
False,
- 'jpeg.jpg',
- 'image/jpeg',
+ "jpeg.jpg",
+ "image/jpeg",
model.Post.TYPE_IMAGE,
- '1_244c8840887984c4.jpg',
+ "1_244c8840887984c4.jpg",
),
(
False,
- 'gif.gif',
- 'image/gif',
+ "gif.gif",
+ "image/gif",
model.Post.TYPE_IMAGE,
- '1_244c8840887984c4.gif',
+ "1_244c8840887984c4.gif",
),
(
False,
- 'gif-animated.gif',
- 'image/gif',
+ "gif-animated.gif",
+ "image/gif",
model.Post.TYPE_ANIMATION,
- '1_244c8840887984c4.gif',
+ "1_244c8840887984c4.gif",
),
(
False,
- 'webm.webm',
- 'video/webm',
+ "webm.webm",
+ "video/webm",
model.Post.TYPE_VIDEO,
- '1_244c8840887984c4.webm',
+ "1_244c8840887984c4.webm",
),
(
False,
- 'mp4.mp4',
- 'video/mp4',
+ "mp4.mp4",
+ "video/mp4",
model.Post.TYPE_VIDEO,
- '1_244c8840887984c4.mp4',
+ "1_244c8840887984c4.mp4",
),
(
False,
- 'flash.swf',
- 'application/x-shockwave-flash',
+ "flash.swf",
+ "application/x-shockwave-flash",
model.Post.TYPE_FLASH,
- '1_244c8840887984c4.swf',
+ "1_244c8840887984c4.swf",
),
- ])
+ ],
+)
def test_update_post_content_for_new_post(
- tmpdir, config_injector, post_factory, read_asset, is_existing,
- input_file, expected_mime_type, expected_type, output_file_name):
- with patch('szurubooru.func.util.get_sha1'):
- util.get_sha1.return_value = 'crc'
- config_injector({
- 'data_dir': str(tmpdir.mkdir('data')),
- 'thumbnails': {
- 'post_width': 300,
- 'post_height': 300,
- },
- 'secret': 'test',
- 'allow_broken_uploads': False,
- })
- output_file_path = '{}/data/posts/{}'.format(tmpdir, output_file_name)
+ tmpdir,
+ config_injector,
+ post_factory,
+ read_asset,
+ is_existing,
+ input_file,
+ expected_mime_type,
+ expected_type,
+ output_file_name,
+):
+ with patch("szurubooru.func.util.get_sha1"):
+ util.get_sha1.return_value = "crc"
+ config_injector(
+ {
+ "data_dir": str(tmpdir.mkdir("data")),
+ "thumbnails": {"post_width": 300, "post_height": 300,},
+ "secret": "test",
+ "allow_broken_uploads": False,
+ }
+ )
+ output_file_path = "{}/data/posts/{}".format(tmpdir, output_file_name)
post = post_factory(id=1)
db.session.add(post)
if is_existing:
@@ -426,7 +470,7 @@ def test_update_post_content_for_new_post(
db.session.flush()
assert post.mime_type == expected_mime_type
assert post.type == expected_type
- assert post.checksum == 'crc'
+ assert post.checksum == "crc"
assert os.path.exists(output_file_path)
if post.type in (model.Post.TYPE_IMAGE, model.Post.TYPE_ANIMATION):
assert db.session.query(model.PostSignature).count() == 1
@@ -435,130 +479,134 @@ def test_update_post_content_for_new_post(
def test_update_post_content_to_existing_content(
- tmpdir, config_injector, post_factory, read_asset):
- config_injector({
- 'data_dir': str(tmpdir.mkdir('data')),
- 'data_url': 'example.com',
- 'thumbnails': {
- 'post_width': 300,
- 'post_height': 300,
- },
- 'secret': 'test',
- 'allow_broken_uploads': False,
- })
+ tmpdir, config_injector, post_factory, read_asset
+):
+ config_injector(
+ {
+ "data_dir": str(tmpdir.mkdir("data")),
+ "data_url": "example.com",
+ "thumbnails": {"post_width": 300, "post_height": 300,},
+ "secret": "test",
+ "allow_broken_uploads": False,
+ }
+ )
post = post_factory()
another_post = post_factory()
db.session.add_all([post, another_post])
- posts.update_post_content(post, read_asset('png.png'))
+ posts.update_post_content(post, read_asset("png.png"))
db.session.flush()
with pytest.raises(posts.PostAlreadyUploadedError):
- posts.update_post_content(another_post, read_asset('png.png'))
+ posts.update_post_content(another_post, read_asset("png.png"))
-@pytest.mark.parametrize('allow_broken_uploads', [True, False])
+@pytest.mark.parametrize("allow_broken_uploads", [True, False])
def test_update_post_content_with_broken_content(
- tmpdir, config_injector, post_factory, read_asset,
- allow_broken_uploads):
+ tmpdir, config_injector, post_factory, read_asset, allow_broken_uploads
+):
# the rationale behind this behavior is to salvage user upload even if the
# server software thinks it's broken. chances are the server is wrong,
# especially about flash movies.
- config_injector({
- 'data_dir': str(tmpdir.mkdir('data')),
- 'thumbnails': {
- 'post_width': 300,
- 'post_height': 300,
- },
- 'secret': 'test',
- 'allow_broken_uploads': allow_broken_uploads,
- })
+ config_injector(
+ {
+ "data_dir": str(tmpdir.mkdir("data")),
+ "thumbnails": {"post_width": 300, "post_height": 300,},
+ "secret": "test",
+ "allow_broken_uploads": allow_broken_uploads,
+ }
+ )
post = post_factory()
another_post = post_factory()
db.session.add_all([post, another_post])
if allow_broken_uploads:
- posts.update_post_content(post, read_asset('png-broken.png'))
+ posts.update_post_content(post, read_asset("png-broken.png"))
db.session.flush()
assert post.canvas_width is None
assert post.canvas_height is None
else:
with pytest.raises(posts.InvalidPostContentError):
- posts.update_post_content(post, read_asset('png-broken.png'))
+ posts.update_post_content(post, read_asset("png-broken.png"))
db.session.flush()
-@pytest.mark.parametrize('input_content', [None, b'not a media file'])
+@pytest.mark.parametrize("input_content", [None, b"not a media file"])
def test_update_post_content_with_invalid_content(
- config_injector, input_content):
- config_injector({
- 'allow_broken_uploads': True,
- })
+ config_injector, input_content
+):
+ config_injector(
+ {"allow_broken_uploads": True,}
+ )
post = model.Post()
with pytest.raises(posts.InvalidPostContentError):
posts.update_post_content(post, input_content)
-@pytest.mark.parametrize('is_existing', (True, False))
+@pytest.mark.parametrize("is_existing", (True, False))
def test_update_post_thumbnail_to_new_one(
- tmpdir, config_injector, read_asset, post_factory, is_existing):
- config_injector({
- 'data_dir': str(tmpdir.mkdir('data')),
- 'thumbnails': {
- 'post_width': 300,
- 'post_height': 300,
- },
- 'secret': 'test',
- 'allow_broken_uploads': False,
- })
+ tmpdir, config_injector, read_asset, post_factory, is_existing
+):
+ config_injector(
+ {
+ "data_dir": str(tmpdir.mkdir("data")),
+ "thumbnails": {"post_width": 300, "post_height": 300,},
+ "secret": "test",
+ "allow_broken_uploads": False,
+ }
+ )
post = post_factory(id=1)
db.session.add(post)
if is_existing:
db.session.flush()
assert post.post_id
generated_path = (
- '{}/data/generated-thumbnails/1_244c8840887984c4.jpg'
- .format(tmpdir))
+ "{}/data/generated-thumbnails/".format(tmpdir)
+ + "1_244c8840887984c4.jpg"
+ )
source_path = (
- '{}/data/posts/custom-thumbnails/1_244c8840887984c4.dat'
- .format(tmpdir))
+ "{}/data/posts/custom-thumbnails/".format(tmpdir)
+ + "1_244c8840887984c4.dat"
+ )
assert not os.path.exists(generated_path)
assert not os.path.exists(source_path)
- posts.update_post_content(post, read_asset('png.png'))
- posts.update_post_thumbnail(post, read_asset('jpeg.jpg'))
+ posts.update_post_content(post, read_asset("png.png"))
+ posts.update_post_thumbnail(post, read_asset("jpeg.jpg"))
assert not os.path.exists(generated_path)
assert not os.path.exists(source_path)
db.session.flush()
assert os.path.exists(generated_path)
assert os.path.exists(source_path)
- with open(source_path, 'rb') as handle:
- assert handle.read() == read_asset('jpeg.jpg')
+ with open(source_path, "rb") as handle:
+ assert handle.read() == read_asset("jpeg.jpg")
-@pytest.mark.parametrize('is_existing', (True, False))
+@pytest.mark.parametrize("is_existing", (True, False))
def test_update_post_thumbnail_to_default(
- tmpdir, config_injector, read_asset, post_factory, is_existing):
- config_injector({
- 'data_dir': str(tmpdir.mkdir('data')),
- 'thumbnails': {
- 'post_width': 300,
- 'post_height': 300,
- },
- 'secret': 'test',
- 'allow_broken_uploads': False,
- })
+ tmpdir, config_injector, read_asset, post_factory, is_existing
+):
+ config_injector(
+ {
+ "data_dir": str(tmpdir.mkdir("data")),
+ "thumbnails": {"post_width": 300, "post_height": 300,},
+ "secret": "test",
+ "allow_broken_uploads": False,
+ }
+ )
post = post_factory(id=1)
db.session.add(post)
if is_existing:
db.session.flush()
assert post.post_id
generated_path = (
- '{}/data/generated-thumbnails/1_244c8840887984c4.jpg'
- .format(tmpdir))
+ "{}/data/generated-thumbnails/".format(tmpdir)
+ + "1_244c8840887984c4.jpg"
+ )
source_path = (
- '{}/data/posts/custom-thumbnails/1_244c8840887984c4.dat'
- .format(tmpdir))
+ "{}/data/posts/custom-thumbnails/".format(tmpdir)
+ + "1_244c8840887984c4.dat"
+ )
assert not os.path.exists(generated_path)
assert not os.path.exists(source_path)
- posts.update_post_content(post, read_asset('png.png'))
- posts.update_post_thumbnail(post, read_asset('jpeg.jpg'))
+ posts.update_post_content(post, read_asset("png.png"))
+ posts.update_post_thumbnail(post, read_asset("jpeg.jpg"))
posts.update_post_thumbnail(post, None)
assert not os.path.exists(generated_path)
assert not os.path.exists(source_path)
@@ -567,82 +615,88 @@ def test_update_post_thumbnail_to_default(
assert not os.path.exists(source_path)
-@pytest.mark.parametrize('is_existing', (True, False))
+@pytest.mark.parametrize("is_existing", (True, False))
def test_update_post_thumbnail_with_broken_thumbnail(
- tmpdir, config_injector, read_asset, post_factory, is_existing):
- config_injector({
- 'data_dir': str(tmpdir.mkdir('data')),
- 'thumbnails': {
- 'post_width': 300,
- 'post_height': 300,
- },
- 'secret': 'test',
- 'allow_broken_uploads': False,
- })
+ tmpdir, config_injector, read_asset, post_factory, is_existing
+):
+ config_injector(
+ {
+ "data_dir": str(tmpdir.mkdir("data")),
+ "thumbnails": {"post_width": 300, "post_height": 300,},
+ "secret": "test",
+ "allow_broken_uploads": False,
+ }
+ )
post = post_factory(id=1)
db.session.add(post)
if is_existing:
db.session.flush()
assert post.post_id
generated_path = (
- '{}/data/generated-thumbnails/1_244c8840887984c4.jpg'
- .format(tmpdir))
+ "{}/data/generated-thumbnails/".format(tmpdir)
+ + "1_244c8840887984c4.jpg"
+ )
source_path = (
- '{}/data/posts/custom-thumbnails/1_244c8840887984c4.dat'
- .format(tmpdir))
+ "{}/data/posts/custom-thumbnails/".format(tmpdir)
+ + "1_244c8840887984c4.dat"
+ )
assert not os.path.exists(generated_path)
assert not os.path.exists(source_path)
- posts.update_post_content(post, read_asset('png.png'))
- posts.update_post_thumbnail(post, read_asset('png-broken.png'))
+ posts.update_post_content(post, read_asset("png.png"))
+ posts.update_post_thumbnail(post, read_asset("png-broken.png"))
assert not os.path.exists(generated_path)
assert not os.path.exists(source_path)
db.session.flush()
assert os.path.exists(generated_path)
assert os.path.exists(source_path)
- with open(source_path, 'rb') as handle:
- assert handle.read() == read_asset('png-broken.png')
- with open(generated_path, 'rb') as handle:
+ with open(source_path, "rb") as handle:
+ assert handle.read() == read_asset("png-broken.png")
+ with open(generated_path, "rb") as handle:
image = images.Image(handle.read())
assert image.width == 1
assert image.height == 1
def test_update_post_content_leaving_custom_thumbnail(
- tmpdir, config_injector, read_asset, post_factory):
- config_injector({
- 'data_dir': str(tmpdir.mkdir('data')),
- 'thumbnails': {
- 'post_width': 300,
- 'post_height': 300,
- },
- 'secret': 'test',
- 'allow_broken_uploads': False,
- })
+ tmpdir, config_injector, read_asset, post_factory
+):
+ config_injector(
+ {
+ "data_dir": str(tmpdir.mkdir("data")),
+ "thumbnails": {"post_width": 300, "post_height": 300,},
+ "secret": "test",
+ "allow_broken_uploads": False,
+ }
+ )
post = post_factory(id=1)
db.session.add(post)
- posts.update_post_content(post, read_asset('png.png'))
- posts.update_post_thumbnail(post, read_asset('jpeg.jpg'))
- posts.update_post_content(post, read_asset('png.png'))
+ posts.update_post_content(post, read_asset("png.png"))
+ posts.update_post_thumbnail(post, read_asset("jpeg.jpg"))
+ posts.update_post_content(post, read_asset("png.png"))
db.session.flush()
generated_path = (
- '{}/data/generated-thumbnails/1_244c8840887984c4.jpg'
- .format(tmpdir))
+ "{}/data/generated-thumbnails/".format(tmpdir)
+ + "1_244c8840887984c4.jpg"
+ )
source_path = (
- '{}/data/posts/custom-thumbnails/1_244c8840887984c4.dat'
- .format(tmpdir))
+ "{}/data/posts/custom-thumbnails/".format(tmpdir)
+ + "1_244c8840887984c4.dat"
+ )
assert os.path.exists(source_path)
assert os.path.exists(generated_path)
def test_update_post_tags(tag_factory):
post = model.Post()
- with patch('szurubooru.func.tags.get_or_create_tags_by_names'):
- tags.get_or_create_tags_by_names.side_effect = lambda tag_names: \
- ([tag_factory(names=[name]) for name in tag_names], [])
- posts.update_post_tags(post, ['tag1', 'tag2'])
+ with patch("szurubooru.func.tags.get_or_create_tags_by_names"):
+ tags.get_or_create_tags_by_names.side_effect = lambda tag_names: (
+ [tag_factory(names=[name]) for name in tag_names],
+ [],
+ )
+ posts.update_post_tags(post, ["tag1", "tag2"])
assert len(post.tags) == 2
- assert post.tags[0].names[0].name == 'tag1'
- assert post.tags[1].names[0].name == 'tag2'
+ assert post.tags[0].names[0].name == "tag1"
+ assert post.tags[1].names[0].name == "tag2"
def test_update_post_relations(post_factory):
@@ -654,7 +708,9 @@ def test_update_post_relations(post_factory):
posts.update_post_relations(post, [relation1.post_id, relation2.post_id])
assert len(post.relations) == 2
assert sorted(r.post_id for r in post.relations) == [
- relation1.post_id, relation2.post_id]
+ relation1.post_id,
+ relation2.post_id,
+ ]
def test_update_post_relations_bidirectionality(post_factory):
@@ -689,35 +745,44 @@ def test_update_post_notes():
posts.update_post_notes(
post,
[
- {'polygon': [[0, 0], [0, 1], [1, 0], [0, 0]], 'text': 'text1'},
- {'polygon': [[0, 0], [0, 1], [1, 0], [0, 0]], 'text': 'text2'},
- ])
+ {"polygon": [[0, 0], [0, 1], [1, 0], [0, 0]], "text": "text1"},
+ {"polygon": [[0, 0], [0, 1], [1, 0], [0, 0]], "text": "text2"},
+ ],
+ )
assert len(post.notes) == 2
assert post.notes[0].polygon == [[0, 0], [0, 1], [1, 0], [0, 0]]
- assert post.notes[0].text == 'text1'
+ assert post.notes[0].text == "text1"
assert post.notes[1].polygon == [[0, 0], [0, 1], [1, 0], [0, 0]]
- assert post.notes[1].text == 'text2'
-
-
-@pytest.mark.parametrize('input', [
- [{'text': '...'}],
- [{'polygon': None, 'text': '...'}],
- [{'polygon': 'trash', 'text': '...'}],
- [{'polygon': ['trash', 'trash', 'trash'], 'text': '...'}],
- [{'polygon': {2: 'trash', 3: 'trash', 4: 'trash'}, 'text': '...'}],
- [{'polygon': [[0, 0]], 'text': '...'}],
- [{'polygon': [[0, 0], [0, 0], None], 'text': '...'}],
- [{'polygon': [[0, 0], [0, 0], 'surprise'], 'text': '...'}],
- [{'polygon': [[0, 0], [0, 0], {2: 'trash', 3: 'trash'}], 'text': '...'}],
- [{'polygon': [[0, 0], [0, 0], 5], 'text': '...'}],
- [{'polygon': [[0, 0], [0, 0], [0, 2]], 'text': '...'}],
- [{'polygon': [[0, 0], [0, 0], [0, '...']], 'text': '...'}],
- [{'polygon': [[0, 0], [0, 0], [0, 0, 0]], 'text': '...'}],
- [{'polygon': [[0, 0], [0, 0], [0]], 'text': '...'}],
- [{'polygon': [[0, 0], [0, 0], [0, 1]], 'text': ''}],
- [{'polygon': [[0, 0], [0, 0], [0, 1]], 'text': None}],
- [{'polygon': [[0, 0], [0, 0], [0, 1]]}],
-])
+ assert post.notes[1].text == "text2"
+
+
+@pytest.mark.parametrize(
+ "input",
+ [
+ [{"text": "..."}],
+ [{"polygon": None, "text": "..."}],
+ [{"polygon": "trash", "text": "..."}],
+ [{"polygon": ["trash", "trash", "trash"], "text": "..."}],
+ [{"polygon": {2: "trash", 3: "trash", 4: "trash"}, "text": "..."}],
+ [{"polygon": [[0, 0]], "text": "..."}],
+ [{"polygon": [[0, 0], [0, 0], None], "text": "..."}],
+ [{"polygon": [[0, 0], [0, 0], "surprise"], "text": "..."}],
+ [
+ {
+ "polygon": [[0, 0], [0, 0], {2: "trash", 3: "trash"}],
+ "text": "...",
+ }
+ ],
+ [{"polygon": [[0, 0], [0, 0], 5], "text": "..."}],
+ [{"polygon": [[0, 0], [0, 0], [0, 2]], "text": "..."}],
+ [{"polygon": [[0, 0], [0, 0], [0, "..."]], "text": "..."}],
+ [{"polygon": [[0, 0], [0, 0], [0, 0, 0]], "text": "..."}],
+ [{"polygon": [[0, 0], [0, 0], [0]], "text": "..."}],
+ [{"polygon": [[0, 0], [0, 0], [0, 1]], "text": ""}],
+ [{"polygon": [[0, 0], [0, 0], [0, 1]], "text": None}],
+ [{"polygon": [[0, 0], [0, 0], [0, 1]]}],
+ ],
+)
def test_update_post_notes_with_invalid_content(input):
post = model.Post()
with pytest.raises(posts.InvalidPostNoteError):
@@ -726,14 +791,14 @@ def test_update_post_notes_with_invalid_content(input):
def test_update_post_flags():
post = model.Post()
- posts.update_post_flags(post, ['loop'])
- assert post.flags == ['loop']
+ posts.update_post_flags(post, ["loop"])
+ assert post.flags == ["loop"]
def test_update_post_flags_with_invalid_content():
post = model.Post()
with pytest.raises(posts.InvalidPostFlagError):
- posts.update_post_flags(post, ['invalid'])
+ posts.update_post_flags(post, ["invalid"])
def test_feature_post(post_factory, user_factory):
@@ -749,7 +814,7 @@ def test_feature_post(post_factory, user_factory):
def test_delete(post_factory, config_injector):
- config_injector({'delete_source_files': False})
+ config_injector({"delete_source_files": False})
post = post_factory()
db.session.add(post)
db.session.flush()
@@ -760,7 +825,7 @@ def test_delete(post_factory, config_injector):
def test_merge_posts_deletes_source_post(post_factory, config_injector):
- config_injector({'delete_source_files': False})
+ config_injector({"delete_source_files": False})
source_post = post_factory()
target_post = post_factory()
db.session.add_all([source_post, target_post])
@@ -773,7 +838,7 @@ def test_merge_posts_deletes_source_post(post_factory, config_injector):
def test_merge_posts_with_itself(post_factory, config_injector):
- config_injector({'delete_source_files': False})
+ config_injector({"delete_source_files": False})
source_post = post_factory()
db.session.add(source_post)
db.session.flush()
@@ -782,7 +847,7 @@ def test_merge_posts_with_itself(post_factory, config_injector):
def test_merge_posts_moves_tags(post_factory, tag_factory, config_injector):
- config_injector({'delete_source_files': False})
+ config_injector({"delete_source_files": False})
source_post = post_factory()
target_post = post_factory()
tag = tag_factory()
@@ -798,8 +863,9 @@ def test_merge_posts_moves_tags(post_factory, tag_factory, config_injector):
def test_merge_posts_doesnt_duplicate_tags(
- post_factory, tag_factory, config_injector):
- config_injector({'delete_source_files': False})
+ post_factory, tag_factory, config_injector
+):
+ config_injector({"delete_source_files": False})
source_post = post_factory()
target_post = post_factory()
tag = tag_factory()
@@ -815,8 +881,9 @@ def test_merge_posts_doesnt_duplicate_tags(
def test_merge_posts_moves_comments(
- post_factory, comment_factory, config_injector):
- config_injector({'delete_source_files': False})
+ post_factory, comment_factory, config_injector
+):
+ config_injector({"delete_source_files": False})
source_post = post_factory()
target_post = post_factory()
comment = comment_factory(post=source_post)
@@ -831,8 +898,9 @@ def test_merge_posts_moves_comments(
def test_merge_posts_moves_scores(
- post_factory, post_score_factory, config_injector):
- config_injector({'delete_source_files': False})
+ post_factory, post_score_factory, config_injector
+):
+ config_injector({"delete_source_files": False})
source_post = post_factory()
target_post = post_factory()
score = post_score_factory(post=source_post, score=1)
@@ -847,8 +915,9 @@ def test_merge_posts_moves_scores(
def test_merge_posts_doesnt_duplicate_scores(
- post_factory, user_factory, post_score_factory, config_injector):
- config_injector({'delete_source_files': False})
+ post_factory, user_factory, post_score_factory, config_injector
+):
+ config_injector({"delete_source_files": False})
source_post = post_factory()
target_post = post_factory()
user = user_factory()
@@ -865,8 +934,9 @@ def test_merge_posts_doesnt_duplicate_scores(
def test_merge_posts_moves_favorites(
- post_factory, post_favorite_factory, config_injector):
- config_injector({'delete_source_files': False})
+ post_factory, post_favorite_factory, config_injector
+):
+ config_injector({"delete_source_files": False})
source_post = post_factory()
target_post = post_factory()
favorite = post_favorite_factory(post=source_post)
@@ -881,8 +951,9 @@ def test_merge_posts_moves_favorites(
def test_merge_posts_doesnt_duplicate_favorites(
- post_factory, user_factory, post_favorite_factory, config_injector):
- config_injector({'delete_source_files': False})
+ post_factory, user_factory, post_favorite_factory, config_injector
+):
+ config_injector({"delete_source_files": False})
source_post = post_factory()
target_post = post_factory()
user = user_factory()
@@ -899,7 +970,7 @@ def test_merge_posts_doesnt_duplicate_favorites(
def test_merge_posts_moves_child_relations(post_factory, config_injector):
- config_injector({'delete_source_files': False})
+ config_injector({"delete_source_files": False})
source_post = post_factory()
target_post = post_factory()
related_post = post_factory()
@@ -915,8 +986,9 @@ def test_merge_posts_moves_child_relations(post_factory, config_injector):
def test_merge_posts_doesnt_duplicate_child_relations(
- post_factory, config_injector):
- config_injector({'delete_source_files': False})
+ post_factory, config_injector
+):
+ config_injector({"delete_source_files": False})
source_post = post_factory()
target_post = post_factory()
related_post = post_factory()
@@ -933,7 +1005,7 @@ def test_merge_posts_doesnt_duplicate_child_relations(
def test_merge_posts_moves_parent_relations(post_factory, config_injector):
- config_injector({'delete_source_files': False})
+ config_injector({"delete_source_files": False})
source_post = post_factory()
target_post = post_factory()
related_post = post_factory()
@@ -951,8 +1023,9 @@ def test_merge_posts_moves_parent_relations(post_factory, config_injector):
def test_merge_posts_doesnt_duplicate_parent_relations(
- post_factory, config_injector):
- config_injector({'delete_source_files': False})
+ post_factory, config_injector
+):
+ config_injector({"delete_source_files": False})
source_post = post_factory()
target_post = post_factory()
related_post = post_factory()
@@ -970,8 +1043,9 @@ def test_merge_posts_doesnt_duplicate_parent_relations(
def test_merge_posts_doesnt_create_relation_loop_for_children(
- post_factory, config_injector):
- config_injector({'delete_source_files': False})
+ post_factory, config_injector
+):
+ config_injector({"delete_source_files": False})
source_post = post_factory()
target_post = post_factory()
source_post.relations = [target_post]
@@ -986,8 +1060,9 @@ def test_merge_posts_doesnt_create_relation_loop_for_children(
def test_merge_posts_doesnt_create_relation_loop_for_parents(
- post_factory, config_injector):
- config_injector({'delete_source_files': False})
+ post_factory, config_injector
+):
+ config_injector({"delete_source_files": False})
source_post = post_factory()
target_post = post_factory()
target_post.relations = [source_post]
@@ -1002,30 +1077,33 @@ def test_merge_posts_doesnt_create_relation_loop_for_parents(
def test_merge_posts_replaces_content(
- post_factory, config_injector, tmpdir, read_asset):
- config_injector({
- 'data_dir': str(tmpdir.mkdir('data')),
- 'data_url': 'example.com',
- 'delete_source_files': False,
- 'thumbnails': {
- 'post_width': 300,
- 'post_height': 300,
- },
- 'secret': 'test',
- })
+ post_factory, config_injector, tmpdir, read_asset
+):
+ config_injector(
+ {
+ "data_dir": str(tmpdir.mkdir("data")),
+ "data_url": "example.com",
+ "delete_source_files": False,
+ "thumbnails": {"post_width": 300, "post_height": 300,},
+ "secret": "test",
+ }
+ )
source_post = post_factory(id=1)
target_post = post_factory(id=2)
- content = read_asset('png.png')
+ content = read_asset("png.png")
db.session.add_all([source_post, target_post])
db.session.commit()
posts.update_post_content(source_post, content)
db.session.flush()
- source_path = (
- os.path.join('{}/data/posts/1_244c8840887984c4.png'.format(tmpdir)))
- target_path1 = (
- os.path.join('{}/data/posts/2_49caeb3ec1643406.png'.format(tmpdir)))
- target_path2 = (
- os.path.join('{}/data/posts/2_49caeb3ec1643406.dat'.format(tmpdir)))
+ source_path = os.path.join(
+ "{}/data/posts/1_244c8840887984c4.png".format(tmpdir)
+ )
+ target_path1 = os.path.join(
+ "{}/data/posts/2_49caeb3ec1643406.png".format(tmpdir)
+ )
+ target_path2 = os.path.join(
+ "{}/data/posts/2_49caeb3ec1643406.dat".format(tmpdir)
+ )
assert os.path.exists(source_path)
assert not os.path.exists(target_path1)
assert not os.path.exists(target_path2)
@@ -1040,16 +1118,16 @@ def test_merge_posts_replaces_content(
def test_search_by_image(post_factory, config_injector, read_asset):
- config_injector({'allow_broken_uploads': False})
+ config_injector({"allow_broken_uploads": False})
post = post_factory()
- posts.generate_post_signature(post, read_asset('jpeg.jpg'))
+ posts.generate_post_signature(post, read_asset("jpeg.jpg"))
db.session.flush()
- result1 = posts.search_by_image(read_asset('jpeg-similar.jpg'))
+ result1 = posts.search_by_image(read_asset("jpeg-similar.jpg"))
assert len(result1) == 1
result1_distance, result1_post = result1[0]
assert abs(result1_distance - 0.19713075553164386) < 1e-8
assert result1_post.post_id == post.post_id
- result2 = posts.search_by_image(read_asset('png.png'))
+ result2 = posts.search_by_image(read_asset("png.png"))
assert not result2
diff --git a/server/szurubooru/tests/func/test_snapshots.py b/server/szurubooru/tests/func/test_snapshots.py
index 053cf98..b4dda1c 100644
--- a/server/szurubooru/tests/func/test_snapshots.py
+++ b/server/szurubooru/tests/func/test_snapshots.py
@@ -1,55 +1,57 @@
-from unittest.mock import patch
from datetime import datetime
+from unittest.mock import patch
+
import pytest
+
from szurubooru import db, model
from szurubooru.func import snapshots, users
def test_get_tag_category_snapshot(tag_category_factory):
- category = tag_category_factory(name='name', color='color')
+ category = tag_category_factory(name="name", color="color")
assert snapshots.get_tag_category_snapshot(category) == {
- 'name': 'name',
- 'color': 'color',
- 'default': False,
+ "name": "name",
+ "color": "color",
+ "default": False,
}
category.default = True
assert snapshots.get_tag_category_snapshot(category) == {
- 'name': 'name',
- 'color': 'color',
- 'default': True,
+ "name": "name",
+ "color": "color",
+ "default": True,
}
def test_get_tag_snapshot(tag_factory, tag_category_factory):
- category = tag_category_factory(name='dummy')
- tag = tag_factory(names=['main_name', 'alias'], category=category)
+ category = tag_category_factory(name="dummy")
+ tag = tag_factory(names=["main_name", "alias"], category=category)
assert snapshots.get_tag_snapshot(tag) == {
- 'names': ['main_name', 'alias'],
- 'category': 'dummy',
- 'suggestions': [],
- 'implications': [],
+ "names": ["main_name", "alias"],
+ "category": "dummy",
+ "suggestions": [],
+ "implications": [],
}
- tag = tag_factory(names=['main_name', 'alias'], category=category)
- imp1 = tag_factory(names=['imp1_main_name', 'imp1_alias'])
- imp2 = tag_factory(names=['imp2_main_name', 'imp2_alias'])
- sug1 = tag_factory(names=['sug1_main_name', 'sug1_alias'])
- sug2 = tag_factory(names=['sug2_main_name', 'sug2_alias'])
+ tag = tag_factory(names=["main_name", "alias"], category=category)
+ imp1 = tag_factory(names=["imp1_main_name", "imp1_alias"])
+ imp2 = tag_factory(names=["imp2_main_name", "imp2_alias"])
+ sug1 = tag_factory(names=["sug1_main_name", "sug1_alias"])
+ sug2 = tag_factory(names=["sug2_main_name", "sug2_alias"])
db.session.add_all([imp1, imp2, sug1, sug2])
tag.implications = [imp1, imp2]
tag.suggestions = [sug1, sug2]
db.session.flush()
assert snapshots.get_tag_snapshot(tag) == {
- 'names': ['main_name', 'alias'],
- 'category': 'dummy',
- 'implications': ['imp1_main_name', 'imp2_main_name'],
- 'suggestions': ['sug1_main_name', 'sug2_main_name'],
+ "names": ["main_name", "alias"],
+ "category": "dummy",
+ "implications": ["imp1_main_name", "imp2_main_name"],
+ "suggestions": ["sug1_main_name", "sug2_main_name"],
}
def test_get_post_snapshot(post_factory, user_factory, tag_factory):
- user = user_factory(name='dummy-user')
- tag1 = tag_factory(names=['dummy-tag1'])
- tag2 = tag_factory(names=['dummy-tag2'])
+ user = user_factory(name="dummy-user")
+ tag1 = tag_factory(names=["dummy-tag1"])
+ tag2 = tag_factory(names=["dummy-tag2"])
post = post_factory(id=1)
related_post1 = post_factory(id=2)
related_post2 = post_factory(id=3)
@@ -72,13 +74,13 @@ def test_get_post_snapshot(post_factory, user_factory, tag_factory):
note = model.PostNote()
note.post = post
note.polygon = [(1, 1), (200, 1), (200, 200), (1, 200)]
- note.text = 'some text'
+ note.text = "some text"
db.session.add_all([score])
db.session.flush()
post.user = user
- post.checksum = 'deadbeef'
- post.source = 'example.com'
+ post.checksum = "deadbeef"
+ post.source = "example.com"
post.tags.append(tag1)
post.tags.append(tag2)
post.relations.append(related_post1)
@@ -89,17 +91,19 @@ def test_get_post_snapshot(post_factory, user_factory, tag_factory):
post.notes.append(note)
assert snapshots.get_post_snapshot(post) == {
- 'checksum': 'deadbeef',
- 'featured': True,
- 'flags': [],
- 'notes': [{
- 'polygon': [[1, 1], [200, 1], [200, 200], [1, 200]],
- 'text': 'some text',
- }],
- 'relations': [2, 3],
- 'safety': 'safe',
- 'source': 'example.com',
- 'tags': ['dummy-tag1', 'dummy-tag2'],
+ "checksum": "deadbeef",
+ "featured": True,
+ "flags": [],
+ "notes": [
+ {
+ "polygon": [[1, 1], [200, 1], [200, 200], [1, 200]],
+ "text": "some text",
+ }
+ ],
+ "relations": [2, 3],
+ "safety": "safe",
+ "source": "example.com",
+ "tags": ["dummy-tag1", "dummy-tag2"],
}
@@ -107,75 +111,78 @@ def test_serialize_snapshot(user_factory):
auth_user = user_factory()
snapshot = model.Snapshot()
snapshot.operation = snapshot.OPERATION_CREATED
- snapshot.resource_type = 'type'
- snapshot.resource_name = 'id'
- snapshot.user = user_factory(name='issuer')
- snapshot.data = {'complex': list('object')}
+ snapshot.resource_type = "type"
+ snapshot.resource_name = "id"
+ snapshot.user = user_factory(name="issuer")
+ snapshot.data = {"complex": list("object")}
snapshot.creation_time = datetime(1997, 1, 1)
- with patch('szurubooru.func.users.serialize_micro_user'):
- users.serialize_micro_user.return_value = 'mocked'
+ with patch("szurubooru.func.users.serialize_micro_user"):
+ users.serialize_micro_user.return_value = "mocked"
assert snapshots.serialize_snapshot(snapshot, auth_user) == {
- 'operation': 'created',
- 'type': 'type',
- 'id': 'id',
- 'user': 'mocked',
- 'data': {'complex': list('object')},
- 'time': datetime(1997, 1, 1),
+ "operation": "created",
+ "type": "type",
+ "id": "id",
+ "user": "mocked",
+ "data": {"complex": list("object")},
+ "time": datetime(1997, 1, 1),
}
def test_create(tag_factory, user_factory):
- tag = tag_factory(names=['dummy'])
+ tag = tag_factory(names=["dummy"])
db.session.add(tag)
db.session.flush()
- with patch('szurubooru.func.snapshots.get_tag_snapshot'):
- snapshots.get_tag_snapshot.return_value = 'mocked'
+ with patch("szurubooru.func.snapshots.get_tag_snapshot"):
+ snapshots.get_tag_snapshot.return_value = "mocked"
snapshots.create(tag, user_factory())
db.session.flush()
results = db.session.query(model.Snapshot).all()
assert len(results) == 1
assert results[0].operation == model.Snapshot.OPERATION_CREATED
- assert results[0].data == 'mocked'
+ assert results[0].data == "mocked"
def test_modify_saves_non_empty_diffs(post_factory, user_factory):
- if 'sqlite' in db.session.get_bind().driver:
+ if "sqlite" in db.session.get_bind().driver:
pytest.xfail(
- 'SQLite doesn\'t support transaction isolation, '
- 'which is required to retrieve original entity')
+ "SQLite doesn't support transaction isolation, "
+ "which is required to retrieve original entity"
+ )
post = post_factory()
- post.notes = [model.PostNote(polygon=[(0, 0), (0, 1), (1, 1)], text='old')]
+ post.notes = [model.PostNote(polygon=[(0, 0), (0, 1), (1, 1)], text="old")]
user = user_factory()
db.session.add_all([post, user])
db.session.commit()
- post.source = 'new source'
- post.notes = [model.PostNote(polygon=[(0, 0), (0, 1), (1, 1)], text='new')]
+ post.source = "new source"
+ post.notes = [model.PostNote(polygon=[(0, 0), (0, 1), (1, 1)], text="new")]
db.session.flush()
snapshots.modify(post, user)
db.session.flush()
results = db.session.query(model.Snapshot).all()
assert len(results) == 1
assert results[0].data == {
- 'type': 'object change',
- 'value': {
- 'source': {
- 'type': 'primitive change',
- 'old-value': None,
- 'new-value': 'new source',
+ "type": "object change",
+ "value": {
+ "source": {
+ "type": "primitive change",
+ "old-value": None,
+ "new-value": "new source",
},
- 'notes': {
- 'type': 'list change',
- 'removed': [
- {'polygon': [[0, 0], [0, 1], [1, 1]], 'text': 'old'}],
- 'added': [
- {'polygon': [[0, 0], [0, 1], [1, 1]], 'text': 'new'}],
+ "notes": {
+ "type": "list change",
+ "removed": [
+ {"polygon": [[0, 0], [0, 1], [1, 1]], "text": "old"}
+ ],
+ "added": [
+ {"polygon": [[0, 0], [0, 1], [1, 1]], "text": "new"}
+ ],
},
},
}
def test_modify_doesnt_save_empty_diffs(tag_factory, user_factory):
- tag = tag_factory(names=['dummy'])
+ tag = tag_factory(names=["dummy"])
user = user_factory()
db.session.add_all([tag, user])
db.session.commit()
@@ -185,26 +192,26 @@ def test_modify_doesnt_save_empty_diffs(tag_factory, user_factory):
def test_delete(tag_factory, user_factory):
- tag = tag_factory(names=['dummy'])
+ tag = tag_factory(names=["dummy"])
db.session.add(tag)
db.session.flush()
- with patch('szurubooru.func.snapshots.get_tag_snapshot'):
- snapshots.get_tag_snapshot.return_value = 'mocked'
+ with patch("szurubooru.func.snapshots.get_tag_snapshot"):
+ snapshots.get_tag_snapshot.return_value = "mocked"
snapshots.delete(tag, user_factory())
db.session.flush()
results = db.session.query(model.Snapshot).all()
assert len(results) == 1
assert results[0].operation == model.Snapshot.OPERATION_DELETED
- assert results[0].data == 'mocked'
+ assert results[0].data == "mocked"
def test_merge(tag_factory, user_factory):
- source_tag = tag_factory(names=['source'])
- target_tag = tag_factory(names=['target'])
+ source_tag = tag_factory(names=["source"])
+ target_tag = tag_factory(names=["target"])
db.session.add_all([source_tag, target_tag])
db.session.flush()
snapshots.merge(source_tag, target_tag, user_factory())
db.session.flush()
result = db.session.query(model.Snapshot).one()
assert result.operation == model.Snapshot.OPERATION_MERGED
- assert result.data == ['tag', 'target']
+ assert result.data == ["tag", "target"]
diff --git a/server/szurubooru/tests/func/test_tag_categories.py b/server/szurubooru/tests/func/test_tag_categories.py
index d886703..143cc49 100644
--- a/server/szurubooru/tests/func/test_tag_categories.py
+++ b/server/szurubooru/tests/func/test_tag_categories.py
@@ -1,7 +1,9 @@
from unittest.mock import patch
+
import pytest
+
from szurubooru import db, model
-from szurubooru.func import tag_categories, cache
+from szurubooru.func import cache, tag_categories
@pytest.fixture(autouse=True)
@@ -14,7 +16,7 @@ def test_serialize_category_when_empty():
def test_serialize_category(tag_category_factory, tag_factory):
- category = tag_category_factory(name='name', color='color')
+ category = tag_category_factory(name="name", color="color")
category.category_id = 1
category.default = True
tag1 = tag_factory(category=category)
@@ -23,36 +25,42 @@ def test_serialize_category(tag_category_factory, tag_factory):
db.session.flush()
result = tag_categories.serialize_category(category)
assert result == {
- 'name': 'name',
- 'color': 'color',
- 'default': True,
- 'version': 1,
- 'usages': 2,
+ "name": "name",
+ "color": "color",
+ "default": True,
+ "version": 1,
+ "usages": 2,
}
def test_create_category_when_first():
- with patch('szurubooru.func.tag_categories.update_category_name'), \
- patch('szurubooru.func.tag_categories.update_category_color'):
- category = tag_categories.create_category('name', 'color')
+ with patch("szurubooru.func.tag_categories.update_category_name"), patch(
+ "szurubooru.func.tag_categories.update_category_color"
+ ):
+ category = tag_categories.create_category("name", "color")
assert category.default
- tag_categories.update_category_name \
- .assert_called_once_with(category, 'name')
- tag_categories.update_category_color \
- .assert_called_once_with(category, 'color')
+ tag_categories.update_category_name.assert_called_once_with(
+ category, "name"
+ )
+ tag_categories.update_category_color.assert_called_once_with(
+ category, "color"
+ )
def test_create_category_when_subsequent(tag_category_factory):
db.session.add(tag_category_factory())
db.session.flush()
- with patch('szurubooru.func.tag_categories.update_category_name'), \
- patch('szurubooru.func.tag_categories.update_category_color'):
- category = tag_categories.create_category('name', 'color')
+ with patch("szurubooru.func.tag_categories.update_category_name"), patch(
+ "szurubooru.func.tag_categories.update_category_color"
+ ):
+ category = tag_categories.create_category("name", "color")
assert not category.default
- tag_categories.update_category_name \
- .assert_called_once_with(category, 'name')
- tag_categories.update_category_color \
- .assert_called_once_with(category, 'color')
+ tag_categories.update_category_name.assert_called_once_with(
+ category, "name"
+ )
+ tag_categories.update_category_color.assert_called_once_with(
+ category, "color"
+ )
def test_update_category_name_with_empty_string(tag_category_factory):
@@ -62,38 +70,42 @@ def test_update_category_name_with_empty_string(tag_category_factory):
def test_update_category_name_with_invalid_name(
- config_injector, tag_category_factory):
- config_injector({'tag_category_name_regex': '^[a-z]+$'})
+ config_injector, tag_category_factory
+):
+ config_injector({"tag_category_name_regex": "^[a-z]+$"})
category = tag_category_factory()
with pytest.raises(tag_categories.InvalidTagCategoryNameError):
- tag_categories.update_category_name(category, '0')
+ tag_categories.update_category_name(category, "0")
def test_update_category_name_with_too_long_string(
- config_injector, tag_category_factory):
- config_injector({'tag_category_name_regex': '^[a-z]+$'})
+ config_injector, tag_category_factory
+):
+ config_injector({"tag_category_name_regex": "^[a-z]+$"})
category = tag_category_factory()
with pytest.raises(tag_categories.InvalidTagCategoryNameError):
- tag_categories.update_category_name(category, 'a' * 3000)
+ tag_categories.update_category_name(category, "a" * 3000)
def test_update_category_name_reusing_other_name(
- config_injector, tag_category_factory):
- config_injector({'tag_category_name_regex': '.*'})
- db.session.add(tag_category_factory(name='name'))
+ config_injector, tag_category_factory
+):
+ config_injector({"tag_category_name_regex": ".*"})
+ db.session.add(tag_category_factory(name="name"))
db.session.flush()
category = tag_category_factory()
with pytest.raises(tag_categories.TagCategoryAlreadyExistsError):
- tag_categories.update_category_name(category, 'name')
+ tag_categories.update_category_name(category, "name")
with pytest.raises(tag_categories.TagCategoryAlreadyExistsError):
- tag_categories.update_category_name(category, 'NAME')
+ tag_categories.update_category_name(category, "NAME")
def test_update_category_name_reusing_own_name(
- config_injector, tag_category_factory):
- config_injector({'tag_category_name_regex': '.*'})
- for name in ['name', 'NAME']:
- category = tag_category_factory(name='name')
+ config_injector, tag_category_factory
+):
+ config_injector({"tag_category_name_regex": ".*"})
+ for name in ["name", "NAME"]:
+ category = tag_category_factory(name="name")
db.session.add(category)
db.session.flush()
tag_categories.update_category_name(category, name)
@@ -110,16 +122,16 @@ def test_update_category_color_with_empty_string(tag_category_factory):
def test_update_category_color_with_too_long_string(tag_category_factory):
category = tag_category_factory()
with pytest.raises(tag_categories.InvalidTagCategoryColorError):
- tag_categories.update_category_color(category, 'a' * 3000)
+ tag_categories.update_category_color(category, "a" * 3000)
def test_update_category_color_with_invalid_string(tag_category_factory):
category = tag_category_factory()
with pytest.raises(tag_categories.InvalidTagCategoryColorError):
- tag_categories.update_category_color(category, 'NOPE')
+ tag_categories.update_category_color(category, "NOPE")
-@pytest.mark.parametrize('attempt', ['#aaaaaa', '#012345', '012345', 'red'])
+@pytest.mark.parametrize("attempt", ["#aaaaaa", "#012345", "012345", "red"])
def test_update_category_color(attempt, tag_category_factory):
category = tag_category_factory()
tag_categories.update_category_color(category, attempt)
@@ -127,35 +139,35 @@ def test_update_category_color(attempt, tag_category_factory):
def test_try_get_category_by_name(tag_category_factory):
- category = tag_category_factory(name='test')
+ category = tag_category_factory(name="test")
db.session.add(category)
db.session.flush()
- assert tag_categories.try_get_category_by_name('test') == category
- assert tag_categories.try_get_category_by_name('TEST') == category
- assert tag_categories.try_get_category_by_name('-') is None
+ assert tag_categories.try_get_category_by_name("test") == category
+ assert tag_categories.try_get_category_by_name("TEST") == category
+ assert tag_categories.try_get_category_by_name("-") is None
def test_get_category_by_name(tag_category_factory):
- category = tag_category_factory(name='test')
+ category = tag_category_factory(name="test")
db.session.add(category)
db.session.flush()
- assert tag_categories.get_category_by_name('test') == category
- assert tag_categories.get_category_by_name('TEST') == category
+ assert tag_categories.get_category_by_name("test") == category
+ assert tag_categories.get_category_by_name("TEST") == category
with pytest.raises(tag_categories.TagCategoryNotFoundError):
- tag_categories.get_category_by_name('-')
+ tag_categories.get_category_by_name("-")
def test_get_all_category_names(tag_category_factory):
- category1 = tag_category_factory(name='cat1')
- category2 = tag_category_factory(name='cat2')
+ category1 = tag_category_factory(name="cat1")
+ category2 = tag_category_factory(name="cat2")
db.session.add_all([category2, category1])
db.session.flush()
- assert tag_categories.get_all_category_names() == ['cat1', 'cat2']
+ assert tag_categories.get_all_category_names() == ["cat1", "cat2"]
def test_get_all_categories(tag_category_factory):
- category1 = tag_category_factory(name='cat1')
- category2 = tag_category_factory(name='cat2')
+ category1 = tag_category_factory(name="cat1")
+ category2 = tag_category_factory(name="cat2")
db.session.add_all([category2, category1])
db.session.flush()
assert tag_categories.get_all_categories() == [category1, category2]
@@ -211,12 +223,12 @@ def test_get_default_category_name_caching(tag_category_factory):
def test_get_default_category():
- with patch('szurubooru.func.tag_categories.try_get_default_category'):
+ with patch("szurubooru.func.tag_categories.try_get_default_category"):
tag_categories.try_get_default_category.return_value = None
with pytest.raises(tag_categories.TagCategoryNotFoundError):
tag_categories.get_default_category()
- tag_categories.try_get_default_category.return_value = 'mocked'
- assert tag_categories.get_default_category() == 'mocked'
+ tag_categories.try_get_default_category.return_value = "mocked"
+ assert tag_categories.get_default_category() == "mocked"
def test_set_default_category_with_previous_default(tag_category_factory):
@@ -257,9 +269,9 @@ def test_delete_category_with_usages(tag_category_factory, tag_factory):
def test_delete_category(tag_category_factory):
db.session.add(tag_category_factory())
- category = tag_category_factory(name='target')
+ category = tag_category_factory(name="target")
db.session.add(category)
db.session.flush()
tag_categories.delete_category(category)
db.session.flush()
- assert tag_categories.try_get_category_by_name('target') is None
+ assert tag_categories.try_get_category_by_name("target") is None
diff --git a/server/szurubooru/tests/func/test_tags.py b/server/szurubooru/tests/func/test_tags.py
index 673e37f..ac8963c 100644
--- a/server/szurubooru/tests/func/test_tags.py
+++ b/server/szurubooru/tests/func/test_tags.py
@@ -1,10 +1,12 @@
-import os
import json
-from unittest.mock import patch
+import os
from datetime import datetime
+from unittest.mock import patch
+
import pytest
+
from szurubooru import db, model
-from szurubooru.func import tags, tag_categories, cache
+from szurubooru.func import cache, tag_categories, tags
@pytest.fixture(autouse=True)
@@ -14,18 +16,35 @@ def purge_cache():
def _assert_tag_siblings(result, expected_names_and_occurrences):
actual_names_and_occurences = [
- (tag.names[0].name, occurrences) for tag, occurrences in result]
+ (tag.names[0].name, occurrences) for tag, occurrences in result
+ ]
assert actual_names_and_occurences == expected_names_and_occurrences
-@pytest.mark.parametrize('input,expected_tag_names', [
- ([('a', 'a', True), ('b', 'b', False), ('c', 'c', False)], list('bca')),
- ([('c', 'a', True), ('b', 'b', False), ('a', 'c', False)], list('bac')),
- ([('a', 'c', True), ('b', 'b', False), ('c', 'a', False)], list('cba')),
- ([('a', 'c', False), ('b', 'b', False), ('c', 'a', True)], list('bac')),
-])
+@pytest.mark.parametrize(
+ "input,expected_tag_names",
+ [
+ (
+ [("a", "a", True), ("b", "b", False), ("c", "c", False)],
+ list("bca"),
+ ),
+ (
+ [("c", "a", True), ("b", "b", False), ("a", "c", False)],
+ list("bac"),
+ ),
+ (
+ [("a", "c", True), ("b", "b", False), ("c", "a", False)],
+ list("cba"),
+ ),
+ (
+ [("a", "c", False), ("b", "b", False), ("c", "a", True)],
+ list("bac"),
+ ),
+ ],
+)
def test_sort_tags(
- input, expected_tag_names, tag_factory, tag_category_factory):
+ input, expected_tag_names, tag_factory, tag_category_factory
+):
db_tags = []
for tag in input:
tag_name, category_name, category_is_default = tag
@@ -33,7 +52,10 @@ def test_sort_tags(
tag_factory(
names=[tag_name],
category=tag_category_factory(
- name=category_name, default=category_is_default)))
+ name=category_name, default=category_is_default
+ ),
+ )
+ )
db.session.add_all(db_tags)
db.session.flush()
actual_tag_names = [tag.names[0].name for tag in tags.sort_tags(db_tags)]
@@ -45,17 +67,17 @@ def test_serialize_tag_when_empty():
def test_serialize_tag(post_factory, tag_factory, tag_category_factory):
- cat = tag_category_factory(name='cat')
- tag = tag_factory(names=['tag1', 'tag2'], category=cat)
+ cat = tag_category_factory(name="cat")
+ tag = tag_factory(names=["tag1", "tag2"], category=cat)
# tag.tag_id = 1
- tag.description = 'description'
+ tag.description = "description"
tag.suggestions = [
- tag_factory(names=['sug1'], category=cat),
- tag_factory(names=['sug2'], category=cat),
+ tag_factory(names=["sug1"], category=cat),
+ tag_factory(names=["sug2"], category=cat),
]
tag.implications = [
- tag_factory(names=['impl1'], category=cat),
- tag_factory(names=['impl2'], category=cat),
+ tag_factory(names=["impl1"], category=cat),
+ tag_factory(names=["impl2"], category=cat),
]
tag.last_edit_time = datetime(1998, 1, 1)
@@ -67,36 +89,39 @@ def test_serialize_tag(post_factory, tag_factory, tag_category_factory):
db.session.flush()
result = tags.serialize_tag(tag)
- result['suggestions'].sort(key=lambda relation: relation['names'][0])
- result['implications'].sort(key=lambda relation: relation['names'][0])
+ result["suggestions"].sort(key=lambda relation: relation["names"][0])
+ result["implications"].sort(key=lambda relation: relation["names"][0])
assert result == {
- 'names': ['tag1', 'tag2'],
- 'version': 1,
- 'category': 'cat',
- 'creationTime': datetime(1996, 1, 1, 0, 0),
- 'lastEditTime': datetime(1998, 1, 1, 0, 0),
- 'description': 'description',
- 'suggestions': [
- {'names': ['sug1'], 'category': 'cat', 'usages': 0},
- {'names': ['sug2'], 'category': 'cat', 'usages': 0},
+ "names": ["tag1", "tag2"],
+ "version": 1,
+ "category": "cat",
+ "creationTime": datetime(1996, 1, 1, 0, 0),
+ "lastEditTime": datetime(1998, 1, 1, 0, 0),
+ "description": "description",
+ "suggestions": [
+ {"names": ["sug1"], "category": "cat", "usages": 0},
+ {"names": ["sug2"], "category": "cat", "usages": 0},
],
- 'implications': [
- {'names': ['impl1'], 'category': 'cat', 'usages': 0},
- {'names': ['impl2'], 'category': 'cat', 'usages': 0},
+ "implications": [
+ {"names": ["impl1"], "category": "cat", "usages": 0},
+ {"names": ["impl2"], "category": "cat", "usages": 0},
],
- 'usages': 2,
+ "usages": 2,
}
-@pytest.mark.parametrize('name_to_search,expected_to_find', [
- ('name', True),
- ('NAME', True),
- ('alias', True),
- ('ALIAS', True),
- ('-', False),
-])
+@pytest.mark.parametrize(
+ "name_to_search,expected_to_find",
+ [
+ ("name", True),
+ ("NAME", True),
+ ("alias", True),
+ ("ALIAS", True),
+ ("-", False),
+ ],
+)
def test_try_get_tag_by_name(name_to_search, expected_to_find, tag_factory):
- tag = tag_factory(names=['name', 'ALIAS'])
+ tag = tag_factory(names=["name", "ALIAS"])
db.session.add(tag)
db.session.flush()
if expected_to_find:
@@ -105,15 +130,18 @@ def test_try_get_tag_by_name(name_to_search, expected_to_find, tag_factory):
assert tags.try_get_tag_by_name(name_to_search) is None
-@pytest.mark.parametrize('name_to_search,expected_to_find', [
- ('name', True),
- ('NAME', True),
- ('alias', True),
- ('ALIAS', True),
- ('-', False),
-])
+@pytest.mark.parametrize(
+ "name_to_search,expected_to_find",
+ [
+ ("name", True),
+ ("NAME", True),
+ ("alias", True),
+ ("ALIAS", True),
+ ("-", False),
+ ],
+)
def test_get_tag_by_name(name_to_search, expected_to_find, tag_factory):
- tag = tag_factory(names=['name', 'ALIAS'])
+ tag = tag_factory(names=["name", "ALIAS"])
db.session.add(tag)
db.session.flush()
if expected_to_find:
@@ -123,25 +151,28 @@ def test_get_tag_by_name(name_to_search, expected_to_find, tag_factory):
tags.get_tag_by_name(name_to_search)
-@pytest.mark.parametrize('names,expected_indexes', [
- ([], []),
- (['name1'], [0]),
- (['NAME1'], [0]),
- (['alias1'], [0]),
- (['ALIAS1'], [0]),
- (['name2'], [1]),
- (['name1', 'name1'], [0]),
- (['name1', 'NAME1'], [0]),
- (['name1', 'alias1'], [0]),
- (['name1', 'alias2'], [0, 1]),
- (['NAME1', 'alias2'], [0, 1]),
- (['name1', 'ALIAS2'], [0, 1]),
- (['name2', 'alias1'], [0, 1]),
-])
+@pytest.mark.parametrize(
+ "names,expected_indexes",
+ [
+ ([], []),
+ (["name1"], [0]),
+ (["NAME1"], [0]),
+ (["alias1"], [0]),
+ (["ALIAS1"], [0]),
+ (["name2"], [1]),
+ (["name1", "name1"], [0]),
+ (["name1", "NAME1"], [0]),
+ (["name1", "alias1"], [0]),
+ (["name1", "alias2"], [0, 1]),
+ (["NAME1", "alias2"], [0, 1]),
+ (["name1", "ALIAS2"], [0, 1]),
+ (["name2", "alias1"], [0, 1]),
+ ],
+)
def test_get_tag_by_names(names, expected_indexes, tag_factory):
input_tags = [
- tag_factory(names=['name1', 'ALIAS1']),
- tag_factory(names=['name2', 'ALIAS2']),
+ tag_factory(names=["name1", "ALIAS1"]),
+ tag_factory(names=["name2", "ALIAS2"]),
]
db.session.add_all(input_tags)
db.session.flush()
@@ -151,49 +182,52 @@ def test_get_tag_by_names(names, expected_indexes, tag_factory):
@pytest.mark.parametrize(
- 'names,expected_indexes,expected_created_names', [
+ "names,expected_indexes,expected_created_names",
+ [
([], [], []),
- (['name1'], [0], []),
- (['NAME1'], [0], []),
- (['alias1'], [0], []),
- (['ALIAS1'], [0], []),
- (['name2'], [1], []),
- (['name1', 'name1'], [0], []),
- (['name1', 'NAME1'], [0], []),
- (['name1', 'alias1'], [0], []),
- (['name1', 'alias2'], [0, 1], []),
- (['NAME1', 'alias2'], [0, 1], []),
- (['name1', 'ALIAS2'], [0, 1], []),
- (['name2', 'alias1'], [0, 1], []),
- (['new'], [], ['new']),
- (['new', 'name1'], [0], ['new']),
- (['new', 'NAME1'], [0], ['new']),
- (['new', 'alias1'], [0], ['new']),
- (['new', 'ALIAS1'], [0], ['new']),
- (['new', 'name2'], [1], ['new']),
- (['new', 'name1', 'name1'], [0], ['new']),
- (['new', 'name1', 'NAME1'], [0], ['new']),
- (['new', 'name1', 'alias1'], [0], ['new']),
- (['new', 'name1', 'alias2'], [0, 1], ['new']),
- (['new', 'NAME1', 'alias2'], [0, 1], ['new']),
- (['new', 'name1', 'ALIAS2'], [0, 1], ['new']),
- (['new', 'name2', 'alias1'], [0, 1], ['new']),
- (['new', 'new'], [], ['new']),
- (['new', 'NEW'], [], ['new']),
- (['new', 'new2'], [], ['new', 'new2']),
- ])
+ (["name1"], [0], []),
+ (["NAME1"], [0], []),
+ (["alias1"], [0], []),
+ (["ALIAS1"], [0], []),
+ (["name2"], [1], []),
+ (["name1", "name1"], [0], []),
+ (["name1", "NAME1"], [0], []),
+ (["name1", "alias1"], [0], []),
+ (["name1", "alias2"], [0, 1], []),
+ (["NAME1", "alias2"], [0, 1], []),
+ (["name1", "ALIAS2"], [0, 1], []),
+ (["name2", "alias1"], [0, 1], []),
+ (["new"], [], ["new"]),
+ (["new", "name1"], [0], ["new"]),
+ (["new", "NAME1"], [0], ["new"]),
+ (["new", "alias1"], [0], ["new"]),
+ (["new", "ALIAS1"], [0], ["new"]),
+ (["new", "name2"], [1], ["new"]),
+ (["new", "name1", "name1"], [0], ["new"]),
+ (["new", "name1", "NAME1"], [0], ["new"]),
+ (["new", "name1", "alias1"], [0], ["new"]),
+ (["new", "name1", "alias2"], [0, 1], ["new"]),
+ (["new", "NAME1", "alias2"], [0, 1], ["new"]),
+ (["new", "name1", "ALIAS2"], [0, 1], ["new"]),
+ (["new", "name2", "alias1"], [0, 1], ["new"]),
+ (["new", "new"], [], ["new"]),
+ (["new", "NEW"], [], ["new"]),
+ (["new", "new2"], [], ["new", "new2"]),
+ ],
+)
def test_get_or_create_tags_by_names(
- names,
- expected_indexes,
- expected_created_names,
- tag_factory,
- tag_category_factory,
- config_injector):
- config_injector({'tag_name_regex': '.*'})
+ names,
+ expected_indexes,
+ expected_created_names,
+ tag_factory,
+ tag_category_factory,
+ config_injector,
+):
+ config_injector({"tag_name_regex": ".*"})
category = tag_category_factory()
input_tags = [
- tag_factory(names=['name1', 'ALIAS1'], category=category),
- tag_factory(names=['name2', 'ALIAS2'], category=category),
+ tag_factory(names=["name1", "ALIAS1"], category=category),
+ tag_factory(names=["name2", "ALIAS2"], category=category),
]
db.session.add_all(input_tags)
db.session.flush()
@@ -206,14 +240,14 @@ def test_get_or_create_tags_by_names(
def test_get_tag_siblings_for_unused(tag_factory):
- tag = tag_factory(names=['tag'])
+ tag = tag_factory(names=["tag"])
db.session.add(tag)
db.session.flush()
_assert_tag_siblings(tags.get_tag_siblings(tag), [])
def test_get_tag_siblings_for_used_alone(tag_factory, post_factory):
- tag = tag_factory(names=['tag'])
+ tag = tag_factory(names=["tag"])
post = post_factory()
post.tags = [tag]
db.session.add_all([post, tag])
@@ -222,20 +256,20 @@ def test_get_tag_siblings_for_used_alone(tag_factory, post_factory):
def test_get_tag_siblings_for_used_with_others(tag_factory, post_factory):
- tag1 = tag_factory(names=['t1'])
- tag2 = tag_factory(names=['t2'])
+ tag1 = tag_factory(names=["t1"])
+ tag2 = tag_factory(names=["t2"])
post = post_factory()
post.tags = [tag1, tag2]
db.session.add_all([post, tag1, tag2])
db.session.flush()
- _assert_tag_siblings(tags.get_tag_siblings(tag1), [('t2', 1)])
- _assert_tag_siblings(tags.get_tag_siblings(tag2), [('t1', 1)])
+ _assert_tag_siblings(tags.get_tag_siblings(tag1), [("t2", 1)])
+ _assert_tag_siblings(tags.get_tag_siblings(tag2), [("t1", 1)])
def test_get_tag_siblings_used_for_multiple_others(tag_factory, post_factory):
- tag1 = tag_factory(names=['t1'])
- tag2 = tag_factory(names=['t2'])
- tag3 = tag_factory(names=['t3'])
+ tag1 = tag_factory(names=["t1"])
+ tag2 = tag_factory(names=["t2"])
+ tag3 = tag_factory(names=["t3"])
post1 = post_factory()
post2 = post_factory()
post3 = post_factory()
@@ -246,16 +280,16 @@ def test_get_tag_siblings_used_for_multiple_others(tag_factory, post_factory):
post4.tags = [tag2]
db.session.add_all([post1, post2, post3, post4, tag1, tag2, tag3])
db.session.flush()
- _assert_tag_siblings(tags.get_tag_siblings(tag1), [('t3', 2), ('t2', 1)])
- _assert_tag_siblings(tags.get_tag_siblings(tag2), [('t1', 1), ('t3', 1)])
+ _assert_tag_siblings(tags.get_tag_siblings(tag1), [("t3", 2), ("t2", 1)])
+ _assert_tag_siblings(tags.get_tag_siblings(tag2), [("t1", 1), ("t3", 1)])
# even though tag2 is used more widely, tag1 is more relevant to tag3
- _assert_tag_siblings(tags.get_tag_siblings(tag3), [('t1', 2), ('t2', 1)])
+ _assert_tag_siblings(tags.get_tag_siblings(tag3), [("t1", 2), ("t2", 1)])
def test_delete(tag_factory):
- tag = tag_factory(names=['tag'])
- tag.suggestions = [tag_factory(names=['sug'])]
- tag.implications = [tag_factory(names=['imp'])]
+ tag = tag_factory(names=["tag"])
+ tag.suggestions = [tag_factory(names=["sug"])]
+ tag.implications = [tag_factory(names=["imp"])]
db.session.add(tag)
db.session.flush()
assert db.session.query(model.Tag).count() == 3
@@ -265,19 +299,19 @@ def test_delete(tag_factory):
def test_merge_tags_deletes_source_tag(tag_factory):
- source_tag = tag_factory(names=['source'])
- target_tag = tag_factory(names=['target'])
+ source_tag = tag_factory(names=["source"])
+ target_tag = tag_factory(names=["target"])
db.session.add_all([source_tag, target_tag])
db.session.flush()
tags.merge_tags(source_tag, target_tag)
db.session.flush()
- assert tags.try_get_tag_by_name('source') is None
- tag = tags.get_tag_by_name('target')
+ assert tags.try_get_tag_by_name("source") is None
+ tag = tags.get_tag_by_name("target")
assert tag is not None
def test_merge_tags_with_itself(tag_factory):
- source_tag = tag_factory(names=['source'])
+ source_tag = tag_factory(names=["source"])
db.session.add(source_tag)
db.session.flush()
with pytest.raises(tags.InvalidTagRelationError):
@@ -285,8 +319,8 @@ def test_merge_tags_with_itself(tag_factory):
def test_merge_tags_moves_usages(tag_factory, post_factory):
- source_tag = tag_factory(names=['source'])
- target_tag = tag_factory(names=['target'])
+ source_tag = tag_factory(names=["source"])
+ target_tag = tag_factory(names=["target"])
post = post_factory()
post.tags = [source_tag]
db.session.add_all([source_tag, target_tag, post])
@@ -295,13 +329,13 @@ def test_merge_tags_moves_usages(tag_factory, post_factory):
assert target_tag.post_count == 0
tags.merge_tags(source_tag, target_tag)
db.session.commit()
- assert tags.try_get_tag_by_name('source') is None
- assert tags.get_tag_by_name('target').post_count == 1
+ assert tags.try_get_tag_by_name("source") is None
+ assert tags.get_tag_by_name("target").post_count == 1
def test_merge_tags_doesnt_duplicate_usages(tag_factory, post_factory):
- source_tag = tag_factory(names=['source'])
- target_tag = tag_factory(names=['target'])
+ source_tag = tag_factory(names=["source"])
+ target_tag = tag_factory(names=["target"])
post = post_factory()
post.tags = [source_tag, target_tag]
db.session.add_all([source_tag, target_tag, post])
@@ -310,13 +344,13 @@ def test_merge_tags_doesnt_duplicate_usages(tag_factory, post_factory):
assert target_tag.post_count == 1
tags.merge_tags(source_tag, target_tag)
db.session.flush()
- assert tags.try_get_tag_by_name('source') is None
- assert tags.get_tag_by_name('target').post_count == 1
+ assert tags.try_get_tag_by_name("source") is None
+ assert tags.get_tag_by_name("target").post_count == 1
def test_merge_tags_moves_child_relations(tag_factory):
- source_tag = tag_factory(names=['source'])
- target_tag = tag_factory(names=['target'])
+ source_tag = tag_factory(names=["source"])
+ target_tag = tag_factory(names=["target"])
related_tag = tag_factory()
source_tag.suggestions = [related_tag]
source_tag.implications = [related_tag]
@@ -328,14 +362,14 @@ def test_merge_tags_moves_child_relations(tag_factory):
assert target_tag.implication_count == 0
tags.merge_tags(source_tag, target_tag)
db.session.commit()
- assert tags.try_get_tag_by_name('source') is None
- assert tags.get_tag_by_name('target').suggestion_count == 1
- assert tags.get_tag_by_name('target').implication_count == 1
+ assert tags.try_get_tag_by_name("source") is None
+ assert tags.get_tag_by_name("target").suggestion_count == 1
+ assert tags.get_tag_by_name("target").implication_count == 1
def test_merge_tags_doesnt_duplicate_child_relations(tag_factory):
- source_tag = tag_factory(names=['source'])
- target_tag = tag_factory(names=['target'])
+ source_tag = tag_factory(names=["source"])
+ target_tag = tag_factory(names=["target"])
related_tag = tag_factory()
source_tag.suggestions = [related_tag]
source_tag.implications = [related_tag]
@@ -349,15 +383,15 @@ def test_merge_tags_doesnt_duplicate_child_relations(tag_factory):
assert target_tag.implication_count == 1
tags.merge_tags(source_tag, target_tag)
db.session.commit()
- assert tags.try_get_tag_by_name('source') is None
- assert tags.get_tag_by_name('target').suggestion_count == 1
- assert tags.get_tag_by_name('target').implication_count == 1
+ assert tags.try_get_tag_by_name("source") is None
+ assert tags.get_tag_by_name("target").suggestion_count == 1
+ assert tags.get_tag_by_name("target").implication_count == 1
def test_merge_tags_moves_parent_relations(tag_factory):
- source_tag = tag_factory(names=['source'])
- target_tag = tag_factory(names=['target'])
- related_tag = tag_factory(names=['related'])
+ source_tag = tag_factory(names=["source"])
+ target_tag = tag_factory(names=["target"])
+ related_tag = tag_factory(names=["related"])
related_tag.suggestions = [related_tag]
related_tag.implications = [related_tag]
db.session.add_all([source_tag, target_tag, related_tag])
@@ -368,16 +402,16 @@ def test_merge_tags_moves_parent_relations(tag_factory):
assert target_tag.implication_count == 0
tags.merge_tags(source_tag, target_tag)
db.session.commit()
- assert tags.try_get_tag_by_name('source') is None
- assert tags.get_tag_by_name('related').suggestion_count == 1
- assert tags.get_tag_by_name('related').suggestion_count == 1
- assert tags.get_tag_by_name('target').suggestion_count == 0
- assert tags.get_tag_by_name('target').implication_count == 0
+ assert tags.try_get_tag_by_name("source") is None
+ assert tags.get_tag_by_name("related").suggestion_count == 1
+ assert tags.get_tag_by_name("related").suggestion_count == 1
+ assert tags.get_tag_by_name("target").suggestion_count == 0
+ assert tags.get_tag_by_name("target").implication_count == 0
def test_merge_tags_doesnt_create_relation_loop_for_children(tag_factory):
- source_tag = tag_factory(names=['source'])
- target_tag = tag_factory(names=['target'])
+ source_tag = tag_factory(names=["source"])
+ target_tag = tag_factory(names=["target"])
source_tag.suggestions = [target_tag]
source_tag.implications = [target_tag]
db.session.add_all([source_tag, target_tag])
@@ -388,14 +422,14 @@ def test_merge_tags_doesnt_create_relation_loop_for_children(tag_factory):
assert target_tag.implication_count == 0
tags.merge_tags(source_tag, target_tag)
db.session.commit()
- assert tags.try_get_tag_by_name('source') is None
- assert tags.get_tag_by_name('target').suggestion_count == 0
- assert tags.get_tag_by_name('target').implication_count == 0
+ assert tags.try_get_tag_by_name("source") is None
+ assert tags.get_tag_by_name("target").suggestion_count == 0
+ assert tags.get_tag_by_name("target").implication_count == 0
def test_merge_tags_doesnt_create_relation_loop_for_parents(tag_factory):
- source_tag = tag_factory(names=['source'])
- target_tag = tag_factory(names=['target'])
+ source_tag = tag_factory(names=["source"])
+ target_tag = tag_factory(names=["target"])
target_tag.suggestions = [source_tag]
target_tag.implications = [source_tag]
db.session.add_all([source_tag, target_tag])
@@ -406,33 +440,35 @@ def test_merge_tags_doesnt_create_relation_loop_for_parents(tag_factory):
assert target_tag.implication_count == 1
tags.merge_tags(source_tag, target_tag)
db.session.commit()
- assert tags.try_get_tag_by_name('source') is None
- assert tags.get_tag_by_name('target').suggestion_count == 0
- assert tags.get_tag_by_name('target').implication_count == 0
+ assert tags.try_get_tag_by_name("source") is None
+ assert tags.get_tag_by_name("target").suggestion_count == 0
+ assert tags.get_tag_by_name("target").implication_count == 0
def test_create_tag(fake_datetime):
- with patch('szurubooru.func.tags.update_tag_names'), \
- patch('szurubooru.func.tags.update_tag_category_name'), \
- patch('szurubooru.func.tags.update_tag_suggestions'), \
- patch('szurubooru.func.tags.update_tag_implications'), \
- fake_datetime('1997-01-01'):
- tag = tags.create_tag(['name'], 'cat', ['sug'], ['imp'])
+ with patch("szurubooru.func.tags.update_tag_names"), patch(
+ "szurubooru.func.tags.update_tag_category_name"
+ ), patch("szurubooru.func.tags.update_tag_suggestions"), patch(
+ "szurubooru.func.tags.update_tag_implications"
+ ), fake_datetime(
+ "1997-01-01"
+ ):
+ tag = tags.create_tag(["name"], "cat", ["sug"], ["imp"])
assert tag.creation_time == datetime(1997, 1, 1)
assert tag.last_edit_time is None
- tags.update_tag_names.assert_called_once_with(tag, ['name'])
- tags.update_tag_category_name.assert_called_once_with(tag, 'cat')
- tags.update_tag_suggestions.assert_called_once_with(tag, ['sug'])
- tags.update_tag_implications.assert_called_once_with(tag, ['imp'])
+ tags.update_tag_names.assert_called_once_with(tag, ["name"])
+ tags.update_tag_category_name.assert_called_once_with(tag, "cat")
+ tags.update_tag_suggestions.assert_called_once_with(tag, ["sug"])
+ tags.update_tag_implications.assert_called_once_with(tag, ["imp"])
def test_update_tag_category_name(tag_factory):
- with patch('szurubooru.func.tag_categories.get_category_by_name'):
- tag_categories.get_category_by_name.return_value = 'mocked'
+ with patch("szurubooru.func.tag_categories.get_category_by_name"):
+ tag_categories.get_category_by_name.return_value = "mocked"
tag = tag_factory()
- tags.update_tag_category_name(tag, 'cat')
- assert tag_categories.get_category_by_name.called_once_with('cat')
- assert tag.category == 'mocked'
+ tags.update_tag_category_name(tag, "cat")
+ assert tag_categories.get_category_by_name.called_once_with("cat")
+ assert tag.category == "mocked"
def test_update_tag_names_to_empty(tag_factory):
@@ -442,44 +478,45 @@ def test_update_tag_names_to_empty(tag_factory):
def test_update_tag_names_with_invalid_name(config_injector, tag_factory):
- config_injector({'tag_name_regex': '^[a-z]*$'})
+ config_injector({"tag_name_regex": "^[a-z]*$"})
tag = tag_factory()
with pytest.raises(tags.InvalidTagNameError):
- tags.update_tag_names(tag, ['0'])
+ tags.update_tag_names(tag, ["0"])
def test_update_tag_names_with_too_long_string(config_injector, tag_factory):
- config_injector({'tag_name_regex': '^[a-z]*$'})
+ config_injector({"tag_name_regex": "^[a-z]*$"})
tag = tag_factory()
with pytest.raises(tags.InvalidTagNameError):
- tags.update_tag_names(tag, ['a' * 300])
+ tags.update_tag_names(tag, ["a" * 300])
def test_update_tag_names_with_duplicate_names(config_injector, tag_factory):
- config_injector({'tag_name_regex': '^[a-z]*$'})
+ config_injector({"tag_name_regex": "^[a-z]*$"})
tag = tag_factory()
- tags.update_tag_names(tag, ['a', 'A'])
- assert [tag_name.name for tag_name in tag.names] == ['a']
+ tags.update_tag_names(tag, ["a", "A"])
+ assert [tag_name.name for tag_name in tag.names] == ["a"]
def test_update_tag_names_trying_to_use_taken_name(
- config_injector, tag_factory):
- config_injector({'tag_name_regex': '^[a-zA-Z]*$'})
- existing_tag = tag_factory(names=['a'])
+ config_injector, tag_factory
+):
+ config_injector({"tag_name_regex": "^[a-zA-Z]*$"})
+ existing_tag = tag_factory(names=["a"])
db.session.add(existing_tag)
tag = tag_factory()
db.session.add(tag)
db.session.flush()
with pytest.raises(tags.TagAlreadyExistsError):
- tags.update_tag_names(tag, ['a'])
+ tags.update_tag_names(tag, ["a"])
with pytest.raises(tags.TagAlreadyExistsError):
- tags.update_tag_names(tag, ['A'])
+ tags.update_tag_names(tag, ["A"])
def test_update_tag_names_reusing_own_name(config_injector, tag_factory):
- config_injector({'tag_name_regex': '^[a-zA-Z]*$'})
- for name in list('aA'):
- tag = tag_factory(names=['a'])
+ config_injector({"tag_name_regex": "^[a-zA-Z]*$"})
+ for name in list("aA"):
+ tag = tag_factory(names=["a"])
db.session.add(tag)
db.session.flush()
tags.update_tag_names(tag, [name])
@@ -488,48 +525,48 @@ def test_update_tag_names_reusing_own_name(config_injector, tag_factory):
def test_update_tag_names_changing_primary_name(config_injector, tag_factory):
- config_injector({'tag_name_regex': '^[a-zA-Z]*$'})
- tag = tag_factory(names=['a', 'b'])
+ config_injector({"tag_name_regex": "^[a-zA-Z]*$"})
+ tag = tag_factory(names=["a", "b"])
db.session.add(tag)
db.session.flush()
- tags.update_tag_names(tag, ['b', 'a'])
+ tags.update_tag_names(tag, ["b", "a"])
db.session.flush()
db.session.refresh(tag)
- assert [tag_name.name for tag_name in tag.names] == ['b', 'a']
+ assert [tag_name.name for tag_name in tag.names] == ["b", "a"]
db.session.rollback()
-@pytest.mark.parametrize('attempt', ['name', 'NAME', 'alias', 'ALIAS'])
+@pytest.mark.parametrize("attempt", ["name", "NAME", "alias", "ALIAS"])
def test_update_tag_suggestions_with_itself(attempt, tag_factory):
- tag = tag_factory(names=['name', 'ALIAS'])
+ tag = tag_factory(names=["name", "ALIAS"])
with pytest.raises(tags.InvalidTagRelationError):
tags.update_tag_suggestions(tag, [attempt])
def test_update_tag_suggestions(tag_factory):
- tag = tag_factory(names=['name', 'ALIAS'])
- with patch('szurubooru.func.tags.get_tags_by_names'):
- tags.get_tags_by_names.return_value = ['returned tags']
- tags.update_tag_suggestions(tag, ['test'])
- assert tag.suggestions == ['returned tags']
+ tag = tag_factory(names=["name", "ALIAS"])
+ with patch("szurubooru.func.tags.get_tags_by_names"):
+ tags.get_tags_by_names.return_value = ["returned tags"]
+ tags.update_tag_suggestions(tag, ["test"])
+ assert tag.suggestions == ["returned tags"]
-@pytest.mark.parametrize('attempt', ['name', 'NAME', 'alias', 'ALIAS'])
+@pytest.mark.parametrize("attempt", ["name", "NAME", "alias", "ALIAS"])
def test_update_tag_implications_with_itself(attempt, tag_factory):
- tag = tag_factory(names=['name', 'ALIAS'])
+ tag = tag_factory(names=["name", "ALIAS"])
with pytest.raises(tags.InvalidTagRelationError):
tags.update_tag_implications(tag, [attempt])
def test_update_tag_implications(tag_factory):
- tag = tag_factory(names=['name', 'ALIAS'])
- with patch('szurubooru.func.tags.get_tags_by_names'):
- tags.get_tags_by_names.return_value = ['returned tags']
- tags.update_tag_implications(tag, ['test'])
- assert tag.implications == ['returned tags']
+ tag = tag_factory(names=["name", "ALIAS"])
+ with patch("szurubooru.func.tags.get_tags_by_names"):
+ tags.get_tags_by_names.return_value = ["returned tags"]
+ tags.update_tag_implications(tag, ["test"])
+ assert tag.implications == ["returned tags"]
def test_update_tag_description(tag_factory):
tag = tag_factory()
- tags.update_tag_description(tag, 'test')
- assert tag.description == 'test'
+ tags.update_tag_description(tag, "test")
+ assert tag.description == "test"
diff --git a/server/szurubooru/tests/func/test_user_tokens.py b/server/szurubooru/tests/func/test_user_tokens.py
index 8c3577c..0422f4d 100644
--- a/server/szurubooru/tests/func/test_user_tokens.py
+++ b/server/szurubooru/tests/func/test_user_tokens.py
@@ -1,32 +1,35 @@
+import random
+import string
from datetime import datetime, timedelta
from unittest.mock import patch
+
import pytest
import pytz
-import random
-import string
+
from szurubooru import db, model
-from szurubooru.func import user_tokens, users, auth, util
+from szurubooru.func import auth, user_tokens, users, util
def test_serialize_user_token(user_token_factory):
user_token = user_token_factory()
db.session.add(user_token)
db.session.flush()
- with patch('szurubooru.func.users.get_avatar_url'):
- users.get_avatar_url.return_value = 'https://example.com/avatar.png'
+ with patch("szurubooru.func.users.get_avatar_url"):
+ users.get_avatar_url.return_value = "https://example.com/avatar.png"
result = user_tokens.serialize_user_token(user_token, user_token.user)
assert result == {
- 'creationTime': datetime(1997, 1, 1, 0, 0),
- 'enabled': True,
- 'expirationTime': None,
- 'lastEditTime': None,
- 'lastUsageTime': None,
- 'note': None,
- 'token': 'dummy',
- 'user': {
- 'avatarUrl': 'https://example.com/avatar.png',
- 'name': user_token.user.name},
- 'version': 1
+ "creationTime": datetime(1997, 1, 1, 0, 0),
+ "enabled": True,
+ "expirationTime": None,
+ "lastEditTime": None,
+ "lastUsageTime": None,
+ "note": None,
+ "token": "dummy",
+ "user": {
+ "avatarUrl": "https://example.com/avatar.png",
+ "name": user_token.user.name,
+ },
+ "version": 1,
}
@@ -41,7 +44,8 @@ def test_get_by_user_and_token(user_token_factory):
db.session.flush()
db.session.commit()
result = user_tokens.get_by_user_and_token(
- user_token.user, user_token.token)
+ user_token.user, user_token.token
+ )
assert result == user_token
@@ -61,10 +65,10 @@ def test_create_user_token(user_factory):
db.session.add(user)
db.session.flush()
db.session.commit()
- with patch('szurubooru.func.auth.generate_authorization_token'):
- auth.generate_authorization_token.return_value = 'test'
+ with patch("szurubooru.func.auth.generate_authorization_token"):
+ auth.generate_authorization_token.return_value = "test"
result = user_tokens.create_user_token(user, True)
- assert result.token == 'test'
+ assert result.token == "test"
assert result.user == user
@@ -85,8 +89,8 @@ def test_update_user_token_edit_time(user_token_factory):
def test_update_user_token_note(user_token_factory):
user_token = user_token_factory()
assert user_token.note is None
- user_tokens.update_user_token_note(user_token, ' Test Note ')
- assert user_token.note == 'Test Note'
+ user_tokens.update_user_token_note(user_token, " Test Note ")
+ assert user_token.note == "Test Note"
assert user_token.last_edit_time is not None
@@ -94,8 +98,9 @@ def test_update_user_token_note_input_too_long(user_token_factory):
user_token = user_token_factory()
assert user_token.note is None
note_max_length = util.get_column_size(model.UserToken.note) + 1
- note = ''.join(
- random.choice(string.ascii_letters) for _ in range(note_max_length))
+ note = "".join(
+ random.choice(string.ascii_letters) for _ in range(note_max_length)
+ )
with pytest.raises(user_tokens.InvalidNoteError):
user_tokens.update_user_token_note(user_token, note)
@@ -104,11 +109,11 @@ def test_update_user_token_expiration_time(user_token_factory):
user_token = user_token_factory()
assert user_token.expiration_time is None
expiration_time_str = (
- (datetime.utcnow() + timedelta(days=1))
- .replace(tzinfo=pytz.utc)
+ (datetime.utcnow() + timedelta(days=1)).replace(tzinfo=pytz.utc)
).isoformat()
user_tokens.update_user_token_expiration_time(
- user_token, expiration_time_str)
+ user_token, expiration_time_str
+ )
assert user_token.expiration_time.isoformat() == expiration_time_str
assert user_token.last_edit_time is not None
@@ -117,39 +122,45 @@ def test_update_user_token_expiration_time_in_past(user_token_factory):
user_token = user_token_factory()
assert user_token.expiration_time is None
expiration_time_str = (
- (datetime.utcnow() - timedelta(days=1))
- .replace(tzinfo=pytz.utc)
+ (datetime.utcnow() - timedelta(days=1)).replace(tzinfo=pytz.utc)
).isoformat()
with pytest.raises(
- user_tokens.InvalidExpirationError,
- match='Expiration cannot happen in the past'):
+ user_tokens.InvalidExpirationError,
+ match="Expiration cannot happen in the past",
+ ):
user_tokens.update_user_token_expiration_time(
- user_token, expiration_time_str)
-
-
-@pytest.mark.parametrize('expiration_time_str', [
- datetime.utcnow().isoformat(),
- (datetime.utcnow() - timedelta(days=1)).ctime(),
- '1970/01/01 00:00:01.0000Z',
- '70/01/01 00:00:01.0000Z',
- ''.join(random.choice(string.ascii_letters) for _ in range(15)),
- ''.join(random.choice(string.digits) for _ in range(8))
-])
+ user_token, expiration_time_str
+ )
+
+
+@pytest.mark.parametrize(
+ "expiration_time_str",
+ [
+ datetime.utcnow().isoformat(),
+ (datetime.utcnow() - timedelta(days=1)).ctime(),
+ "1970/01/01 00:00:01.0000Z",
+ "70/01/01 00:00:01.0000Z",
+ "".join(random.choice(string.ascii_letters) for _ in range(15)),
+ "".join(random.choice(string.digits) for _ in range(8)),
+ ],
+)
def test_update_user_token_expiration_time_invalid_format(
- expiration_time_str, user_token_factory):
+ expiration_time_str, user_token_factory
+):
user_token = user_token_factory()
assert user_token.expiration_time is None
with pytest.raises(
- user_tokens.InvalidExpirationError,
- match='Expiration is in an invalid format %s'
- % expiration_time_str):
+ user_tokens.InvalidExpirationError,
+ match="Expiration is in an invalid format %s" % expiration_time_str,
+ ):
user_tokens.update_user_token_expiration_time(
- user_token, expiration_time_str)
+ user_token, expiration_time_str
+ )
def test_bump_usage_time(user_token_factory, fake_datetime):
user_token = user_token_factory()
- with fake_datetime('1997-01-01'):
+ with fake_datetime("1997-01-01"):
user_tokens.bump_usage_time(user_token)
assert user_token.last_usage_time == datetime(1997, 1, 1)
diff --git a/server/szurubooru/tests/func/test_users.py b/server/szurubooru/tests/func/test_users.py
index 5506127..94e9c7c 100644
--- a/server/szurubooru/tests/func/test_users.py
+++ b/server/szurubooru/tests/func/test_users.py
@@ -1,56 +1,70 @@
-from unittest.mock import patch
from datetime import datetime
+from unittest.mock import patch
+
import pytest
-from szurubooru import db, model, errors
-from szurubooru.func import auth, users, files, util
+from szurubooru import db, errors, model
+from szurubooru.func import auth, files, users, util
EMPTY_PIXEL = (
- b'\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x01\x00\x00\x00\x00'
- b'\xff\xff\xff\x21\xf9\x04\x01\x00\x00\x01\x00\x2c\x00\x00\x00\x00'
- b'\x01\x00\x01\x00\x00\x02\x02\x4c\x01\x00\x3b')
+ b"\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x01\x00\x00\x00\x00"
+ b"\xff\xff\xff\x21\xf9\x04\x01\x00\x00\x01\x00\x2c\x00\x00\x00\x00"
+ b"\x01\x00\x01\x00\x00\x02\x02\x4c\x01\x00\x3b"
+)
-@pytest.mark.parametrize('user_name', ['test', 'TEST'])
+@pytest.mark.parametrize("user_name", ["test", "TEST"])
def test_get_avatar_path(user_name):
- assert users.get_avatar_path(user_name) == 'avatars/test.png'
-
-
-@pytest.mark.parametrize('user_name,user_email,avatar_style,expected_url', [
- (
- 'user',
- None,
- model.User.AVATAR_GRAVATAR,
- ('https://gravatar.com/avatar/' +
- 'ee11cbb19052e40b07aac0ca060c23ee?d=retro&s=100'),
- ),
- (
- None,
- 'user@example.com',
- model.User.AVATAR_GRAVATAR,
- ('https://gravatar.com/avatar/' +
- 'b58996c504c5638798eb6b511e6f49af?d=retro&s=100'),
- ),
- (
- 'user',
- 'user@example.com',
- model.User.AVATAR_GRAVATAR,
- ('https://gravatar.com/avatar/' +
- 'b58996c504c5638798eb6b511e6f49af?d=retro&s=100'),
- ),
- (
- 'user',
- None,
- model.User.AVATAR_MANUAL,
- 'http://example.com/avatars/user.png',
- ),
-])
+ assert users.get_avatar_path(user_name) == "avatars/test.png"
+
+
+@pytest.mark.parametrize(
+ "user_name,user_email,avatar_style,expected_url",
+ [
+ (
+ "user",
+ None,
+ model.User.AVATAR_GRAVATAR,
+ (
+ "https://gravatar.com/avatar/"
+ + "ee11cbb19052e40b07aac0ca060c23ee?d=retro&s=100"
+ ),
+ ),
+ (
+ None,
+ "user@example.com",
+ model.User.AVATAR_GRAVATAR,
+ (
+ "https://gravatar.com/avatar/"
+ + "b58996c504c5638798eb6b511e6f49af?d=retro&s=100"
+ ),
+ ),
+ (
+ "user",
+ "user@example.com",
+ model.User.AVATAR_GRAVATAR,
+ (
+ "https://gravatar.com/avatar/"
+ + "b58996c504c5638798eb6b511e6f49af?d=retro&s=100"
+ ),
+ ),
+ (
+ "user",
+ None,
+ model.User.AVATAR_MANUAL,
+ "http://example.com/avatars/user.png",
+ ),
+ ],
+)
def test_get_avatar_url(
- user_name, user_email, avatar_style, expected_url, config_injector):
- config_injector({
- 'data_url': 'http://example.com/',
- 'thumbnails': {'avatar_width': 100},
- })
+ user_name, user_email, avatar_style, expected_url, config_injector
+):
+ config_injector(
+ {
+ "data_url": "http://example.com/",
+ "thumbnails": {"avatar_width": 100},
+ }
+ )
user = model.User()
user.name = user_name
user.email = user_email
@@ -59,23 +73,21 @@ def test_get_avatar_url(
@pytest.mark.parametrize(
- 'same_user,can_edit_any_email,force_show,expected_email',
+ "same_user,can_edit_any_email,force_show,expected_email",
[
(False, False, False, False),
- (True, False, False, 'test@example.com'),
- (False, True, False, 'test@example.com'),
- (False, False, True, 'test@example.com'),
- ])
+ (True, False, False, "test@example.com"),
+ (False, True, False, "test@example.com"),
+ (False, False, True, "test@example.com"),
+ ],
+)
def test_get_email(
- same_user,
- can_edit_any_email,
- force_show,
- expected_email,
- user_factory):
- with patch('szurubooru.func.auth.has_privilege'):
+ same_user, can_edit_any_email, force_show, expected_email, user_factory
+):
+ with patch("szurubooru.func.auth.has_privilege"):
auth.has_privilege = lambda user, name: can_edit_any_email
user = user_factory()
- user.email = 'test@example.com'
+ user.email = "test@example.com"
auth_user = user if same_user else user_factory()
db.session.add_all([user, auth_user])
db.session.flush()
@@ -83,25 +95,28 @@ def test_get_email(
@pytest.mark.parametrize(
- 'same_user,score,expected_liked_post_count,expected_disliked_post_count',
+ "same_user,score,expected_liked_post_count,expected_disliked_post_count",
[
(False, 1, False, False),
(False, -1, False, False),
(True, 1, 1, 0),
(True, -1, 0, 1),
- ])
+ ],
+)
def test_get_liked_post_count(
- same_user,
- score,
- expected_liked_post_count,
- expected_disliked_post_count,
- user_factory,
- post_factory):
+ same_user,
+ score,
+ expected_liked_post_count,
+ expected_disliked_post_count,
+ user_factory,
+ post_factory,
+):
user = user_factory()
post = post_factory()
auth_user = user if same_user else user_factory()
score = model.PostScore(
- post=post, user=user, score=score, time=datetime.now())
+ post=post, user=user, score=score, time=datetime.now()
+ )
db.session.add_all([post, user, score])
db.session.flush()
actual_liked_post_count = users.get_liked_post_count(user, auth_user)
@@ -115,16 +130,17 @@ def test_serialize_user_when_empty():
def test_serialize_user(user_factory):
- with patch('szurubooru.func.users.get_email'), \
- patch('szurubooru.func.users.get_avatar_url'), \
- patch('szurubooru.func.users.get_liked_post_count'), \
- patch('szurubooru.func.users.get_disliked_post_count'):
- users.get_email.return_value = 'test@example.com'
- users.get_avatar_url.return_value = 'https://example.com/avatar.png'
+ with patch("szurubooru.func.users.get_email"), patch(
+ "szurubooru.func.users.get_avatar_url"
+ ), patch("szurubooru.func.users.get_liked_post_count"), patch(
+ "szurubooru.func.users.get_disliked_post_count"
+ ):
+ users.get_email.return_value = "test@example.com"
+ users.get_avatar_url.return_value = "https://example.com/avatar.png"
users.get_liked_post_count.return_value = 66
users.get_disliked_post_count.return_value = 33
auth_user = user_factory()
- user = user_factory(name='dummy user')
+ user = user_factory(name="dummy user")
user.creation_time = datetime(1997, 1, 1)
user.last_edit_time = datetime(1998, 1, 1)
user.avatar_style = model.User.AVATAR_MANUAL
@@ -132,36 +148,36 @@ def test_serialize_user(user_factory):
db.session.add(user)
db.session.flush()
assert users.serialize_user(user, auth_user) == {
- 'version': 1,
- 'name': 'dummy user',
- 'email': 'test@example.com',
- 'rank': 'administrator',
- 'creationTime': datetime(1997, 1, 1, 0, 0),
- 'lastLoginTime': None,
- 'avatarStyle': 'manual',
- 'avatarUrl': 'https://example.com/avatar.png',
- 'likedPostCount': 66,
- 'dislikedPostCount': 33,
- 'commentCount': 0,
- 'favoritePostCount': 0,
- 'uploadedPostCount': 0,
+ "version": 1,
+ "name": "dummy user",
+ "email": "test@example.com",
+ "rank": "administrator",
+ "creationTime": datetime(1997, 1, 1, 0, 0),
+ "lastLoginTime": None,
+ "avatarStyle": "manual",
+ "avatarUrl": "https://example.com/avatar.png",
+ "likedPostCount": 66,
+ "dislikedPostCount": 33,
+ "commentCount": 0,
+ "favoritePostCount": 0,
+ "uploadedPostCount": 0,
}
def test_serialize_micro_user(user_factory):
- with patch('szurubooru.func.users.get_avatar_url'):
- users.get_avatar_url.return_value = 'https://example.com/avatar.png'
+ with patch("szurubooru.func.users.get_avatar_url"):
+ users.get_avatar_url.return_value = "https://example.com/avatar.png"
auth_user = user_factory()
- user = user_factory(name='dummy user')
+ user = user_factory(name="dummy user")
db.session.add(user)
db.session.flush()
assert users.serialize_micro_user(user, auth_user) == {
- 'name': 'dummy user',
- 'avatarUrl': 'https://example.com/avatar.png',
+ "name": "dummy user",
+ "avatarUrl": "https://example.com/avatar.png",
}
-@pytest.mark.parametrize('count', [0, 1, 2])
+@pytest.mark.parametrize("count", [0, 1, 2])
def test_get_user_count(count, user_factory):
for _ in range(count):
db.session.add(user_factory())
@@ -170,72 +186,73 @@ def test_get_user_count(count, user_factory):
def test_try_get_user_by_name(user_factory):
- user = user_factory(name='name', email='email')
+ user = user_factory(name="name", email="email")
db.session.add(user)
db.session.flush()
- assert users.try_get_user_by_name('non-existing') is None
- assert users.try_get_user_by_name('email') is None
- assert users.try_get_user_by_name('name') is user
- assert users.try_get_user_by_name('NAME') is user
+ assert users.try_get_user_by_name("non-existing") is None
+ assert users.try_get_user_by_name("email") is None
+ assert users.try_get_user_by_name("name") is user
+ assert users.try_get_user_by_name("NAME") is user
def test_get_user_by_name(user_factory):
- user = user_factory(name='name', email='email')
+ user = user_factory(name="name", email="email")
db.session.add(user)
db.session.flush()
with pytest.raises(users.UserNotFoundError):
- assert users.get_user_by_name('non-existing')
+ assert users.get_user_by_name("non-existing")
with pytest.raises(users.UserNotFoundError):
- assert users.get_user_by_name('email')
- assert users.get_user_by_name('name') is user
- assert users.get_user_by_name('NAME') is user
+ assert users.get_user_by_name("email")
+ assert users.get_user_by_name("name") is user
+ assert users.get_user_by_name("NAME") is user
def test_try_get_user_by_name_or_email(user_factory):
- user = user_factory(name='name', email='email')
+ user = user_factory(name="name", email="email")
db.session.add(user)
db.session.flush()
- assert users.try_get_user_by_name_or_email('non-existing') is None
- assert users.try_get_user_by_name_or_email('email') is user
- assert users.try_get_user_by_name_or_email('EMAIL') is user
- assert users.try_get_user_by_name_or_email('name') is user
- assert users.try_get_user_by_name_or_email('NAME') is user
+ assert users.try_get_user_by_name_or_email("non-existing") is None
+ assert users.try_get_user_by_name_or_email("email") is user
+ assert users.try_get_user_by_name_or_email("EMAIL") is user
+ assert users.try_get_user_by_name_or_email("name") is user
+ assert users.try_get_user_by_name_or_email("NAME") is user
def test_get_user_by_name_or_email(user_factory):
- user = user_factory(name='name', email='email')
+ user = user_factory(name="name", email="email")
db.session.add(user)
db.session.flush()
with pytest.raises(users.UserNotFoundError):
- assert users.get_user_by_name_or_email('non-existing')
- assert users.get_user_by_name_or_email('email') is user
- assert users.get_user_by_name_or_email('EMAIL') is user
- assert users.get_user_by_name_or_email('name') is user
- assert users.get_user_by_name_or_email('NAME') is user
+ assert users.get_user_by_name_or_email("non-existing")
+ assert users.get_user_by_name_or_email("email") is user
+ assert users.get_user_by_name_or_email("EMAIL") is user
+ assert users.get_user_by_name_or_email("name") is user
+ assert users.get_user_by_name_or_email("NAME") is user
def test_create_user_for_first_user(fake_datetime):
- with patch('szurubooru.func.users.update_user_name'), \
- patch('szurubooru.func.users.update_user_password'), \
- patch('szurubooru.func.users.update_user_email'), \
- fake_datetime('1997-01-01'):
- user = users.create_user('name', 'password', 'email')
+ with patch("szurubooru.func.users.update_user_name"), patch(
+ "szurubooru.func.users.update_user_password"
+ ), patch("szurubooru.func.users.update_user_email"), fake_datetime(
+ "1997-01-01"
+ ):
+ user = users.create_user("name", "password", "email")
assert user.creation_time == datetime(1997, 1, 1)
assert user.last_login_time is None
assert user.rank == model.User.RANK_ADMINISTRATOR
- users.update_user_name.assert_called_once_with(user, 'name')
- users.update_user_password.assert_called_once_with(user, 'password')
- users.update_user_email.assert_called_once_with(user, 'email')
+ users.update_user_name.assert_called_once_with(user, "name")
+ users.update_user_password.assert_called_once_with(user, "password")
+ users.update_user_email.assert_called_once_with(user, "email")
def test_create_user_for_subsequent_users(user_factory, config_injector):
- config_injector({'default_rank': 'regular'})
+ config_injector({"default_rank": "regular"})
db.session.add(user_factory())
db.session.flush()
- with patch('szurubooru.func.users.update_user_name'), \
- patch('szurubooru.func.users.update_user_email'), \
- patch('szurubooru.func.users.update_user_password'):
- user = users.create_user('name', 'password', 'email')
+ with patch("szurubooru.func.users.update_user_name"), patch(
+ "szurubooru.func.users.update_user_email"
+ ), patch("szurubooru.func.users.update_user_password"):
+ user = users.create_user("name", "password", "email")
assert user.rank == model.User.RANK_REGULAR
@@ -248,56 +265,58 @@ def test_update_user_name_with_empty_string(user_factory):
def test_update_user_name_with_too_long_string(user_factory):
user = user_factory()
with pytest.raises(users.InvalidUserNameError):
- users.update_user_name(user, 'a' * 300)
+ users.update_user_name(user, "a" * 300)
def test_update_user_name_with_invalid_name(user_factory, config_injector):
- config_injector({'user_name_regex': '^[a-z]+$'})
+ config_injector({"user_name_regex": "^[a-z]+$"})
user = user_factory()
with pytest.raises(users.InvalidUserNameError):
- users.update_user_name(user, '0')
+ users.update_user_name(user, "0")
def test_update_user_name_with_duplicate_name(user_factory, config_injector):
- config_injector({'user_name_regex': '^[a-z]+$'})
+ config_injector({"user_name_regex": "^[a-z]+$"})
user = user_factory()
- existing_user = user_factory(name='dummy')
+ existing_user = user_factory(name="dummy")
db.session.add(existing_user)
db.session.flush()
with pytest.raises(users.UserAlreadyExistsError):
- users.update_user_name(user, 'dummy')
+ users.update_user_name(user, "dummy")
def test_update_user_name_reusing_own_name(user_factory, config_injector):
- config_injector({'user_name_regex': '^[a-z]+$'})
- user = user_factory(name='dummy')
+ config_injector({"user_name_regex": "^[a-z]+$"})
+ user = user_factory(name="dummy")
db.session.add(user)
db.session.flush()
- with patch('szurubooru.func.files.has'):
+ with patch("szurubooru.func.files.has"):
files.has.return_value = False
- users.update_user_name(user, 'dummy')
+ users.update_user_name(user, "dummy")
db.session.flush()
- assert users.try_get_user_by_name('dummy') is user
+ assert users.try_get_user_by_name("dummy") is user
def test_update_user_name_for_new_user(user_factory, config_injector):
- config_injector({'user_name_regex': '^[a-z]+$'})
+ config_injector({"user_name_regex": "^[a-z]+$"})
user = user_factory()
- with patch('szurubooru.func.files.has'):
+ with patch("szurubooru.func.files.has"):
files.has.return_value = False
- users.update_user_name(user, 'dummy')
- assert user.name == 'dummy'
+ users.update_user_name(user, "dummy")
+ assert user.name == "dummy"
def test_update_user_name_moves_avatar(user_factory, config_injector):
- config_injector({'user_name_regex': '^[a-z]+$'})
- user = user_factory(name='old')
- with patch('szurubooru.func.files.has'), \
- patch('szurubooru.func.files.move'):
+ config_injector({"user_name_regex": "^[a-z]+$"})
+ user = user_factory(name="old")
+ with patch("szurubooru.func.files.has"), patch(
+ "szurubooru.func.files.move"
+ ):
files.has.return_value = True
- users.update_user_name(user, 'new')
+ users.update_user_name(user, "new")
files.move.assert_called_once_with(
- 'avatars/old.png', 'avatars/new.png')
+ "avatars/old.png", "avatars/new.png"
+ )
def test_update_user_password_with_empty_string(user_factory):
@@ -307,72 +326,74 @@ def test_update_user_password_with_empty_string(user_factory):
def test_update_user_password_with_invalid_string(
- user_factory, config_injector):
- config_injector({'password_regex': '^[a-z]+$'})
+ user_factory, config_injector
+):
+ config_injector({"password_regex": "^[a-z]+$"})
user = user_factory()
with pytest.raises(users.InvalidPasswordError):
- users.update_user_password(user, '0')
+ users.update_user_password(user, "0")
def test_update_user_password(user_factory, config_injector):
- config_injector({'password_regex': '^[a-z]+$'})
+ config_injector({"password_regex": "^[a-z]+$"})
user = user_factory()
- with patch('szurubooru.func.auth.create_password'), \
- patch('szurubooru.func.auth.get_password_hash'):
- auth.create_password.return_value = 'salt'
- auth.get_password_hash.return_value = ('hash', 3)
- users.update_user_password(user, 'a')
- assert user.password_salt == 'salt'
- assert user.password_hash == 'hash'
+ with patch("szurubooru.func.auth.create_password"), patch(
+ "szurubooru.func.auth.get_password_hash"
+ ):
+ auth.create_password.return_value = "salt"
+ auth.get_password_hash.return_value = ("hash", 3)
+ users.update_user_password(user, "a")
+ assert user.password_salt == "salt"
+ assert user.password_hash == "hash"
assert user.password_revision == 3
def test_update_user_email_with_too_long_string(user_factory):
user = user_factory()
with pytest.raises(users.InvalidEmailError):
- users.update_user_email(user, 'a' * 300)
+ users.update_user_email(user, "a" * 300)
def test_update_user_email_with_invalid_email(user_factory):
user = user_factory()
- with patch('szurubooru.func.util.is_valid_email'):
+ with patch("szurubooru.func.util.is_valid_email"):
util.is_valid_email.return_value = False
with pytest.raises(users.InvalidEmailError):
- users.update_user_email(user, 'a')
+ users.update_user_email(user, "a")
def test_update_user_email_with_empty_string(user_factory):
user = user_factory()
- with patch('szurubooru.func.util.is_valid_email'):
+ with patch("szurubooru.func.util.is_valid_email"):
util.is_valid_email.return_value = True
- users.update_user_email(user, '')
+ users.update_user_email(user, "")
assert user.email is None
def test_update_user_email(user_factory):
user = user_factory()
- with patch('szurubooru.func.util.is_valid_email'):
+ with patch("szurubooru.func.util.is_valid_email"):
util.is_valid_email.return_value = True
- users.update_user_email(user, 'a')
- assert user.email == 'a'
+ users.update_user_email(user, "a")
+ assert user.email == "a"
def test_update_user_rank_with_empty_string(user_factory):
user = user_factory()
auth_user = user_factory()
with pytest.raises(users.InvalidRankError):
- users.update_user_rank(user, '', auth_user)
+ users.update_user_rank(user, "", auth_user)
def test_update_user_rank_with_invalid_string(user_factory):
user = user_factory()
auth_user = user_factory()
with pytest.raises(users.InvalidRankError):
- users.update_user_rank(user, 'invalid', auth_user)
+ users.update_user_rank(user, "invalid", auth_user)
with pytest.raises(users.InvalidRankError):
- users.update_user_rank(user, 'anonymous', auth_user)
+ users.update_user_rank(user, "anonymous", auth_user)
with pytest.raises(users.InvalidRankError):
- users.update_user_rank(user, 'nobody', auth_user)
+ users.update_user_rank(user, "nobody", auth_user)
def test_update_user_rank_with_higher_rank_than_possible(user_factory):
@@ -382,9 +403,9 @@ def test_update_user_rank_with_higher_rank_than_possible(user_factory):
auth_user = user_factory()
auth_user.rank = model.User.RANK_ANONYMOUS
with pytest.raises(errors.AuthError):
- users.update_user_rank(user, 'regular', auth_user)
+ users.update_user_rank(user, "regular", auth_user)
with pytest.raises(errors.AuthError):
- users.update_user_rank(auth_user, 'regular', auth_user)
+ users.update_user_rank(auth_user, "regular", auth_user)
def test_update_user_rank(user_factory):
@@ -393,8 +414,8 @@ def test_update_user_rank(user_factory):
user = user_factory()
auth_user = user_factory()
auth_user.rank = model.User.RANK_ADMINISTRATOR
- users.update_user_rank(user, 'regular', auth_user)
- users.update_user_rank(auth_user, 'regular', auth_user)
+ users.update_user_rank(user, "regular", auth_user)
+ users.update_user_rank(auth_user, "regular", auth_user)
assert user.rank == model.User.RANK_REGULAR
assert auth_user.rank == model.User.RANK_REGULAR
@@ -402,54 +423,57 @@ def test_update_user_rank(user_factory):
def test_update_user_avatar_with_invalid_style(user_factory):
user = user_factory()
with pytest.raises(users.InvalidAvatarError):
- users.update_user_avatar(user, 'invalid', b'')
+ users.update_user_avatar(user, "invalid", b"")
def test_update_user_avatar_to_gravatar(user_factory):
user = user_factory()
- users.update_user_avatar(user, 'gravatar')
+ users.update_user_avatar(user, "gravatar")
assert user.avatar_style == model.User.AVATAR_GRAVATAR
def test_update_user_avatar_to_empty_manual(user_factory):
user = user_factory()
- with patch('szurubooru.func.files.has'), \
- pytest.raises(users.InvalidAvatarError):
+ with patch("szurubooru.func.files.has"), pytest.raises(
+ users.InvalidAvatarError
+ ):
files.has.return_value = False
- users.update_user_avatar(user, 'manual', b'')
+ users.update_user_avatar(user, "manual", b"")
def test_update_user_avatar_to_previous_manual(user_factory):
user = user_factory()
- with patch('szurubooru.func.files.has'):
+ with patch("szurubooru.func.files.has"):
files.has.return_value = True
- users.update_user_avatar(user, 'manual', b'')
+ users.update_user_avatar(user, "manual", b"")
def test_update_user_avatar_to_new_manual(user_factory, config_injector):
config_injector(
- {'thumbnails': {'avatar_width': 500, 'avatar_height': 500}})
+ {"thumbnails": {"avatar_width": 500, "avatar_height": 500}}
+ )
user = user_factory()
- with patch('szurubooru.func.files.save'):
- users.update_user_avatar(user, 'manual', EMPTY_PIXEL)
+ with patch("szurubooru.func.files.save"):
+ users.update_user_avatar(user, "manual", EMPTY_PIXEL)
assert user.avatar_style == model.User.AVATAR_MANUAL
assert files.save.called
def test_bump_user_login_time(user_factory, fake_datetime):
user = user_factory()
- with fake_datetime('1997-01-01'):
+ with fake_datetime("1997-01-01"):
users.bump_user_login_time(user)
assert user.last_login_time == datetime(1997, 1, 1)
def test_reset_user_password(user_factory):
- with patch('szurubooru.func.auth.create_password'), \
- patch('szurubooru.func.auth.get_password_hash'):
+ with patch("szurubooru.func.auth.create_password"), patch(
+ "szurubooru.func.auth.get_password_hash"
+ ):
user = user_factory()
- auth.create_password.return_value = 'salt'
- auth.get_password_hash.return_value = ('hash', 3)
+ auth.create_password.return_value = "salt"
+ auth.get_password_hash.return_value = ("hash", 3)
users.reset_user_password(user)
- assert user.password_salt == 'salt'
- assert user.password_hash == 'hash'
+ assert user.password_salt == "salt"
+ assert user.password_hash == "hash"
assert user.password_revision == 3
diff --git a/server/szurubooru/tests/func/test_util.py b/server/szurubooru/tests/func/test_util.py
index 1307ab9..f42ba29 100644
--- a/server/szurubooru/tests/func/test_util.py
+++ b/server/szurubooru/tests/func/test_util.py
@@ -1,40 +1,47 @@
from datetime import datetime
+
import pytest
+
from szurubooru import errors
from szurubooru.func import util
-
dt = datetime
def test_parsing_empty_date_time():
with pytest.raises(errors.ValidationError):
- util.parse_time_range('')
-
-
-@pytest.mark.parametrize('output,input', [
- ((dt(1997, 1, 2, 0, 0, 0), dt(1997, 1, 2, 23, 59, 59)), 'today'),
- ((dt(1997, 1, 1, 0, 0, 0), dt(1997, 1, 1, 23, 59, 59)), 'yesterday'),
- ((dt(1999, 1, 1, 0, 0, 0), dt(1999, 12, 31, 23, 59, 59)), '1999'),
- ((dt(1999, 2, 1, 0, 0, 0), dt(1999, 2, 28, 23, 59, 59)), '1999-2'),
- ((dt(1999, 2, 1, 0, 0, 0), dt(1999, 2, 28, 23, 59, 59)), '1999-02'),
- ((dt(1999, 2, 6, 0, 0, 0), dt(1999, 2, 6, 23, 59, 59)), '1999-2-6'),
- ((dt(1999, 2, 6, 0, 0, 0), dt(1999, 2, 6, 23, 59, 59)), '1999-02-6'),
- ((dt(1999, 2, 6, 0, 0, 0), dt(1999, 2, 6, 23, 59, 59)), '1999-2-06'),
- ((dt(1999, 2, 6, 0, 0, 0), dt(1999, 2, 6, 23, 59, 59)), '1999-02-06'),
-])
+ util.parse_time_range("")
+
+
+@pytest.mark.parametrize(
+ "output,input",
+ [
+ ((dt(1997, 1, 2, 0, 0, 0), dt(1997, 1, 2, 23, 59, 59)), "today"),
+ ((dt(1997, 1, 1, 0, 0, 0), dt(1997, 1, 1, 23, 59, 59)), "yesterday"),
+ ((dt(1999, 1, 1, 0, 0, 0), dt(1999, 12, 31, 23, 59, 59)), "1999"),
+ ((dt(1999, 2, 1, 0, 0, 0), dt(1999, 2, 28, 23, 59, 59)), "1999-2"),
+ ((dt(1999, 2, 1, 0, 0, 0), dt(1999, 2, 28, 23, 59, 59)), "1999-02"),
+ ((dt(1999, 2, 6, 0, 0, 0), dt(1999, 2, 6, 23, 59, 59)), "1999-2-6"),
+ ((dt(1999, 2, 6, 0, 0, 0), dt(1999, 2, 6, 23, 59, 59)), "1999-02-6"),
+ ((dt(1999, 2, 6, 0, 0, 0), dt(1999, 2, 6, 23, 59, 59)), "1999-2-06"),
+ ((dt(1999, 2, 6, 0, 0, 0), dt(1999, 2, 6, 23, 59, 59)), "1999-02-06"),
+ ],
+)
def test_parsing_date_time(fake_datetime, input, output):
- with fake_datetime('1997-01-02 03:04:05'):
+ with fake_datetime("1997-01-02 03:04:05"):
assert util.parse_time_range(input) == output
-@pytest.mark.parametrize('input,output', [
- ([], []),
- (['a', 'b', 'c'], ['a', 'b', 'c']),
- (['a', 'b', 'a'], ['a', 'b']),
- (['a', 'a', 'b'], ['a', 'b']),
- (['a', 'A', 'b'], ['a', 'b']),
- (['a', 'A', 'b', 'B'], ['a', 'b']),
-])
+@pytest.mark.parametrize(
+ "input,output",
+ [
+ ([], []),
+ (["a", "b", "c"], ["a", "b", "c"]),
+ (["a", "b", "a"], ["a", "b"]),
+ (["a", "a", "b"], ["a", "b"]),
+ (["a", "A", "b"], ["a", "b"]),
+ (["a", "A", "b", "B"], ["a", "b"]),
+ ],
+)
def test_icase_unique(input, output):
assert util.icase_unique(input) == output
diff --git a/server/szurubooru/tests/middleware/test_authenticator.py b/server/szurubooru/tests/middleware/test_authenticator.py
index be21a93..9a4a3cc 100644
--- a/server/szurubooru/tests/middleware/test_authenticator.py
+++ b/server/szurubooru/tests/middleware/test_authenticator.py
@@ -1,7 +1,9 @@
from unittest.mock import patch
+
import pytest
+
from szurubooru import db
-from szurubooru.func import auth, users, user_tokens
+from szurubooru.func import auth, user_tokens, users
from szurubooru.middleware import authenticator
from szurubooru.rest import errors
@@ -17,14 +19,12 @@ def test_process_request_bump_login(context_factory, user_factory):
db.session.add(user)
db.session.flush()
ctx = context_factory(
- headers={
- 'Authorization': 'Basic dGVzdFVzZXI6dGVzdFRva2Vu'
- },
- params={
- 'bump-login': 'true'
- })
- with patch('szurubooru.func.auth.is_valid_password'), \
- patch('szurubooru.func.users.get_user_by_name'):
+ headers={"Authorization": "Basic dGVzdFVzZXI6dGVzdFRva2Vu"},
+ params={"bump-login": "true"},
+ )
+ with patch("szurubooru.func.auth.is_valid_password"), patch(
+ "szurubooru.func.users.get_user_by_name"
+ ):
users.get_user_by_name.return_value = user
auth.is_valid_password.return_value = True
authenticator.process_request(ctx)
@@ -32,20 +32,18 @@ def test_process_request_bump_login(context_factory, user_factory):
def test_process_request_bump_login_with_token(
- context_factory, user_token_factory):
+ context_factory, user_token_factory
+):
user_token = user_token_factory()
db.session.add(user_token)
db.session.flush()
ctx = context_factory(
- headers={
- 'Authorization': 'Token dGVzdFVzZXI6dGVzdFRva2Vu'
- },
- params={
- 'bump-login': 'true'
- })
- with patch('szurubooru.func.auth.is_valid_token'), \
- patch('szurubooru.func.users.get_user_by_name'), \
- patch('szurubooru.func.user_tokens.get_by_user_and_token'):
+ headers={"Authorization": "Token dGVzdFVzZXI6dGVzdFRva2Vu"},
+ params={"bump-login": "true"},
+ )
+ with patch("szurubooru.func.auth.is_valid_token"), patch(
+ "szurubooru.func.users.get_user_by_name"
+ ), patch("szurubooru.func.user_tokens.get_by_user_and_token"):
users.get_user_by_name.return_value = user_token.user
user_tokens.get_by_user_and_token.return_value = user_token
auth.is_valid_token.return_value = True
@@ -57,11 +55,11 @@ def test_process_request_bump_login_with_token(
def test_process_request_basic_auth_valid(context_factory, user_factory):
user = user_factory()
ctx = context_factory(
- headers={
- 'Authorization': 'Basic dGVzdFVzZXI6dGVzdFBhc3N3b3Jk'
- })
- with patch('szurubooru.func.auth.is_valid_password'), \
- patch('szurubooru.func.users.get_user_by_name'):
+ headers={"Authorization": "Basic dGVzdFVzZXI6dGVzdFBhc3N3b3Jk"}
+ )
+ with patch("szurubooru.func.auth.is_valid_password"), patch(
+ "szurubooru.func.users.get_user_by_name"
+ ):
users.get_user_by_name.return_value = user
auth.is_valid_password.return_value = True
authenticator.process_request(ctx)
@@ -71,12 +69,11 @@ def test_process_request_basic_auth_valid(context_factory, user_factory):
def test_process_request_token_auth_valid(context_factory, user_token_factory):
user_token = user_token_factory()
ctx = context_factory(
- headers={
- 'Authorization': 'Token dGVzdFVzZXI6dGVzdFRva2Vu'
- })
- with patch('szurubooru.func.auth.is_valid_token'), \
- patch('szurubooru.func.users.get_user_by_name'), \
- patch('szurubooru.func.user_tokens.get_by_user_and_token'):
+ headers={"Authorization": "Token dGVzdFVzZXI6dGVzdFRva2Vu"}
+ )
+ with patch("szurubooru.func.auth.is_valid_token"), patch(
+ "szurubooru.func.users.get_user_by_name"
+ ), patch("szurubooru.func.user_tokens.get_by_user_and_token"):
users.get_user_by_name.return_value = user_token.user
user_tokens.get_by_user_and_token.return_value = user_token
auth.is_valid_token.return_value = True
@@ -85,9 +82,6 @@ def test_process_request_token_auth_valid(context_factory, user_token_factory):
def test_process_request_bad_header(context_factory):
- ctx = context_factory(
- headers={
- 'Authorization': 'Secret SuperSecretValue'
- })
+ ctx = context_factory(headers={"Authorization": "Secret SuperSecretValue"})
with pytest.raises(errors.HttpBadRequest):
authenticator.process_request(ctx)
diff --git a/server/szurubooru/tests/model/test_comment.py b/server/szurubooru/tests/model/test_comment.py
index ffd5189..fcbf176 100644
--- a/server/szurubooru/tests/model/test_comment.py
+++ b/server/szurubooru/tests/model/test_comment.py
@@ -1,4 +1,5 @@
from datetime import datetime
+
from szurubooru import db, model
@@ -6,7 +7,7 @@ def test_saving_comment(user_factory, post_factory):
user = user_factory()
post = post_factory()
comment = model.Comment()
- comment.text = 'long text' * 1000
+ comment.text = "long text" * 1000
comment.user = user
comment.post = post
comment.creation_time = datetime(1997, 1, 1)
@@ -17,7 +18,7 @@ def test_saving_comment(user_factory, post_factory):
db.session.refresh(comment)
assert not db.session.dirty
assert comment.user is not None and comment.user.user_id is not None
- assert comment.text == 'long text' * 1000
+ assert comment.text == "long text" * 1000
assert comment.creation_time == datetime(1997, 1, 1)
assert comment.last_edit_time == datetime(1998, 1, 1)
diff --git a/server/szurubooru/tests/model/test_pool.py b/server/szurubooru/tests/model/test_pool.py
index 589e9ba..bec9560 100644
--- a/server/szurubooru/tests/model/test_pool.py
+++ b/server/szurubooru/tests/model/test_pool.py
@@ -1,24 +1,24 @@
from datetime import datetime
+
import pytest
+
from szurubooru import db, model
@pytest.fixture(autouse=True)
def inject_config(config_injector):
- config_injector({
- 'delete_source_files': False,
- 'secret': 'secret',
- 'data_dir': ''
- })
+ config_injector(
+ {"delete_source_files": False, "secret": "secret", "data_dir": ""}
+ )
def test_saving_pool(pool_factory, post_factory):
post1 = post_factory()
post2 = post_factory()
pool = model.Pool()
- pool.names = [model.PoolName('alias1', 0), model.PoolName('alias2', 1)]
+ pool.names = [model.PoolName("alias1", 0), model.PoolName("alias2", 1)]
pool.posts = []
- pool.category = model.PoolCategory('category')
+ pool.category = model.PoolCategory("category")
pool.creation_time = datetime(1997, 1, 1)
pool.last_edit_time = datetime(1998, 1, 1)
db.session.add_all([pool, post1, post2])
@@ -30,13 +30,13 @@ def test_saving_pool(pool_factory, post_factory):
db.session.commit()
pool = (
- db.session
- .query(model.Pool)
+ db.session.query(model.Pool)
.join(model.PoolName)
- .filter(model.PoolName.name == 'alias1')
- .one())
- assert [pool_name.name for pool_name in pool.names] == ['alias1', 'alias2']
- assert pool.category.name == 'category'
+ .filter(model.PoolName.name == "alias1")
+ .one()
+ )
+ assert [pool_name.name for pool_name in pool.names] == ["alias1", "alias2"]
+ assert pool.category.name == "category"
assert pool.creation_time == datetime(1997, 1, 1)
assert pool.last_edit_time == datetime(1998, 1, 1)
assert [post.post_id for post in pool.posts] == [1, 2]
@@ -46,9 +46,9 @@ def test_cascade_deletions(pool_factory, post_factory):
post1 = post_factory()
post2 = post_factory()
pool = model.Pool()
- pool.names = [model.PoolName('alias1', 0), model.PoolName('alias2', 1)]
+ pool.names = [model.PoolName("alias1", 0), model.PoolName("alias2", 1)]
pool.posts = []
- pool.category = model.PoolCategory('category')
+ pool.category = model.PoolCategory("category")
pool.creation_time = datetime(1997, 1, 1)
pool.last_edit_time = datetime(1998, 1, 1)
db.session.add_all([pool, post1, post2])
diff --git a/server/szurubooru/tests/model/test_post.py b/server/szurubooru/tests/model/test_post.py
index 47c088d..f01455d 100644
--- a/server/szurubooru/tests/model/test_post.py
+++ b/server/szurubooru/tests/model/test_post.py
@@ -1,15 +1,15 @@
from datetime import datetime
+
import pytest
+
from szurubooru import db, model
@pytest.fixture(autouse=True)
def inject_config(config_injector):
- config_injector({
- 'secret': 'secret',
- 'data_dir': '',
- 'delete_source_files': False
- })
+ config_injector(
+ {"secret": "secret", "data_dir": "", "delete_source_files": False}
+ )
def test_saving_post(post_factory, user_factory, tag_factory):
@@ -19,12 +19,12 @@ def test_saving_post(post_factory, user_factory, tag_factory):
related_post1 = post_factory()
related_post2 = post_factory()
post = model.Post()
- post.safety = 'safety'
- post.type = 'type'
- post.checksum = 'deadbeef'
+ post.safety = "safety"
+ post.type = "type"
+ post.checksum = "deadbeef"
post.creation_time = datetime(1997, 1, 1)
post.last_edit_time = datetime(1998, 1, 1)
- post.mime_type = 'application/whatever'
+ post.mime_type = "application/whatever"
db.session.add_all([user, tag1, tag2, related_post1, related_post2, post])
post.user = user
@@ -39,9 +39,9 @@ def test_saving_post(post_factory, user_factory, tag_factory):
db.session.refresh(related_post2)
assert not db.session.dirty
assert post.user.user_id is not None
- assert post.safety == 'safety'
- assert post.type == 'type'
- assert post.checksum == 'deadbeef'
+ assert post.safety == "safety"
+ assert post.type == "type"
+ assert post.checksum == "deadbeef"
assert post.creation_time == datetime(1997, 1, 1)
assert post.last_edit_time == datetime(1998, 1, 1)
assert len(post.relations) == 2
@@ -51,7 +51,8 @@ def test_saving_post(post_factory, user_factory, tag_factory):
def test_cascade_deletions(
- post_factory, user_factory, tag_factory, comment_factory):
+ post_factory, user_factory, tag_factory, comment_factory
+):
user = user_factory()
tag1 = tag_factory()
tag2 = tag_factory()
@@ -59,8 +60,9 @@ def test_cascade_deletions(
related_post2 = post_factory()
post = post_factory()
comment = comment_factory(post=post, user=user)
- db.session.add_all([
- user, tag1, tag2, post, related_post1, related_post2, comment])
+ db.session.add_all(
+ [user, tag1, tag2, post, related_post1, related_post2, comment]
+ )
db.session.flush()
score = model.PostScore()
@@ -78,11 +80,11 @@ def test_cascade_deletions(
feature.time = datetime(1997, 1, 1)
note = model.PostNote()
note.post = post
- note.polygon = ''
- note.text = ''
+ note.polygon = ""
+ note.text = ""
signature = model.PostSignature()
signature.post = post
- signature.signature = b'testvalue'
+ signature.signature = b"testvalue"
signature.words = list(range(50))
db.session.add_all([score, favorite, feature, note, signature])
db.session.flush()
diff --git a/server/szurubooru/tests/model/test_tag.py b/server/szurubooru/tests/model/test_tag.py
index b677eef..9332f0d 100644
--- a/server/szurubooru/tests/model/test_tag.py
+++ b/server/szurubooru/tests/model/test_tag.py
@@ -1,27 +1,27 @@
from datetime import datetime
+
import pytest
+
from szurubooru import db, model
@pytest.fixture(autouse=True)
def inject_config(config_injector):
- config_injector({
- 'delete_source_files': False,
- 'secret': 'secret',
- 'data_dir': ''
- })
+ config_injector(
+ {"delete_source_files": False, "secret": "secret", "data_dir": ""}
+ )
def test_saving_tag(tag_factory):
- sug1 = tag_factory(names=['sug1'])
- sug2 = tag_factory(names=['sug2'])
- imp1 = tag_factory(names=['imp1'])
- imp2 = tag_factory(names=['imp2'])
+ sug1 = tag_factory(names=["sug1"])
+ sug2 = tag_factory(names=["sug2"])
+ imp1 = tag_factory(names=["imp1"])
+ imp2 = tag_factory(names=["imp2"])
tag = model.Tag()
- tag.names = [model.TagName('alias1', 0), model.TagName('alias2', 1)]
+ tag.names = [model.TagName("alias1", 0), model.TagName("alias2", 1)]
tag.suggestions = []
tag.implications = []
- tag.category = model.TagCategory('category')
+ tag.category = model.TagCategory("category")
tag.creation_time = datetime(1997, 1, 1)
tag.last_edit_time = datetime(1998, 1, 1)
db.session.add_all([tag, sug1, sug2, imp1, imp2])
@@ -39,31 +39,35 @@ def test_saving_tag(tag_factory):
db.session.commit()
tag = (
- db.session
- .query(model.Tag)
+ db.session.query(model.Tag)
.join(model.TagName)
- .filter(model.TagName.name == 'alias1')
- .one())
- assert [tag_name.name for tag_name in tag.names] == ['alias1', 'alias2']
- assert tag.category.name == 'category'
+ .filter(model.TagName.name == "alias1")
+ .one()
+ )
+ assert [tag_name.name for tag_name in tag.names] == ["alias1", "alias2"]
+ assert tag.category.name == "category"
assert tag.creation_time == datetime(1997, 1, 1)
assert tag.last_edit_time == datetime(1998, 1, 1)
- assert [relation.names[0].name for relation in tag.suggestions] \
- == ['sug1', 'sug2']
- assert [relation.names[0].name for relation in tag.implications] \
- == ['imp1', 'imp2']
+ assert [relation.names[0].name for relation in tag.suggestions] == [
+ "sug1",
+ "sug2",
+ ]
+ assert [relation.names[0].name for relation in tag.implications] == [
+ "imp1",
+ "imp2",
+ ]
def test_cascade_deletions(tag_factory):
- sug1 = tag_factory(names=['sug1'])
- sug2 = tag_factory(names=['sug2'])
- imp1 = tag_factory(names=['imp1'])
- imp2 = tag_factory(names=['imp2'])
+ sug1 = tag_factory(names=["sug1"])
+ sug2 = tag_factory(names=["sug2"])
+ imp1 = tag_factory(names=["imp1"])
+ imp2 = tag_factory(names=["imp2"])
tag = model.Tag()
- tag.names = [model.TagName('alias1', 0), model.TagName('alias2', 1)]
+ tag.names = [model.TagName("alias1", 0), model.TagName("alias2", 1)]
tag.suggestions = []
tag.implications = []
- tag.category = model.TagCategory('category')
+ tag.category = model.TagCategory("category")
tag.creation_time = datetime(1997, 1, 1)
tag.last_edit_time = datetime(1998, 1, 1)
tag.post_count = 1
diff --git a/server/szurubooru/tests/model/test_user.py b/server/szurubooru/tests/model/test_user.py
index ced3a5e..20279a0 100644
--- a/server/szurubooru/tests/model/test_user.py
+++ b/server/szurubooru/tests/model/test_user.py
@@ -1,25 +1,26 @@
from datetime import datetime
+
from szurubooru import db, model
def test_saving_user():
user = model.User()
- user.name = 'name'
- user.password_salt = 'salt'
- user.password_hash = 'hash'
- user.email = 'email'
- user.rank = 'rank'
+ user.name = "name"
+ user.password_salt = "salt"
+ user.password_hash = "hash"
+ user.email = "email"
+ user.rank = "rank"
user.creation_time = datetime(1997, 1, 1)
user.avatar_style = model.User.AVATAR_GRAVATAR
db.session.add(user)
db.session.flush()
db.session.refresh(user)
assert not db.session.dirty
- assert user.name == 'name'
- assert user.password_salt == 'salt'
- assert user.password_hash == 'hash'
- assert user.email == 'email'
- assert user.rank == 'rank'
+ assert user.name == "name"
+ assert user.password_salt == "salt"
+ assert user.password_hash == "hash"
+ assert user.email == "email"
+ assert user.rank == "rank"
assert user.creation_time == datetime(1997, 1, 1)
assert user.avatar_style == model.User.AVATAR_GRAVATAR
@@ -43,10 +44,9 @@ def test_comment_count(user_factory, comment_factory):
db.session.add(user)
db.session.flush()
assert user.comment_count == 0
- db.session.add_all([
- comment_factory(user=user),
- comment_factory(),
- ])
+ db.session.add_all(
+ [comment_factory(user=user), comment_factory(),]
+ )
db.session.flush()
db.session.refresh(user)
assert user.comment_count == 1
@@ -60,10 +60,12 @@ def test_favorite_count(user_factory, post_factory):
assert user1.comment_count == 0
post1 = post_factory()
post2 = post_factory()
- db.session.add_all([
- model.PostFavorite(post=post1, time=datetime.utcnow(), user=user1),
- model.PostFavorite(post=post2, time=datetime.utcnow(), user=user2),
- ])
+ db.session.add_all(
+ [
+ model.PostFavorite(post=post1, time=datetime.utcnow(), user=user1),
+ model.PostFavorite(post=post2, time=datetime.utcnow(), user=user2),
+ ]
+ )
db.session.flush()
db.session.refresh(user1)
assert user1.favorite_post_count == 1
@@ -78,12 +80,16 @@ def test_liked_post_count(user_factory, post_factory):
assert user1.disliked_post_count == 0
post1 = post_factory()
post2 = post_factory()
- db.session.add_all([
- model.PostScore(
- post=post1, time=datetime.utcnow(), user=user1, score=1),
- model.PostScore(
- post=post2, time=datetime.utcnow(), user=user2, score=1),
- ])
+ db.session.add_all(
+ [
+ model.PostScore(
+ post=post1, time=datetime.utcnow(), user=user1, score=1
+ ),
+ model.PostScore(
+ post=post2, time=datetime.utcnow(), user=user2, score=1
+ ),
+ ]
+ )
db.session.flush()
db.session.refresh(user1)
assert user1.liked_post_count == 1
@@ -99,12 +105,16 @@ def test_disliked_post_count(user_factory, post_factory):
assert user1.disliked_post_count == 0
post1 = post_factory()
post2 = post_factory()
- db.session.add_all([
- model.PostScore(
- post=post1, time=datetime.utcnow(), user=user1, score=-1),
- model.PostScore(
- post=post2, time=datetime.utcnow(), user=user2, score=1),
- ])
+ db.session.add_all(
+ [
+ model.PostScore(
+ post=post1, time=datetime.utcnow(), user=user1, score=-1
+ ),
+ model.PostScore(
+ post=post2, time=datetime.utcnow(), user=user2, score=1
+ ),
+ ]
+ )
db.session.flush()
db.session.refresh(user1)
assert user1.liked_post_count == 0
@@ -147,10 +157,10 @@ def test_cascade_deletions(post_factory, user_factory, comment_factory):
snapshot = model.Snapshot()
snapshot.user = user
snapshot.creation_time = datetime(1997, 1, 1)
- snapshot.resource_type = '-'
+ snapshot.resource_type = "-"
snapshot.resource_pkey = 1
- snapshot.resource_name = '-'
- snapshot.operation = '-'
+ snapshot.resource_name = "-"
+ snapshot.operation = "-"
db.session.add_all([user, post, comment, snapshot])
db.session.commit()
diff --git a/server/szurubooru/tests/model/test_user_token.py b/server/szurubooru/tests/model/test_user_token.py
index 0280082..cddb5cf 100644
--- a/server/szurubooru/tests/model/test_user_token.py
+++ b/server/szurubooru/tests/model/test_user_token.py
@@ -1,4 +1,5 @@
from datetime import datetime
+
from szurubooru import db
@@ -9,6 +10,6 @@ def test_saving_user_token(user_token_factory):
db.session.refresh(user_token)
assert not db.session.dirty
assert user_token.user is not None
- assert user_token.token == 'dummy'
+ assert user_token.token == "dummy"
assert user_token.enabled is True
assert user_token.creation_time == datetime(1997, 1, 1)
diff --git a/server/szurubooru/tests/rest/test_context.py b/server/szurubooru/tests/rest/test_context.py
index 0de1e32..ec652b1 100644
--- a/server/szurubooru/tests/rest/test_context.py
+++ b/server/szurubooru/tests/rest/test_context.py
@@ -1,33 +1,38 @@
import unittest.mock
+
import pytest
-from szurubooru import rest, errors
+
+from szurubooru import errors, rest
from szurubooru.func import net
def test_has_param():
- ctx = rest.Context(env={}, method=None, url=None, params={'key': 'value'})
- assert ctx.has_param('key')
- assert not ctx.has_param('non-existing')
+ ctx = rest.Context(env={}, method=None, url=None, params={"key": "value"})
+ assert ctx.has_param("key")
+ assert not ctx.has_param("non-existing")
def test_get_file():
ctx = rest.Context(
- env={}, method=None, url=None, files={'key': b'content'})
- assert ctx.get_file('key') == b'content'
+ env={}, method=None, url=None, files={"key": b"content"}
+ )
+ assert ctx.get_file("key") == b"content"
with pytest.raises(errors.ValidationError):
- ctx.get_file('non-existing')
+ ctx.get_file("non-existing")
def test_get_file_from_url():
- with unittest.mock.patch('szurubooru.func.net.download'):
- net.download.return_value = b'content'
+ with unittest.mock.patch("szurubooru.func.net.download"):
+ net.download.return_value = b"content"
ctx = rest.Context(
- env={}, method=None, url=None, params={'keyUrl': 'example.com'})
- assert ctx.get_file('key') == b'content'
+ env={}, method=None, url=None, params={"keyUrl": "example.com"}
+ )
+ assert ctx.get_file("key") == b"content"
net.download.assert_called_once_with(
- 'example.com', use_video_downloader=False)
+ "example.com", use_video_downloader=False
+ )
with pytest.raises(errors.ValidationError):
- assert ctx.get_file('non-existing')
+ assert ctx.get_file("non-existing")
def test_getting_list_parameter():
@@ -35,12 +40,13 @@ def test_getting_list_parameter():
env={},
method=None,
url=None,
- params={'key': 'value', 'list': ['1', '2', '3']})
- assert ctx.get_param_as_list('key') == ['value']
- assert ctx.get_param_as_list('list') == ['1', '2', '3']
+ params={"key": "value", "list": ["1", "2", "3"]},
+ )
+ assert ctx.get_param_as_list("key") == ["value"]
+ assert ctx.get_param_as_list("list") == ["1", "2", "3"]
with pytest.raises(errors.ValidationError):
- ctx.get_param_as_list('non-existing')
- assert ctx.get_param_as_list('non-existing', default=['def']) == ['def']
+ ctx.get_param_as_list("non-existing")
+ assert ctx.get_param_as_list("non-existing", default=["def"]) == ["def"]
def test_getting_string_parameter():
@@ -48,12 +54,13 @@ def test_getting_string_parameter():
env={},
method=None,
url=None,
- params={'key': 'value', 'list': ['1', '2', '3']})
- assert ctx.get_param_as_string('key') == 'value'
- assert ctx.get_param_as_string('list') == '1,2,3'
+ params={"key": "value", "list": ["1", "2", "3"]},
+ )
+ assert ctx.get_param_as_string("key") == "value"
+ assert ctx.get_param_as_string("list") == "1,2,3"
with pytest.raises(errors.ValidationError):
- ctx.get_param_as_string('non-existing')
- assert ctx.get_param_as_string('non-existing', default='x') == 'x'
+ ctx.get_param_as_string("non-existing")
+ assert ctx.get_param_as_string("non-existing", default="x") == "x"
def test_getting_int_parameter():
@@ -61,55 +68,57 @@ def test_getting_int_parameter():
env={},
method=None,
url=None,
- params={'key': '50', 'err': 'invalid', 'list': [1, 2, 3]})
- assert ctx.get_param_as_int('key') == 50
+ params={"key": "50", "err": "invalid", "list": [1, 2, 3]},
+ )
+ assert ctx.get_param_as_int("key") == 50
with pytest.raises(errors.ValidationError):
- ctx.get_param_as_int('list')
+ ctx.get_param_as_int("list")
with pytest.raises(errors.ValidationError):
- ctx.get_param_as_int('non-existing')
- assert ctx.get_param_as_int('non-existing', default=5) == 5
+ ctx.get_param_as_int("non-existing")
+ assert ctx.get_param_as_int("non-existing", default=5) == 5
with pytest.raises(errors.ValidationError):
- ctx.get_param_as_int('err')
+ ctx.get_param_as_int("err")
with pytest.raises(errors.ValidationError):
- assert ctx.get_param_as_int('key', min=50) == 50
- ctx.get_param_as_int('key', min=51)
+ assert ctx.get_param_as_int("key", min=50) == 50
+ ctx.get_param_as_int("key", min=51)
with pytest.raises(errors.ValidationError):
- assert ctx.get_param_as_int('key', max=50) == 50
- ctx.get_param_as_int('key', max=49)
+ assert ctx.get_param_as_int("key", max=50) == 50
+ ctx.get_param_as_int("key", max=49)
def test_getting_bool_parameter():
def test(value):
ctx = rest.Context(
- env={}, method=None, url=None, params={'key': value})
- return ctx.get_param_as_bool('key')
-
- assert test('1') is True
- assert test('y') is True
- assert test('yes') is True
- assert test('yep') is True
- assert test('yup') is True
- assert test('yeah') is True
- assert test('t') is True
- assert test('true') is True
- assert test('TRUE') is True
-
- assert test('0') is False
- assert test('n') is False
- assert test('no') is False
- assert test('nope') is False
- assert test('f') is False
- assert test('false') is False
- assert test('FALSE') is False
+ env={}, method=None, url=None, params={"key": value}
+ )
+ return ctx.get_param_as_bool("key")
+
+ assert test("1") is True
+ assert test("y") is True
+ assert test("yes") is True
+ assert test("yep") is True
+ assert test("yup") is True
+ assert test("yeah") is True
+ assert test("t") is True
+ assert test("true") is True
+ assert test("TRUE") is True
+
+ assert test("0") is False
+ assert test("n") is False
+ assert test("no") is False
+ assert test("nope") is False
+ assert test("f") is False
+ assert test("false") is False
+ assert test("FALSE") is False
with pytest.raises(errors.ValidationError):
- test('herp')
+ test("herp")
with pytest.raises(errors.ValidationError):
- test('2')
+ test("2")
with pytest.raises(errors.ValidationError):
- test(['1', '2'])
+ test(["1", "2"])
ctx = rest.Context(env={}, method=None, url=None)
with pytest.raises(errors.ValidationError):
- ctx.get_param_as_bool('non-existing')
- assert ctx.get_param_as_bool('non-existing', default=True) is True
+ ctx.get_param_as_bool("non-existing")
+ assert ctx.get_param_as_bool("non-existing", default=True) is True
diff --git a/server/szurubooru/tests/search/configs/test_comment_search_config.py b/server/szurubooru/tests/search/configs/test_comment_search_config.py
index 7279c1b..a592b30 100644
--- a/server/szurubooru/tests/search/configs/test_comment_search_config.py
+++ b/server/szurubooru/tests/search/configs/test_comment_search_config.py
@@ -1,5 +1,7 @@
from datetime import datetime
+
import pytest
+
from szurubooru import db, search
@@ -12,22 +14,28 @@ def executor():
def verify_unpaged(executor):
def verify(input, expected_comment_text):
actual_count, actual_comments = executor.execute(
- input, offset=0, limit=100)
+ input, offset=0, limit=100
+ )
actual_comment_text = [c.text for c in actual_comments]
assert actual_count == len(expected_comment_text)
assert actual_comment_text == expected_comment_text
+
return verify
-@pytest.mark.parametrize('input,expected_comment_text', [
- ('creation-time:2014', ['t2', 't1']),
- ('creation-date:2014', ['t2', 't1']),
-])
+@pytest.mark.parametrize(
+ "input,expected_comment_text",
+ [
+ ("creation-time:2014", ["t2", "t1"]),
+ ("creation-date:2014", ["t2", "t1"]),
+ ],
+)
def test_filter_by_creation_time(
- verify_unpaged, comment_factory, input, expected_comment_text):
- comment1 = comment_factory(text='t1')
- comment2 = comment_factory(text='t2')
- comment3 = comment_factory(text='t3')
+ verify_unpaged, comment_factory, input, expected_comment_text
+):
+ comment1 = comment_factory(text="t1")
+ comment2 = comment_factory(text="t2")
+ comment3 = comment_factory(text="t3")
comment1.creation_time = datetime(2014, 1, 1)
comment2.creation_time = datetime(2014, 6, 1)
comment3.creation_time = datetime(2015, 1, 1)
@@ -36,109 +44,107 @@ def test_filter_by_creation_time(
verify_unpaged(input, expected_comment_text)
-@pytest.mark.parametrize('input,expected_comment_text', [
- ('text:t1', ['t1']),
- ('text:t2', ['t2']),
- ('text:t1,t2', ['t1', 't2']),
- ('text:t*', ['t1', 't2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_comment_text",
+ [
+ ("text:t1", ["t1"]),
+ ("text:t2", ["t2"]),
+ ("text:t1,t2", ["t1", "t2"]),
+ ("text:t*", ["t1", "t2"]),
+ ],
+)
def test_filter_by_text(
- verify_unpaged, comment_factory, input, expected_comment_text):
- comment1 = comment_factory(text='t1')
- comment2 = comment_factory(text='t2')
+ verify_unpaged, comment_factory, input, expected_comment_text
+):
+ comment1 = comment_factory(text="t1")
+ comment2 = comment_factory(text="t2")
db.session.add_all([comment1, comment2])
db.session.flush()
verify_unpaged(input, expected_comment_text)
-@pytest.mark.parametrize('input,expected_comment_text', [
- ('user:u1', ['t1']),
- ('user:u2', ['t2']),
- ('user:u1,u2', ['t2', 't1']),
-])
+@pytest.mark.parametrize(
+ "input,expected_comment_text",
+ [("user:u1", ["t1"]), ("user:u2", ["t2"]), ("user:u1,u2", ["t2", "t1"]),],
+)
def test_filter_by_user(
- verify_unpaged,
- comment_factory,
- user_factory,
- input,
- expected_comment_text):
- db.session.add(comment_factory(text='t2', user=user_factory(name='u2')))
- db.session.add(comment_factory(text='t1', user=user_factory(name='u1')))
+ verify_unpaged, comment_factory, user_factory, input, expected_comment_text
+):
+ db.session.add(comment_factory(text="t2", user=user_factory(name="u2")))
+ db.session.add(comment_factory(text="t1", user=user_factory(name="u1")))
db.session.flush()
verify_unpaged(input, expected_comment_text)
-@pytest.mark.parametrize('input,expected_comment_text', [
- ('post:1', ['t1']),
- ('post:2', ['t2']),
- ('post:1,2', ['t1', 't2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_comment_text",
+ [("post:1", ["t1"]), ("post:2", ["t2"]), ("post:1,2", ["t1", "t2"]),],
+)
def test_filter_by_post(
- verify_unpaged,
- comment_factory,
- post_factory,
- input,
- expected_comment_text):
- db.session.add(comment_factory(text='t1', post=post_factory(id=1)))
- db.session.add(comment_factory(text='t2', post=post_factory(id=2)))
+ verify_unpaged, comment_factory, post_factory, input, expected_comment_text
+):
+ db.session.add(comment_factory(text="t1", post=post_factory(id=1)))
+ db.session.add(comment_factory(text="t2", post=post_factory(id=2)))
db.session.flush()
verify_unpaged(input, expected_comment_text)
-@pytest.mark.parametrize('input,expected_comment_text', [
- ('', ['t1', 't2']),
- ('t1', ['t1']),
- ('t2', ['t2']),
- ('t1,t2', ['t1', 't2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_comment_text",
+ [
+ ("", ["t1", "t2"]),
+ ("t1", ["t1"]),
+ ("t2", ["t2"]),
+ ("t1,t2", ["t1", "t2"]),
+ ],
+)
def test_anonymous(
- verify_unpaged, comment_factory, input, expected_comment_text):
- db.session.add(comment_factory(text='t1'))
- db.session.add(comment_factory(text='t2'))
+ verify_unpaged, comment_factory, input, expected_comment_text
+):
+ db.session.add(comment_factory(text="t1"))
+ db.session.add(comment_factory(text="t2"))
db.session.flush()
verify_unpaged(input, expected_comment_text)
-@pytest.mark.parametrize('input,expected_comment_text', [
- ('sort:user', ['t1', 't2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_comment_text", [("sort:user", ["t1", "t2"]),]
+)
def test_sort_by_user(
- verify_unpaged,
- comment_factory,
- user_factory,
- input,
- expected_comment_text):
- db.session.add(comment_factory(text='t2', user=user_factory(name='u2')))
- db.session.add(comment_factory(text='t1', user=user_factory(name='u1')))
+ verify_unpaged, comment_factory, user_factory, input, expected_comment_text
+):
+ db.session.add(comment_factory(text="t2", user=user_factory(name="u2")))
+ db.session.add(comment_factory(text="t1", user=user_factory(name="u1")))
db.session.flush()
verify_unpaged(input, expected_comment_text)
-@pytest.mark.parametrize('input,expected_comment_text', [
- ('sort:post', ['t2', 't1']),
-])
+@pytest.mark.parametrize(
+ "input,expected_comment_text", [("sort:post", ["t2", "t1"]),]
+)
def test_sort_by_post(
- verify_unpaged,
- comment_factory,
- post_factory,
- input,
- expected_comment_text):
- db.session.add(comment_factory(text='t1', post=post_factory(id=1)))
- db.session.add(comment_factory(text='t2', post=post_factory(id=2)))
+ verify_unpaged, comment_factory, post_factory, input, expected_comment_text
+):
+ db.session.add(comment_factory(text="t1", post=post_factory(id=1)))
+ db.session.add(comment_factory(text="t2", post=post_factory(id=2)))
db.session.flush()
verify_unpaged(input, expected_comment_text)
-@pytest.mark.parametrize('input,expected_comment_text', [
- ('', ['t3', 't2', 't1']),
- ('sort:creation-date', ['t3', 't2', 't1']),
- ('sort:creation-time', ['t3', 't2', 't1']),
-])
+@pytest.mark.parametrize(
+ "input,expected_comment_text",
+ [
+ ("", ["t3", "t2", "t1"]),
+ ("sort:creation-date", ["t3", "t2", "t1"]),
+ ("sort:creation-time", ["t3", "t2", "t1"]),
+ ],
+)
def test_sort_by_creation_time(
- verify_unpaged, comment_factory, input, expected_comment_text):
- comment1 = comment_factory(text='t1')
- comment2 = comment_factory(text='t2')
- comment3 = comment_factory(text='t3')
+ verify_unpaged, comment_factory, input, expected_comment_text
+):
+ comment1 = comment_factory(text="t1")
+ comment2 = comment_factory(text="t2")
+ comment3 = comment_factory(text="t3")
comment1.creation_time = datetime(1991, 1, 1)
comment2.creation_time = datetime(1991, 1, 2)
comment3.creation_time = datetime(1991, 1, 3)
@@ -147,17 +153,21 @@ def test_sort_by_creation_time(
verify_unpaged(input, expected_comment_text)
-@pytest.mark.parametrize('input,expected_comment_text', [
- ('sort:last-edit-date', ['t3', 't2', 't1']),
- ('sort:last-edit-time', ['t3', 't2', 't1']),
- ('sort:edit-date', ['t3', 't2', 't1']),
- ('sort:edit-time', ['t3', 't2', 't1']),
-])
+@pytest.mark.parametrize(
+ "input,expected_comment_text",
+ [
+ ("sort:last-edit-date", ["t3", "t2", "t1"]),
+ ("sort:last-edit-time", ["t3", "t2", "t1"]),
+ ("sort:edit-date", ["t3", "t2", "t1"]),
+ ("sort:edit-time", ["t3", "t2", "t1"]),
+ ],
+)
def test_sort_by_last_edit_time(
- verify_unpaged, comment_factory, input, expected_comment_text):
- comment1 = comment_factory(text='t1')
- comment2 = comment_factory(text='t2')
- comment3 = comment_factory(text='t3')
+ verify_unpaged, comment_factory, input, expected_comment_text
+):
+ comment1 = comment_factory(text="t1")
+ comment2 = comment_factory(text="t2")
+ comment3 = comment_factory(text="t3")
comment1.last_edit_time = datetime(1991, 1, 1)
comment2.last_edit_time = datetime(1991, 1, 2)
comment3.last_edit_time = datetime(1991, 1, 3)
diff --git a/server/szurubooru/tests/search/configs/test_pool_search_config.py b/server/szurubooru/tests/search/configs/test_pool_search_config.py
index 731a676..201bf79 100644
--- a/server/szurubooru/tests/search/configs/test_pool_search_config.py
+++ b/server/szurubooru/tests/search/configs/test_pool_search_config.py
@@ -1,5 +1,7 @@
from datetime import datetime
+
import pytest
+
from szurubooru import db, errors, search
@@ -12,77 +14,106 @@ def executor():
def verify_unpaged(executor):
def verify(input, expected_pool_names):
actual_count, actual_pools = executor.execute(
- input, offset=0, limit=100)
+ input, offset=0, limit=100
+ )
actual_pool_names = [u.names[0].name for u in actual_pools]
assert actual_count == len(expected_pool_names)
assert actual_pool_names == expected_pool_names
+
return verify
-@pytest.mark.parametrize('input,expected_pool_names', [
- ('', ['t1', 't2']),
- ('t1', ['t1']),
- ('t2', ['t2']),
- ('t1,t2', ['t1', 't2']),
- ('T1,T2', ['t1', 't2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_pool_names",
+ [
+ ("", ["t1", "t2"]),
+ ("t1", ["t1"]),
+ ("t2", ["t2"]),
+ ("t1,t2", ["t1", "t2"]),
+ ("T1,T2", ["t1", "t2"]),
+ ],
+)
def test_filter_anonymous(
- verify_unpaged, pool_factory, input, expected_pool_names):
- db.session.add(pool_factory(id=1, names=['t1']))
- db.session.add(pool_factory(id=2, names=['t2']))
+ verify_unpaged, pool_factory, input, expected_pool_names
+):
+ db.session.add(pool_factory(id=1, names=["t1"]))
+ db.session.add(pool_factory(id=2, names=["t2"]))
db.session.flush()
verify_unpaged(input, expected_pool_names)
-@pytest.mark.parametrize('db_driver,input,expected_pool_names', [
- (None, ',', None),
- (None, 't1,', None),
- (None, 't1,t2', ['t1', 't2']),
- (None, 't1\\,', []),
- (None, 'asd..asd', None),
- (None, 'asd\\..asd', []),
- (None, 'asd.\\.asd', []),
- (None, 'asd\\.\\.asd', []),
- (None, '-', None),
- (None, '\\-', ['-']),
- (None, '--', [
- 't1', 't2', '*', '*asd*', ':', 'asd:asd', '\\', '\\asd', '-asd',
- ]),
- (None, '\\--', []),
- (None, '-\\-', [
- 't1', 't2', '*', '*asd*', ':', 'asd:asd', '\\', '\\asd', '-asd',
- ]),
- (None, '-*', []),
- (None, '\\-*', ['-', '-asd']),
- (None, ':', None),
- (None, '\\:', [':']),
- (None, '\\:asd', []),
- (None, '*\\:*', [':', 'asd:asd']),
- (None, 'asd:asd', None),
- (None, 'asd\\:asd', ['asd:asd']),
- (None, '*', [
- 't1', 't2', '*', '*asd*', ':', 'asd:asd', '\\', '\\asd', '-', '-asd'
- ]),
- (None, '\\*', ['*']),
- (None, '\\', None),
- (None, '\\asd', None),
- ('psycopg2', '\\\\', ['\\']),
- ('psycopg2', '\\\\asd', ['\\asd']),
-])
+@pytest.mark.parametrize(
+ "db_driver,input,expected_pool_names",
+ [
+ (None, ",", None),
+ (None, "t1,", None),
+ (None, "t1,t2", ["t1", "t2"]),
+ (None, "t1\\,", []),
+ (None, "asd..asd", None),
+ (None, "asd\\..asd", []),
+ (None, "asd.\\.asd", []),
+ (None, "asd\\.\\.asd", []),
+ (None, "-", None),
+ (None, "\\-", ["-"]),
+ (
+ None,
+ "--",
+ ["t1", "t2", "*", "*asd*", ":", "asd:asd", "\\", "\\asd", "-asd",],
+ ),
+ (None, "\\--", []),
+ (
+ None,
+ "-\\-",
+ ["t1", "t2", "*", "*asd*", ":", "asd:asd", "\\", "\\asd", "-asd",],
+ ),
+ (None, "-*", []),
+ (None, "\\-*", ["-", "-asd"]),
+ (None, ":", None),
+ (None, "\\:", [":"]),
+ (None, "\\:asd", []),
+ (None, "*\\:*", [":", "asd:asd"]),
+ (None, "asd:asd", None),
+ (None, "asd\\:asd", ["asd:asd"]),
+ (
+ None,
+ "*",
+ [
+ "t1",
+ "t2",
+ "*",
+ "*asd*",
+ ":",
+ "asd:asd",
+ "\\",
+ "\\asd",
+ "-",
+ "-asd",
+ ],
+ ),
+ (None, "\\*", ["*"]),
+ (None, "\\", None),
+ (None, "\\asd", None),
+ ("psycopg2", "\\\\", ["\\"]),
+ ("psycopg2", "\\\\asd", ["\\asd"]),
+ ],
+)
def test_escaping(
- executor, pool_factory, input, expected_pool_names, db_driver):
- db.session.add_all([
- pool_factory(id=1, names=['t1']),
- pool_factory(id=2, names=['t2']),
- pool_factory(id=3, names=['*']),
- pool_factory(id=4, names=['*asd*']),
- pool_factory(id=5, names=[':']),
- pool_factory(id=6, names=['asd:asd']),
- pool_factory(id=7, names=['\\']),
- pool_factory(id=8, names=['\\asd']),
- pool_factory(id=9, names=['-']),
- pool_factory(id=10, names=['-asd'])
- ])
+ executor, pool_factory, input, expected_pool_names, db_driver
+):
+ db.session.add_all(
+ [
+ pool_factory(id=1, names=["t1"]),
+ pool_factory(id=2, names=["t2"]),
+ pool_factory(id=3, names=["*"]),
+ pool_factory(id=4, names=["*asd*"]),
+ pool_factory(id=5, names=[":"]),
+ pool_factory(id=6, names=["asd:asd"]),
+ pool_factory(id=7, names=["\\"]),
+ pool_factory(id=8, names=["\\asd"]),
+ pool_factory(id=9, names=["-"]),
+ pool_factory(id=10, names=["-asd"]),
+ ]
+ )
db.session.flush()
if db_driver and db.session.get_bind().driver != db_driver:
@@ -92,99 +123,112 @@ def test_escaping(
executor.execute(input, offset=0, limit=100)
else:
actual_count, actual_pools = executor.execute(
- input, offset=0, limit=100)
+ input, offset=0, limit=100
+ )
actual_pool_names = [u.names[0].name for u in actual_pools]
assert actual_count == len(expected_pool_names)
assert sorted(actual_pool_names) == sorted(expected_pool_names)
def test_filter_anonymous_starting_with_colon(verify_unpaged, pool_factory):
- db.session.add(pool_factory(id=1, names=[':t']))
+ db.session.add(pool_factory(id=1, names=[":t"]))
db.session.flush()
with pytest.raises(errors.SearchError):
- verify_unpaged(':t', [':t'])
- verify_unpaged('\\:t', [':t'])
-
-
-@pytest.mark.parametrize('input,expected_pool_names', [
- ('name:pool1', ['pool1']),
- ('name:pool2', ['pool2']),
- ('name:none', []),
- ('name:', []),
- ('name:*1', ['pool1']),
- ('name:*2', ['pool2']),
- ('name:*', ['pool1', 'pool2', 'pool3', 'pool4']),
- ('name:p*', ['pool1', 'pool2', 'pool3', 'pool4']),
- ('name:*o*', ['pool1', 'pool2', 'pool3', 'pool4']),
- ('name:*!*', []),
- ('name:!*', []),
- ('name:*!', []),
- ('-name:pool1', ['pool2', 'pool3', 'pool4']),
- ('-name:pool2', ['pool1', 'pool3', 'pool4']),
- ('name:pool1,pool2', ['pool1', 'pool2']),
- ('-name:pool1,pool3', ['pool2', 'pool4']),
- ('name:pool4', ['pool4']),
- ('name:pool5', ['pool4']),
- ('name:pool4,pool5', ['pool4']),
-])
+ verify_unpaged(":t", [":t"])
+ verify_unpaged("\\:t", [":t"])
+
+
+@pytest.mark.parametrize(
+ "input,expected_pool_names",
+ [
+ ("name:pool1", ["pool1"]),
+ ("name:pool2", ["pool2"]),
+ ("name:none", []),
+ ("name:", []),
+ ("name:*1", ["pool1"]),
+ ("name:*2", ["pool2"]),
+ ("name:*", ["pool1", "pool2", "pool3", "pool4"]),
+ ("name:p*", ["pool1", "pool2", "pool3", "pool4"]),
+ ("name:*o*", ["pool1", "pool2", "pool3", "pool4"]),
+ ("name:*!*", []),
+ ("name:!*", []),
+ ("name:*!", []),
+ ("-name:pool1", ["pool2", "pool3", "pool4"]),
+ ("-name:pool2", ["pool1", "pool3", "pool4"]),
+ ("name:pool1,pool2", ["pool1", "pool2"]),
+ ("-name:pool1,pool3", ["pool2", "pool4"]),
+ ("name:pool4", ["pool4"]),
+ ("name:pool5", ["pool4"]),
+ ("name:pool4,pool5", ["pool4"]),
+ ],
+)
def test_filter_by_name(
- verify_unpaged, pool_factory, input, expected_pool_names):
- db.session.add(pool_factory(id=1, names=['pool1']))
- db.session.add(pool_factory(id=2, names=['pool2']))
- db.session.add(pool_factory(id=3, names=['pool3']))
- db.session.add(pool_factory(id=4, names=['pool4', 'pool5', 'pool6']))
+ verify_unpaged, pool_factory, input, expected_pool_names
+):
+ db.session.add(pool_factory(id=1, names=["pool1"]))
+ db.session.add(pool_factory(id=2, names=["pool2"]))
+ db.session.add(pool_factory(id=3, names=["pool3"]))
+ db.session.add(pool_factory(id=4, names=["pool4", "pool5", "pool6"]))
db.session.flush()
verify_unpaged(input, expected_pool_names)
-@pytest.mark.parametrize('input,expected_pool_names', [
- ('category:cat1', ['t1', 't2']),
- ('category:cat2', ['t3']),
- ('category:cat1,cat2', ['t1', 't2', 't3']),
-])
+@pytest.mark.parametrize(
+ "input,expected_pool_names",
+ [
+ ("category:cat1", ["t1", "t2"]),
+ ("category:cat2", ["t3"]),
+ ("category:cat1,cat2", ["t1", "t2", "t3"]),
+ ],
+)
def test_filter_by_category(
- verify_unpaged,
- pool_factory,
- pool_category_factory,
- input,
- expected_pool_names):
- cat1 = pool_category_factory(name='cat1')
- cat2 = pool_category_factory(name='cat2')
- pool1 = pool_factory(id=1, names=['t1'], category=cat1)
- pool2 = pool_factory(id=2, names=['t2'], category=cat1)
- pool3 = pool_factory(id=3, names=['t3'], category=cat2)
+ verify_unpaged,
+ pool_factory,
+ pool_category_factory,
+ input,
+ expected_pool_names,
+):
+ cat1 = pool_category_factory(name="cat1")
+ cat2 = pool_category_factory(name="cat2")
+ pool1 = pool_factory(id=1, names=["t1"], category=cat1)
+ pool2 = pool_factory(id=2, names=["t2"], category=cat1)
+ pool3 = pool_factory(id=3, names=["t3"], category=cat2)
db.session.add_all([pool1, pool2, pool3])
db.session.flush()
verify_unpaged(input, expected_pool_names)
-@pytest.mark.parametrize('input,expected_pool_names', [
- ('creation-time:2014', ['t1', 't2']),
- ('creation-date:2014', ['t1', 't2']),
- ('-creation-time:2014', ['t3']),
- ('-creation-date:2014', ['t3']),
- ('creation-time:2014..2014-06', ['t1', 't2']),
- ('creation-time:2014-06..2015-01-01', ['t2', 't3']),
- ('creation-time:2014-06..', ['t2', 't3']),
- ('creation-time:..2014-06', ['t1', 't2']),
- ('-creation-time:2014..2014-06', ['t3']),
- ('-creation-time:2014-06..2015-01-01', ['t1']),
- ('creation-date:2014..2014-06', ['t1', 't2']),
- ('creation-date:2014-06..2015-01-01', ['t2', 't3']),
- ('creation-date:2014-06..', ['t2', 't3']),
- ('creation-date:..2014-06', ['t1', 't2']),
- ('-creation-date:2014..2014-06', ['t3']),
- ('-creation-date:2014-06..2015-01-01', ['t1']),
- ('creation-time:2014-01,2015', ['t1', 't3']),
- ('creation-date:2014-01,2015', ['t1', 't3']),
- ('-creation-time:2014-01,2015', ['t2']),
- ('-creation-date:2014-01,2015', ['t2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_pool_names",
+ [
+ ("creation-time:2014", ["t1", "t2"]),
+ ("creation-date:2014", ["t1", "t2"]),
+ ("-creation-time:2014", ["t3"]),
+ ("-creation-date:2014", ["t3"]),
+ ("creation-time:2014..2014-06", ["t1", "t2"]),
+ ("creation-time:2014-06..2015-01-01", ["t2", "t3"]),
+ ("creation-time:2014-06..", ["t2", "t3"]),
+ ("creation-time:..2014-06", ["t1", "t2"]),
+ ("-creation-time:2014..2014-06", ["t3"]),
+ ("-creation-time:2014-06..2015-01-01", ["t1"]),
+ ("creation-date:2014..2014-06", ["t1", "t2"]),
+ ("creation-date:2014-06..2015-01-01", ["t2", "t3"]),
+ ("creation-date:2014-06..", ["t2", "t3"]),
+ ("creation-date:..2014-06", ["t1", "t2"]),
+ ("-creation-date:2014..2014-06", ["t3"]),
+ ("-creation-date:2014-06..2015-01-01", ["t1"]),
+ ("creation-time:2014-01,2015", ["t1", "t3"]),
+ ("creation-date:2014-01,2015", ["t1", "t3"]),
+ ("-creation-time:2014-01,2015", ["t2"]),
+ ("-creation-date:2014-01,2015", ["t2"]),
+ ],
+)
def test_filter_by_creation_time(
- verify_unpaged, pool_factory, input, expected_pool_names):
- pool1 = pool_factory(id=1, names=['t1'])
- pool2 = pool_factory(id=2, names=['t2'])
- pool3 = pool_factory(id=3, names=['t3'])
+ verify_unpaged, pool_factory, input, expected_pool_names
+):
+ pool1 = pool_factory(id=1, names=["t1"])
+ pool2 = pool_factory(id=2, names=["t2"])
+ pool3 = pool_factory(id=3, names=["t3"])
pool1.creation_time = datetime(2014, 1, 1)
pool2.creation_time = datetime(2014, 6, 1)
pool3.creation_time = datetime(2015, 1, 1)
@@ -193,17 +237,21 @@ def test_filter_by_creation_time(
verify_unpaged(input, expected_pool_names)
-@pytest.mark.parametrize('input,expected_pool_names', [
- ('last-edit-date:2014', ['t1', 't3']),
- ('last-edit-time:2014', ['t1', 't3']),
- ('edit-date:2014', ['t1', 't3']),
- ('edit-time:2014', ['t1', 't3']),
-])
+@pytest.mark.parametrize(
+ "input,expected_pool_names",
+ [
+ ("last-edit-date:2014", ["t1", "t3"]),
+ ("last-edit-time:2014", ["t1", "t3"]),
+ ("edit-date:2014", ["t1", "t3"]),
+ ("edit-time:2014", ["t1", "t3"]),
+ ],
+)
def test_filter_by_edit_time(
- verify_unpaged, pool_factory, input, expected_pool_names):
- pool1 = pool_factory(id=1, names=['t1'])
- pool2 = pool_factory(id=2, names=['t2'])
- pool3 = pool_factory(id=3, names=['t3'])
+ verify_unpaged, pool_factory, input, expected_pool_names
+):
+ pool1 = pool_factory(id=1, names=["t1"])
+ pool2 = pool_factory(id=2, names=["t2"])
+ pool3 = pool_factory(id=3, names=["t3"])
pool1.last_edit_time = datetime(2014, 1, 1)
pool2.last_edit_time = datetime(2015, 1, 1)
pool3.last_edit_time = datetime(2014, 1, 1)
@@ -212,24 +260,24 @@ def test_filter_by_edit_time(
verify_unpaged(input, expected_pool_names)
-@pytest.mark.parametrize('input,expected_pool_names', [
- ('post-count:2', ['t1']),
- ('post-count:1', ['t2']),
- ('post-count:1..', ['t1', 't2']),
- ('post-count-min:1', ['t1', 't2']),
- ('post-count:..1', ['t2']),
- ('post-count-max:1', ['t2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_pool_names",
+ [
+ ("post-count:2", ["t1"]),
+ ("post-count:1", ["t2"]),
+ ("post-count:1..", ["t1", "t2"]),
+ ("post-count-min:1", ["t1", "t2"]),
+ ("post-count:..1", ["t2"]),
+ ("post-count-max:1", ["t2"]),
+ ],
+)
def test_filter_by_post_count(
- verify_unpaged,
- pool_factory,
- post_factory,
- input,
- expected_pool_names):
+ verify_unpaged, pool_factory, post_factory, input, expected_pool_names
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
- pool1 = pool_factory(id=1, names=['t1'])
- pool2 = pool_factory(id=2, names=['t2'])
+ pool1 = pool_factory(id=1, names=["t1"])
+ pool2 = pool_factory(id=2, names=["t2"])
db.session.add_all([post1, post2, pool1, pool2])
pool1.posts.append(post1)
pool1.posts.append(post2)
@@ -238,49 +286,57 @@ def test_filter_by_post_count(
verify_unpaged(input, expected_pool_names)
-@pytest.mark.parametrize('input', [
- 'post-count:..',
- 'post-count:asd',
- 'post-count:asd,1',
- 'post-count:1,asd',
- 'post-count:asd..1',
- 'post-count:1..asd',
-])
+@pytest.mark.parametrize(
+ "input",
+ [
+ "post-count:..",
+ "post-count:asd",
+ "post-count:asd,1",
+ "post-count:1,asd",
+ "post-count:asd..1",
+ "post-count:1..asd",
+ ],
+)
def test_filter_by_invalid_input(executor, input):
with pytest.raises(errors.SearchError):
executor.execute(input, offset=0, limit=100)
-@pytest.mark.parametrize('input,expected_pool_names', [
- ('', ['t1', 't2']),
- ('sort:name', ['t1', 't2']),
- ('-sort:name', ['t2', 't1']),
- ('sort:name,asc', ['t1', 't2']),
- ('sort:name,desc', ['t2', 't1']),
- ('-sort:name,asc', ['t2', 't1']),
- ('-sort:name,desc', ['t1', 't2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_pool_names",
+ [
+ ("", ["t1", "t2"]),
+ ("sort:name", ["t1", "t2"]),
+ ("-sort:name", ["t2", "t1"]),
+ ("sort:name,asc", ["t1", "t2"]),
+ ("sort:name,desc", ["t2", "t1"]),
+ ("-sort:name,asc", ["t2", "t1"]),
+ ("-sort:name,desc", ["t1", "t2"]),
+ ],
+)
def test_sort_by_name(
- verify_unpaged,
- pool_factory,
- input,
- expected_pool_names):
- db.session.add(pool_factory(id=2, names=['t2']))
- db.session.add(pool_factory(id=1, names=['t1']))
+ verify_unpaged, pool_factory, input, expected_pool_names
+):
+ db.session.add(pool_factory(id=2, names=["t2"]))
+ db.session.add(pool_factory(id=1, names=["t1"]))
db.session.flush()
verify_unpaged(input, expected_pool_names)
-@pytest.mark.parametrize('input,expected_pool_names', [
- ('', ['t1', 't2', 't3']),
- ('sort:creation-date', ['t3', 't2', 't1']),
- ('sort:creation-time', ['t3', 't2', 't1']),
-])
+@pytest.mark.parametrize(
+ "input,expected_pool_names",
+ [
+ ("", ["t1", "t2", "t3"]),
+ ("sort:creation-date", ["t3", "t2", "t1"]),
+ ("sort:creation-time", ["t3", "t2", "t1"]),
+ ],
+)
def test_sort_by_creation_time(
- verify_unpaged, pool_factory, input, expected_pool_names):
- pool1 = pool_factory(id=1, names=['t1'])
- pool2 = pool_factory(id=2, names=['t2'])
- pool3 = pool_factory(id=3, names=['t3'])
+ verify_unpaged, pool_factory, input, expected_pool_names
+):
+ pool1 = pool_factory(id=1, names=["t1"])
+ pool2 = pool_factory(id=2, names=["t2"])
+ pool3 = pool_factory(id=3, names=["t3"])
pool1.creation_time = datetime(1991, 1, 1)
pool2.creation_time = datetime(1991, 1, 2)
pool3.creation_time = datetime(1991, 1, 3)
@@ -289,18 +345,22 @@ def test_sort_by_creation_time(
verify_unpaged(input, expected_pool_names)
-@pytest.mark.parametrize('input,expected_pool_names', [
- ('', ['t1', 't2', 't3']),
- ('sort:last-edit-date', ['t3', 't2', 't1']),
- ('sort:last-edit-time', ['t3', 't2', 't1']),
- ('sort:edit-date', ['t3', 't2', 't1']),
- ('sort:edit-time', ['t3', 't2', 't1']),
-])
+@pytest.mark.parametrize(
+ "input,expected_pool_names",
+ [
+ ("", ["t1", "t2", "t3"]),
+ ("sort:last-edit-date", ["t3", "t2", "t1"]),
+ ("sort:last-edit-time", ["t3", "t2", "t1"]),
+ ("sort:edit-date", ["t3", "t2", "t1"]),
+ ("sort:edit-time", ["t3", "t2", "t1"]),
+ ],
+)
def test_sort_by_last_edit_time(
- verify_unpaged, pool_factory, input, expected_pool_names):
- pool1 = pool_factory(id=1, names=['t1'])
- pool2 = pool_factory(id=2, names=['t2'])
- pool3 = pool_factory(id=3, names=['t3'])
+ verify_unpaged, pool_factory, input, expected_pool_names
+):
+ pool1 = pool_factory(id=1, names=["t1"])
+ pool2 = pool_factory(id=2, names=["t2"])
+ pool3 = pool_factory(id=3, names=["t3"])
pool1.last_edit_time = datetime(1991, 1, 1)
pool2.last_edit_time = datetime(1991, 1, 2)
pool3.last_edit_time = datetime(1991, 1, 3)
@@ -309,19 +369,16 @@ def test_sort_by_last_edit_time(
verify_unpaged(input, expected_pool_names)
-@pytest.mark.parametrize('input,expected_pool_names', [
- ('sort:post-count', ['t2', 't1']),
-])
+@pytest.mark.parametrize(
+ "input,expected_pool_names", [("sort:post-count", ["t2", "t1"]),]
+)
def test_sort_by_post_count(
- verify_unpaged,
- pool_factory,
- post_factory,
- input,
- expected_pool_names):
+ verify_unpaged, pool_factory, post_factory, input, expected_pool_names
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
- pool1 = pool_factory(id=1, names=['t1'])
- pool2 = pool_factory(id=2, names=['t2'])
+ pool1 = pool_factory(id=1, names=["t1"])
+ pool2 = pool_factory(id=2, names=["t2"])
db.session.add_all([post1, post2, pool1, pool2])
pool1.posts.append(post1)
pool2.posts.append(post1)
@@ -330,20 +387,21 @@ def test_sort_by_post_count(
verify_unpaged(input, expected_pool_names)
-@pytest.mark.parametrize('input,expected_pool_names', [
- ('sort:category', ['t3', 't1', 't2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_pool_names", [("sort:category", ["t3", "t1", "t2"]),]
+)
def test_sort_by_category(
- verify_unpaged,
- pool_factory,
- pool_category_factory,
- input,
- expected_pool_names):
- cat1 = pool_category_factory(name='cat1')
- cat2 = pool_category_factory(name='cat2')
- pool1 = pool_factory(id=1, names=['t1'], category=cat2)
- pool2 = pool_factory(id=2, names=['t2'], category=cat2)
- pool3 = pool_factory(id=3, names=['t3'], category=cat1)
+ verify_unpaged,
+ pool_factory,
+ pool_category_factory,
+ input,
+ expected_pool_names,
+):
+ cat1 = pool_category_factory(name="cat1")
+ cat2 = pool_category_factory(name="cat2")
+ pool1 = pool_factory(id=1, names=["t1"], category=cat2)
+ pool2 = pool_factory(id=2, names=["t2"], category=cat2)
+ pool3 = pool_factory(id=3, names=["t3"], category=cat1)
db.session.add_all([pool1, pool2, pool3])
db.session.flush()
verify_unpaged(input, expected_pool_names)
diff --git a/server/szurubooru/tests/search/configs/test_post_search_config.py b/server/szurubooru/tests/search/configs/test_post_search_config.py
index 462594c..172d1ff 100644
--- a/server/szurubooru/tests/search/configs/test_post_search_config.py
+++ b/server/szurubooru/tests/search/configs/test_post_search_config.py
@@ -1,15 +1,17 @@
from datetime import datetime
+
import pytest
-from szurubooru import db, model, errors, search
+
+from szurubooru import db, errors, model, search
@pytest.fixture
def fav_factory(user_factory):
def factory(post, user=None):
return model.PostFavorite(
- post=post,
- user=user or user_factory(),
- time=datetime.utcnow())
+ post=post, user=user or user_factory(), time=datetime.utcnow()
+ )
+
return factory
@@ -20,14 +22,17 @@ def score_factory(user_factory):
post=post,
user=user or user_factory(),
time=datetime.utcnow(),
- score=score)
+ score=score,
+ )
+
return factory
@pytest.fixture
def note_factory():
- def factory(text='...'):
- return model.PostNote(polygon='...', text=text)
+ def factory(text="..."):
+ return model.PostNote(polygon="...", text=text)
+
return factory
@@ -36,11 +41,10 @@ def feature_factory(user_factory):
def factory(post=None):
if post:
return model.PostFeature(
- time=datetime.utcnow(),
- user=user_factory(),
- post=post)
- return model.PostFeature(
- time=datetime.utcnow(), user=user_factory())
+ time=datetime.utcnow(), user=user_factory(), post=post
+ )
+ return model.PostFeature(time=datetime.utcnow(), user=user_factory())
+
return factory
@@ -57,6 +61,7 @@ def auth_executor(executor, user_factory):
db.session.flush()
executor.config.user = auth_user
return auth_user
+
return wrapper
@@ -64,21 +69,22 @@ def auth_executor(executor, user_factory):
def verify_unpaged(executor):
def verify(input, expected_post_ids, test_order=False):
actual_count, actual_posts = executor.execute(
- input, offset=0, limit=100)
+ input, offset=0, limit=100
+ )
actual_post_ids = list([p.post_id for p in actual_posts])
if not test_order:
actual_post_ids = sorted(actual_post_ids)
expected_post_ids = sorted(expected_post_ids)
assert actual_post_ids == expected_post_ids
assert actual_count == len(expected_post_ids)
+
return verify
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('id:1', [1]),
- ('id:3', [3]),
- ('id:1,3', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [("id:1", [1]), ("id:3", [3]), ("id:1,3", [1, 3]),],
+)
def test_filter_by_id(verify_unpaged, post_factory, input, expected_post_ids):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
@@ -88,35 +94,39 @@ def test_filter_by_id(verify_unpaged, post_factory, input, expected_post_ids):
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('tag:t1', [1]),
- ('tag:t2', [2]),
- ('tag:t1,t2', [1, 2]),
- ('tag:t4a', [4]),
- ('tag:t4b', [4]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("tag:t1", [1]),
+ ("tag:t2", [2]),
+ ("tag:t1,t2", [1, 2]),
+ ("tag:t4a", [4]),
+ ("tag:t4b", [4]),
+ ],
+)
def test_filter_by_tag(
- verify_unpaged, post_factory, tag_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, tag_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
post4 = post_factory(id=4)
- post1.tags = [tag_factory(names=['t1'])]
- post2.tags = [tag_factory(names=['t2'])]
- post3.tags = [tag_factory(names=['t3'])]
- post4.tags = [tag_factory(names=['t4a', 't4b'])]
+ post1.tags = [tag_factory(names=["t1"])]
+ post2.tags = [tag_factory(names=["t2"])]
+ post3.tags = [tag_factory(names=["t3"])]
+ post4.tags = [tag_factory(names=["t4a", "t4b"])]
db.session.add_all([post1, post2, post3, post4])
db.session.flush()
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('score:1', [1]),
- ('score:3', [3]),
- ('score:1,3', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [("score:1", [1]), ("score:3", [3]), ("score:1,3", [1, 3]),],
+)
def test_filter_by_score(
- verify_unpaged, post_factory, user_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, user_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
@@ -126,96 +136,111 @@ def test_filter_by_score(
score=post.post_id,
time=datetime.utcnow(),
post=post,
- user=user_factory()))
+ user=user_factory(),
+ )
+ )
db.session.add_all([post1, post2, post3])
db.session.flush()
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('uploader:', [4]),
- ('uploader:u1', [1]),
- ('uploader:u3', [3]),
- ('uploader:u1,u3', [1, 3]),
- ('upload:', [4]),
- ('upload:u1', [1]),
- ('upload:u3', [3]),
- ('upload:u1,u3', [1, 3]),
- ('submit:', [4]),
- ('submit:u1', [1]),
- ('submit:u3', [3]),
- ('submit:u1,u3', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("uploader:", [4]),
+ ("uploader:u1", [1]),
+ ("uploader:u3", [3]),
+ ("uploader:u1,u3", [1, 3]),
+ ("upload:", [4]),
+ ("upload:u1", [1]),
+ ("upload:u3", [3]),
+ ("upload:u1,u3", [1, 3]),
+ ("submit:", [4]),
+ ("submit:u1", [1]),
+ ("submit:u3", [3]),
+ ("submit:u1,u3", [1, 3]),
+ ],
+)
def test_filter_by_uploader(
- verify_unpaged, post_factory, user_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, user_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
post4 = post_factory(id=4)
- post1.user = user_factory(name='u1')
- post2.user = user_factory(name='u2')
- post3.user = user_factory(name='u3')
+ post1.user = user_factory(name="u1")
+ post2.user = user_factory(name="u2")
+ post3.user = user_factory(name="u3")
db.session.add_all([post1, post2, post3, post4])
db.session.flush()
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('comment:u1', [1]),
- ('comment:u3', [3]),
- ('comment:u1,u3', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [("comment:u1", [1]), ("comment:u3", [3]), ("comment:u1,u3", [1, 3]),],
+)
def test_filter_by_commenter(
- verify_unpaged,
- post_factory,
- user_factory,
- comment_factory,
- input,
- expected_post_ids):
+ verify_unpaged,
+ post_factory,
+ user_factory,
+ comment_factory,
+ input,
+ expected_post_ids,
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
- db.session.add_all([
- comment_factory(post=post1, user=user_factory(name='u1')),
- comment_factory(post=post2, user=user_factory(name='u2')),
- comment_factory(post=post3, user=user_factory(name='u3')),
- post1, post2, post3,
- ])
+ db.session.add_all(
+ [
+ comment_factory(post=post1, user=user_factory(name="u1")),
+ comment_factory(post=post2, user=user_factory(name="u2")),
+ comment_factory(post=post3, user=user_factory(name="u3")),
+ post1,
+ post2,
+ post3,
+ ]
+ )
db.session.flush()
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('fav:u1', [1]),
- ('fav:u3', [3]),
- ('fav:u1,u3', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [("fav:u1", [1]), ("fav:u3", [3]), ("fav:u1,u3", [1, 3]),],
+)
def test_filter_by_favorite(
- verify_unpaged,
- post_factory,
- user_factory,
- fav_factory,
- input,
- expected_post_ids):
+ verify_unpaged,
+ post_factory,
+ user_factory,
+ fav_factory,
+ input,
+ expected_post_ids,
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
- db.session.add_all([
- fav_factory(post=post1, user=user_factory(name='u1')),
- fav_factory(post=post2, user=user_factory(name='u2')),
- fav_factory(post=post3, user=user_factory(name='u3')),
- post1, post2, post3])
+ db.session.add_all(
+ [
+ fav_factory(post=post1, user=user_factory(name="u1")),
+ fav_factory(post=post2, user=user_factory(name="u2")),
+ fav_factory(post=post3, user=user_factory(name="u3")),
+ post1,
+ post2,
+ post3,
+ ]
+ )
db.session.flush()
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('tag-count:1', [1]),
- ('tag-count:3', [3]),
- ('tag-count:1,3', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [("tag-count:1", [1]), ("tag-count:3", [3]), ("tag-count:1,3", [1, 3]),],
+)
def test_filter_by_tag_count(
- verify_unpaged, post_factory, tag_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, tag_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
@@ -227,61 +252,75 @@ def test_filter_by_tag_count(
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('comment-count:1', [1]),
- ('comment-count:3', [3]),
- ('comment-count:1,3', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("comment-count:1", [1]),
+ ("comment-count:3", [3]),
+ ("comment-count:1,3", [1, 3]),
+ ],
+)
def test_filter_by_comment_count(
- verify_unpaged,
- post_factory,
- comment_factory,
- input,
- expected_post_ids):
+ verify_unpaged, post_factory, comment_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
- db.session.add_all([
- comment_factory(post=post1),
- comment_factory(post=post2),
- comment_factory(post=post2),
- comment_factory(post=post3),
- comment_factory(post=post3),
- comment_factory(post=post3),
- post1, post2, post3])
+ db.session.add_all(
+ [
+ comment_factory(post=post1),
+ comment_factory(post=post2),
+ comment_factory(post=post2),
+ comment_factory(post=post3),
+ comment_factory(post=post3),
+ comment_factory(post=post3),
+ post1,
+ post2,
+ post3,
+ ]
+ )
db.session.flush()
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('fav-count:1', [1]),
- ('fav-count:3', [3]),
- ('fav-count:1,3', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [("fav-count:1", [1]), ("fav-count:3", [3]), ("fav-count:1,3", [1, 3]),],
+)
def test_filter_by_favorite_count(
- verify_unpaged, post_factory, fav_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, fav_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
- db.session.add_all([
- fav_factory(post=post1),
- fav_factory(post=post2),
- fav_factory(post=post2),
- fav_factory(post=post3),
- fav_factory(post=post3),
- fav_factory(post=post3),
- post1, post2, post3])
+ db.session.add_all(
+ [
+ fav_factory(post=post1),
+ fav_factory(post=post2),
+ fav_factory(post=post2),
+ fav_factory(post=post3),
+ fav_factory(post=post3),
+ fav_factory(post=post3),
+ post1,
+ post2,
+ post3,
+ ]
+ )
db.session.flush()
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('note-count:1', [1]),
- ('note-count:3', [3]),
- ('note-count:1,3', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("note-count:1", [1]),
+ ("note-count:3", [3]),
+ ("note-count:1,3", [1, 3]),
+ ],
+)
def test_filter_by_note_count(
- verify_unpaged, post_factory, note_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, note_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
@@ -293,36 +332,40 @@ def test_filter_by_note_count(
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('note-text:*', [1, 2, 3]),
- ('note-text:text2', [2]),
- ('note-text:text3*', [3]),
- ('note-text:text3a,text2', [2, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("note-text:*", [1, 2, 3]),
+ ("note-text:text2", [2]),
+ ("note-text:text3*", [3]),
+ ("note-text:text3a,text2", [2, 3]),
+ ],
+)
def test_filter_by_note_text(
- verify_unpaged, post_factory, note_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, note_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
- post1.notes = [note_factory(text='text1')]
- post2.notes = [note_factory(text='text2'), note_factory(text='text2')]
- post3.notes = [note_factory(text='text3a'), note_factory(text='text3b')]
+ post1.notes = [note_factory(text="text1")]
+ post2.notes = [note_factory(text="text2"), note_factory(text="text2")]
+ post3.notes = [note_factory(text="text3a"), note_factory(text="text3b")]
db.session.add_all([post1, post2, post3])
db.session.flush()
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('feature-count:1', [1]),
- ('feature-count:3', [3]),
- ('feature-count:1,3', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("feature-count:1", [1]),
+ ("feature-count:3", [3]),
+ ("feature-count:1,3", [1, 3]),
+ ],
+)
def test_filter_by_feature_count(
- verify_unpaged,
- post_factory,
- feature_factory,
- input,
- expected_post_ids):
+ verify_unpaged, post_factory, feature_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
@@ -334,18 +377,22 @@ def test_filter_by_feature_count(
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('type:image', [1]),
- ('type:anim', [2]),
- ('type:animation', [2]),
- ('type:gif', [2]),
- ('type:video', [3]),
- ('type:webm', [3]),
- ('type:flash', [4]),
- ('type:swf', [4]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("type:image", [1]),
+ ("type:anim", [2]),
+ ("type:animation", [2]),
+ ("type:gif", [2]),
+ ("type:video", [3]),
+ ("type:webm", [3]),
+ ("type:flash", [4]),
+ ("type:swf", [4]),
+ ],
+)
def test_filter_by_type(
- verify_unpaged, post_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
@@ -359,14 +406,18 @@ def test_filter_by_type(
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('safety:safe', [1]),
- ('safety:sketchy', [2]),
- ('safety:questionable', [2]),
- ('safety:unsafe', [3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("safety:safe", [1]),
+ ("safety:sketchy", [2]),
+ ("safety:questionable", [2]),
+ ("safety:unsafe", [3]),
+ ],
+)
def test_filter_by_safety(
- verify_unpaged, post_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
@@ -380,34 +431,42 @@ def test_filter_by_safety(
def test_filter_by_invalid_type(executor):
with pytest.raises(errors.SearchError):
- executor.execute('type:invalid', offset=0, limit=100)
+ executor.execute("type:invalid", offset=0, limit=100)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('content-checksum:checksum1', [1]),
- ('content-checksum:checksum3', [3]),
- ('content-checksum:checksum1,checksum3', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("content-checksum:checksum1", [1]),
+ ("content-checksum:checksum3", [3]),
+ ("content-checksum:checksum1,checksum3", [1, 3]),
+ ],
+)
def test_filter_by_content_checksum(
- verify_unpaged, post_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
- post1.checksum = 'checksum1'
- post2.checksum = 'checksum2'
- post3.checksum = 'checksum3'
+ post1.checksum = "checksum1"
+ post2.checksum = "checksum2"
+ post3.checksum = "checksum3"
db.session.add_all([post1, post2, post3])
db.session.flush()
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('file-size:100', [1]),
- ('file-size:102', [3]),
- ('file-size:100,102', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("file-size:100", [1]),
+ ("file-size:102", [3]),
+ ("file-size:100,102", [1, 3]),
+ ],
+)
def test_filter_by_file_size(
- verify_unpaged, post_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
@@ -419,25 +478,29 @@ def test_filter_by_file_size(
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('image-width:100', [1]),
- ('image-width:200', [2]),
- ('image-width:100,300', [1, 3]),
- ('image-height:200', [1]),
- ('image-height:100', [2]),
- ('image-height:200,300', [1, 3]),
- ('image-area:20000', [1, 2]),
- ('image-area:90000', [3]),
- ('image-area:20000,90000', [1, 2, 3]),
- ('image-ar:1', [3]),
- ('image-ar:..0.9', [1, 4]),
- ('image-ar:1.1..', [2]),
- ('image-ar:1/1..1/1', [3]),
- ('image-ar:1:1..1:1', [3]),
- ('image-ar:0.62..0.63', [4]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("image-width:100", [1]),
+ ("image-width:200", [2]),
+ ("image-width:100,300", [1, 3]),
+ ("image-height:200", [1]),
+ ("image-height:100", [2]),
+ ("image-height:200,300", [1, 3]),
+ ("image-area:20000", [1, 2]),
+ ("image-area:90000", [3]),
+ ("image-area:20000,90000", [1, 2, 3]),
+ ("image-ar:1", [3]),
+ ("image-ar:..0.9", [1, 4]),
+ ("image-ar:1.1..", [2]),
+ ("image-ar:1/1..1/1", [3]),
+ ("image-ar:1:1..1:1", [3]),
+ ("image-ar:0.62..0.63", [4]),
+ ],
+)
def test_filter_by_image_size(
- verify_unpaged, post_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
@@ -457,25 +520,29 @@ def test_filter_by_image_size(
def test_filter_by_invalid_aspect_ratio(executor):
with pytest.raises(errors.SearchError):
- executor.execute('image-ar:1:1:1', offset=0, limit=100)
-
-
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('creation-date:2014', [1]),
- ('creation-date:2016', [3]),
- ('creation-date:2014,2016', [1, 3]),
- ('creation-time:2014', [1]),
- ('creation-time:2016', [3]),
- ('creation-time:2014,2016', [1, 3]),
- ('date:2014', [1]),
- ('date:2016', [3]),
- ('date:2014,2016', [1, 3]),
- ('time:2014', [1]),
- ('time:2016', [3]),
- ('time:2014,2016', [1, 3]),
-])
+ executor.execute("image-ar:1:1:1", offset=0, limit=100)
+
+
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("creation-date:2014", [1]),
+ ("creation-date:2016", [3]),
+ ("creation-date:2014,2016", [1, 3]),
+ ("creation-time:2014", [1]),
+ ("creation-time:2016", [3]),
+ ("creation-time:2014,2016", [1, 3]),
+ ("date:2014", [1]),
+ ("date:2016", [3]),
+ ("date:2014,2016", [1, 3]),
+ ("time:2014", [1]),
+ ("time:2016", [3]),
+ ("time:2014,2016", [1, 3]),
+ ],
+)
def test_filter_by_creation_time(
- verify_unpaged, post_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
@@ -487,22 +554,26 @@ def test_filter_by_creation_time(
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('last-edit-date:2014', [1]),
- ('last-edit-date:2016', [3]),
- ('last-edit-date:2014,2016', [1, 3]),
- ('last-edit-time:2014', [1]),
- ('last-edit-time:2016', [3]),
- ('last-edit-time:2014,2016', [1, 3]),
- ('edit-date:2014', [1]),
- ('edit-date:2016', [3]),
- ('edit-date:2014,2016', [1, 3]),
- ('edit-time:2014', [1]),
- ('edit-time:2016', [3]),
- ('edit-time:2014,2016', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("last-edit-date:2014", [1]),
+ ("last-edit-date:2016", [3]),
+ ("last-edit-date:2014,2016", [1, 3]),
+ ("last-edit-time:2014", [1]),
+ ("last-edit-time:2016", [3]),
+ ("last-edit-time:2014,2016", [1, 3]),
+ ("edit-date:2014", [1]),
+ ("edit-date:2016", [3]),
+ ("edit-date:2014,2016", [1, 3]),
+ ("edit-time:2014", [1]),
+ ("edit-time:2016", [3]),
+ ("edit-time:2014,2016", [1, 3]),
+ ],
+)
def test_filter_by_last_edit_time(
- verify_unpaged, post_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
@@ -514,20 +585,20 @@ def test_filter_by_last_edit_time(
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('comment-date:2014', [1]),
- ('comment-date:2016', [3]),
- ('comment-date:2014,2016', [1, 3]),
- ('comment-time:2014', [1]),
- ('comment-time:2016', [3]),
- ('comment-time:2014,2016', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("comment-date:2014", [1]),
+ ("comment-date:2016", [3]),
+ ("comment-date:2014,2016", [1, 3]),
+ ("comment-time:2014", [1]),
+ ("comment-time:2016", [3]),
+ ("comment-time:2014,2016", [1, 3]),
+ ],
+)
def test_filter_by_comment_date(
- verify_unpaged,
- post_factory,
- comment_factory,
- input,
- expected_post_ids):
+ verify_unpaged, post_factory, comment_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
@@ -542,16 +613,20 @@ def test_filter_by_comment_date(
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('fav-date:2014', [1]),
- ('fav-date:2016', [3]),
- ('fav-date:2014,2016', [1, 3]),
- ('fav-time:2014', [1]),
- ('fav-time:2016', [3]),
- ('fav-time:2014,2016', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("fav-date:2014", [1]),
+ ("fav-date:2016", [3]),
+ ("fav-date:2014,2016", [1, 3]),
+ ("fav-time:2014", [1]),
+ ("fav-time:2016", [3]),
+ ("fav-time:2014,2016", [1, 3]),
+ ],
+)
def test_filter_by_fav_date(
- verify_unpaged, post_factory, fav_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, fav_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
@@ -566,20 +641,20 @@ def test_filter_by_fav_date(
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('feature-date:2014', [1]),
- ('feature-date:2016', [3]),
- ('feature-date:2014,2016', [1, 3]),
- ('feature-time:2014', [1]),
- ('feature-time:2016', [3]),
- ('feature-time:2014,2016', [1, 3]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("feature-date:2014", [1]),
+ ("feature-date:2016", [3]),
+ ("feature-date:2014,2016", [1, 3]),
+ ("feature-time:2014", [1]),
+ ("feature-time:2016", [3]),
+ ("feature-time:2014,2016", [1, 3]),
+ ],
+)
def test_filter_by_feature_date(
- verify_unpaged,
- post_factory,
- feature_factory,
- input,
- expected_post_ids):
+ verify_unpaged, post_factory, feature_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
@@ -594,37 +669,40 @@ def test_filter_by_feature_date(
verify_unpaged(input, expected_post_ids)
-@pytest.mark.parametrize('input', [
- 'sort:random',
- 'sort:id',
- 'sort:score',
- 'sort:tag-count',
- 'sort:comment-count',
- 'sort:fav-count',
- 'sort:note-count',
- 'sort:feature-count',
- 'sort:file-size',
- 'sort:image-width',
- 'sort:width',
- 'sort:image-height',
- 'sort:height',
- 'sort:image-area',
- 'sort:area',
- 'sort:creation-date',
- 'sort:creation-time',
- 'sort:date',
- 'sort:time',
- 'sort:last-edit-date',
- 'sort:last-edit-time',
- 'sort:edit-date',
- 'sort:edit-time',
- 'sort:comment-date',
- 'sort:comment-time',
- 'sort:fav-date',
- 'sort:fav-time',
- 'sort:feature-date',
- 'sort:feature-time',
-])
+@pytest.mark.parametrize(
+ "input",
+ [
+ "sort:random",
+ "sort:id",
+ "sort:score",
+ "sort:tag-count",
+ "sort:comment-count",
+ "sort:fav-count",
+ "sort:note-count",
+ "sort:feature-count",
+ "sort:file-size",
+ "sort:image-width",
+ "sort:width",
+ "sort:image-height",
+ "sort:height",
+ "sort:image-area",
+ "sort:area",
+ "sort:creation-date",
+ "sort:creation-time",
+ "sort:date",
+ "sort:time",
+ "sort:last-edit-date",
+ "sort:last-edit-time",
+ "sort:edit-date",
+ "sort:edit-time",
+ "sort:comment-date",
+ "sort:comment-time",
+ "sort:fav-date",
+ "sort:fav-time",
+ "sort:feature-date",
+ "sort:feature-time",
+ ],
+)
def test_sort_tokens(verify_unpaged, post_factory, input):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
@@ -634,115 +712,124 @@ def test_sort_tokens(verify_unpaged, post_factory, input):
verify_unpaged(input, [1, 2, 3])
-@pytest.mark.parametrize('input,expected_post_ids', [
- ('', [1, 2, 3, 4]),
- ('t1', [1]),
- ('t2', [2]),
- ('t1,t2', [1, 2]),
- ('t4a', [4]),
- ('t4b', [4]),
-])
+@pytest.mark.parametrize(
+ "input,expected_post_ids",
+ [
+ ("", [1, 2, 3, 4]),
+ ("t1", [1]),
+ ("t2", [2]),
+ ("t1,t2", [1, 2]),
+ ("t4a", [4]),
+ ("t4b", [4]),
+ ],
+)
def test_anonymous(
- verify_unpaged, post_factory, tag_factory, input, expected_post_ids):
+ verify_unpaged, post_factory, tag_factory, input, expected_post_ids
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
post4 = post_factory(id=4)
- post1.tags = [tag_factory(names=['t1'])]
- post2.tags = [tag_factory(names=['t2'])]
- post3.tags = [tag_factory(names=['t3'])]
- post4.tags = [tag_factory(names=['t4a', 't4b'])]
+ post1.tags = [tag_factory(names=["t1"])]
+ post2.tags = [tag_factory(names=["t2"])]
+ post3.tags = [tag_factory(names=["t3"])]
+ post4.tags = [tag_factory(names=["t4a", "t4b"])]
db.session.add_all([post1, post2, post3, post4])
db.session.flush()
verify_unpaged(input, expected_post_ids)
def test_own_liked(
- auth_executor,
- post_factory,
- score_factory,
- user_factory,
- verify_unpaged):
+ auth_executor, post_factory, score_factory, user_factory, verify_unpaged
+):
auth_user = auth_executor()
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
- db.session.add_all([
- score_factory(post=post1, user=auth_user, score=1),
- score_factory(post=post2, user=user_factory(name='dummy'), score=1),
- score_factory(post=post3, user=auth_user, score=-1),
- post1, post2, post3,
- ])
+ db.session.add_all(
+ [
+ score_factory(post=post1, user=auth_user, score=1),
+ score_factory(
+ post=post2, user=user_factory(name="dummy"), score=1
+ ),
+ score_factory(post=post3, user=auth_user, score=-1),
+ post1,
+ post2,
+ post3,
+ ]
+ )
db.session.flush()
- verify_unpaged('special:liked', [1])
- verify_unpaged('-special:liked', [2, 3])
+ verify_unpaged("special:liked", [1])
+ verify_unpaged("-special:liked", [2, 3])
def test_own_disliked(
- auth_executor,
- post_factory,
- score_factory,
- user_factory,
- verify_unpaged):
+ auth_executor, post_factory, score_factory, user_factory, verify_unpaged
+):
auth_user = auth_executor()
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
- db.session.add_all([
- score_factory(post=post1, user=auth_user, score=-1),
- score_factory(post=post2, user=user_factory(name='dummy'), score=-1),
- score_factory(post=post3, user=auth_user, score=1),
- post1, post2, post3,
- ])
+ db.session.add_all(
+ [
+ score_factory(post=post1, user=auth_user, score=-1),
+ score_factory(
+ post=post2, user=user_factory(name="dummy"), score=-1
+ ),
+ score_factory(post=post3, user=auth_user, score=1),
+ post1,
+ post2,
+ post3,
+ ]
+ )
db.session.flush()
- verify_unpaged('special:disliked', [1])
- verify_unpaged('-special:disliked', [2, 3])
+ verify_unpaged("special:disliked", [1])
+ verify_unpaged("-special:disliked", [2, 3])
-@pytest.mark.parametrize('input', [
- 'liked:x',
- 'disliked:x',
-])
+@pytest.mark.parametrize("input", ["liked:x", "disliked:x",])
def test_someones_score(executor, input):
with pytest.raises(errors.SearchError):
executor.execute(input, offset=0, limit=100)
def test_own_fav(
- auth_executor,
- post_factory,
- fav_factory,
- user_factory,
- verify_unpaged):
+ auth_executor, post_factory, fav_factory, user_factory, verify_unpaged
+):
auth_user = auth_executor()
post1 = post_factory(id=1)
post2 = post_factory(id=2)
- db.session.add_all([
- fav_factory(post=post1, user=auth_user),
- fav_factory(post=post2, user=user_factory(name='unrelated')),
- post1, post2,
- ])
+ db.session.add_all(
+ [
+ fav_factory(post=post1, user=auth_user),
+ fav_factory(post=post2, user=user_factory(name="unrelated")),
+ post1,
+ post2,
+ ]
+ )
db.session.flush()
- verify_unpaged('special:fav', [1])
- verify_unpaged('-special:fav', [2])
+ verify_unpaged("special:fav", [1])
+ verify_unpaged("-special:fav", [2])
def test_tumbleweed(
- post_factory,
- fav_factory,
- comment_factory,
- score_factory,
- verify_unpaged):
+ post_factory, fav_factory, comment_factory, score_factory, verify_unpaged
+):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
post4 = post_factory(id=4)
- db.session.add_all([
- comment_factory(post=post1),
- score_factory(post=post2),
- fav_factory(post=post3),
- post1, post2, post3, post4,
- ])
+ db.session.add_all(
+ [
+ comment_factory(post=post1),
+ score_factory(post=post2),
+ fav_factory(post=post3),
+ post1,
+ post2,
+ post3,
+ post4,
+ ]
+ )
db.session.flush()
- verify_unpaged('special:tumbleweed', [4])
- verify_unpaged('-special:tumbleweed', [1, 2, 3])
+ verify_unpaged("special:tumbleweed", [4])
+ verify_unpaged("-special:tumbleweed", [1, 2, 3])
diff --git a/server/szurubooru/tests/search/configs/test_tag_search_config.py b/server/szurubooru/tests/search/configs/test_tag_search_config.py
index 09a4c40..2ba1b9b 100644
--- a/server/szurubooru/tests/search/configs/test_tag_search_config.py
+++ b/server/szurubooru/tests/search/configs/test_tag_search_config.py
@@ -1,5 +1,7 @@
from datetime import datetime
+
import pytest
+
from szurubooru import db, errors, search
@@ -12,77 +14,104 @@ def executor():
def verify_unpaged(executor):
def verify(input, expected_tag_names):
actual_count, actual_tags = executor.execute(
- input, offset=0, limit=100)
+ input, offset=0, limit=100
+ )
actual_tag_names = [u.names[0].name for u in actual_tags]
assert actual_count == len(expected_tag_names)
assert actual_tag_names == expected_tag_names
+
return verify
-@pytest.mark.parametrize('input,expected_tag_names', [
- ('', ['t1', 't2']),
- ('t1', ['t1']),
- ('t2', ['t2']),
- ('t1,t2', ['t1', 't2']),
- ('T1,T2', ['t1', 't2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_tag_names",
+ [
+ ("", ["t1", "t2"]),
+ ("t1", ["t1"]),
+ ("t2", ["t2"]),
+ ("t1,t2", ["t1", "t2"]),
+ ("T1,T2", ["t1", "t2"]),
+ ],
+)
def test_filter_anonymous(
- verify_unpaged, tag_factory, input, expected_tag_names):
- db.session.add(tag_factory(names=['t1']))
- db.session.add(tag_factory(names=['t2']))
+ verify_unpaged, tag_factory, input, expected_tag_names
+):
+ db.session.add(tag_factory(names=["t1"]))
+ db.session.add(tag_factory(names=["t2"]))
db.session.flush()
verify_unpaged(input, expected_tag_names)
-@pytest.mark.parametrize('db_driver,input,expected_tag_names', [
- (None, ',', None),
- (None, 't1,', None),
- (None, 't1,t2', ['t1', 't2']),
- (None, 't1\\,', []),
- (None, 'asd..asd', None),
- (None, 'asd\\..asd', []),
- (None, 'asd.\\.asd', []),
- (None, 'asd\\.\\.asd', []),
- (None, '-', None),
- (None, '\\-', ['-']),
- (None, '--', [
- 't1', 't2', '*', '*asd*', ':', 'asd:asd', '\\', '\\asd', '-asd',
- ]),
- (None, '\\--', []),
- (None, '-\\-', [
- 't1', 't2', '*', '*asd*', ':', 'asd:asd', '\\', '\\asd', '-asd',
- ]),
- (None, '-*', []),
- (None, '\\-*', ['-', '-asd']),
- (None, ':', None),
- (None, '\\:', [':']),
- (None, '\\:asd', []),
- (None, '*\\:*', [':', 'asd:asd']),
- (None, 'asd:asd', None),
- (None, 'asd\\:asd', ['asd:asd']),
- (None, '*', [
- 't1', 't2', '*', '*asd*', ':', 'asd:asd', '\\', '\\asd', '-', '-asd'
- ]),
- (None, '\\*', ['*']),
- (None, '\\', None),
- (None, '\\asd', None),
- ('psycopg2', '\\\\', ['\\']),
- ('psycopg2', '\\\\asd', ['\\asd']),
-])
-def test_escaping(
- executor, tag_factory, input, expected_tag_names, db_driver):
- db.session.add_all([
- tag_factory(names=['t1']),
- tag_factory(names=['t2']),
- tag_factory(names=['*']),
- tag_factory(names=['*asd*']),
- tag_factory(names=[':']),
- tag_factory(names=['asd:asd']),
- tag_factory(names=['\\']),
- tag_factory(names=['\\asd']),
- tag_factory(names=['-']),
- tag_factory(names=['-asd'])
- ])
+@pytest.mark.parametrize(
+ "db_driver,input,expected_tag_names",
+ [
+ (None, ",", None),
+ (None, "t1,", None),
+ (None, "t1,t2", ["t1", "t2"]),
+ (None, "t1\\,", []),
+ (None, "asd..asd", None),
+ (None, "asd\\..asd", []),
+ (None, "asd.\\.asd", []),
+ (None, "asd\\.\\.asd", []),
+ (None, "-", None),
+ (None, "\\-", ["-"]),
+ (
+ None,
+ "--",
+ ["t1", "t2", "*", "*asd*", ":", "asd:asd", "\\", "\\asd", "-asd",],
+ ),
+ (None, "\\--", []),
+ (
+ None,
+ "-\\-",
+ ["t1", "t2", "*", "*asd*", ":", "asd:asd", "\\", "\\asd", "-asd",],
+ ),
+ (None, "-*", []),
+ (None, "\\-*", ["-", "-asd"]),
+ (None, ":", None),
+ (None, "\\:", [":"]),
+ (None, "\\:asd", []),
+ (None, "*\\:*", [":", "asd:asd"]),
+ (None, "asd:asd", None),
+ (None, "asd\\:asd", ["asd:asd"]),
+ (
+ None,
+ "*",
+ [
+ "t1",
+ "t2",
+ "*",
+ "*asd*",
+ ":",
+ "asd:asd",
+ "\\",
+ "\\asd",
+ "-",
+ "-asd",
+ ],
+ ),
+ (None, "\\*", ["*"]),
+ (None, "\\", None),
+ (None, "\\asd", None),
+ ("psycopg2", "\\\\", ["\\"]),
+ ("psycopg2", "\\\\asd", ["\\asd"]),
+ ],
+)
+def test_escaping(executor, tag_factory, input, expected_tag_names, db_driver):
+ db.session.add_all(
+ [
+ tag_factory(names=["t1"]),
+ tag_factory(names=["t2"]),
+ tag_factory(names=["*"]),
+ tag_factory(names=["*asd*"]),
+ tag_factory(names=[":"]),
+ tag_factory(names=["asd:asd"]),
+ tag_factory(names=["\\"]),
+ tag_factory(names=["\\asd"]),
+ tag_factory(names=["-"]),
+ tag_factory(names=["-asd"]),
+ ]
+ )
db.session.flush()
if db_driver and db.session.get_bind().driver != db_driver:
@@ -92,99 +121,112 @@ def test_escaping(
executor.execute(input, offset=0, limit=100)
else:
actual_count, actual_tags = executor.execute(
- input, offset=0, limit=100)
+ input, offset=0, limit=100
+ )
actual_tag_names = [u.names[0].name for u in actual_tags]
assert actual_count == len(expected_tag_names)
assert sorted(actual_tag_names) == sorted(expected_tag_names)
def test_filter_anonymous_starting_with_colon(verify_unpaged, tag_factory):
- db.session.add(tag_factory(names=[':t']))
+ db.session.add(tag_factory(names=[":t"]))
db.session.flush()
with pytest.raises(errors.SearchError):
- verify_unpaged(':t', [':t'])
- verify_unpaged('\\:t', [':t'])
-
-
-@pytest.mark.parametrize('input,expected_tag_names', [
- ('name:tag1', ['tag1']),
- ('name:tag2', ['tag2']),
- ('name:none', []),
- ('name:', []),
- ('name:*1', ['tag1']),
- ('name:*2', ['tag2']),
- ('name:*', ['tag1', 'tag2', 'tag3', 'tag4']),
- ('name:t*', ['tag1', 'tag2', 'tag3', 'tag4']),
- ('name:*a*', ['tag1', 'tag2', 'tag3', 'tag4']),
- ('name:*!*', []),
- ('name:!*', []),
- ('name:*!', []),
- ('-name:tag1', ['tag2', 'tag3', 'tag4']),
- ('-name:tag2', ['tag1', 'tag3', 'tag4']),
- ('name:tag1,tag2', ['tag1', 'tag2']),
- ('-name:tag1,tag3', ['tag2', 'tag4']),
- ('name:tag4', ['tag4']),
- ('name:tag5', ['tag4']),
- ('name:tag4,tag5', ['tag4']),
-])
+ verify_unpaged(":t", [":t"])
+ verify_unpaged("\\:t", [":t"])
+
+
+@pytest.mark.parametrize(
+ "input,expected_tag_names",
+ [
+ ("name:tag1", ["tag1"]),
+ ("name:tag2", ["tag2"]),
+ ("name:none", []),
+ ("name:", []),
+ ("name:*1", ["tag1"]),
+ ("name:*2", ["tag2"]),
+ ("name:*", ["tag1", "tag2", "tag3", "tag4"]),
+ ("name:t*", ["tag1", "tag2", "tag3", "tag4"]),
+ ("name:*a*", ["tag1", "tag2", "tag3", "tag4"]),
+ ("name:*!*", []),
+ ("name:!*", []),
+ ("name:*!", []),
+ ("-name:tag1", ["tag2", "tag3", "tag4"]),
+ ("-name:tag2", ["tag1", "tag3", "tag4"]),
+ ("name:tag1,tag2", ["tag1", "tag2"]),
+ ("-name:tag1,tag3", ["tag2", "tag4"]),
+ ("name:tag4", ["tag4"]),
+ ("name:tag5", ["tag4"]),
+ ("name:tag4,tag5", ["tag4"]),
+ ],
+)
def test_filter_by_name(
- verify_unpaged, tag_factory, input, expected_tag_names):
- db.session.add(tag_factory(names=['tag1']))
- db.session.add(tag_factory(names=['tag2']))
- db.session.add(tag_factory(names=['tag3']))
- db.session.add(tag_factory(names=['tag4', 'tag5', 'tag6']))
+ verify_unpaged, tag_factory, input, expected_tag_names
+):
+ db.session.add(tag_factory(names=["tag1"]))
+ db.session.add(tag_factory(names=["tag2"]))
+ db.session.add(tag_factory(names=["tag3"]))
+ db.session.add(tag_factory(names=["tag4", "tag5", "tag6"]))
db.session.flush()
verify_unpaged(input, expected_tag_names)
-@pytest.mark.parametrize('input,expected_tag_names', [
- ('category:cat1', ['t1', 't2']),
- ('category:cat2', ['t3']),
- ('category:cat1,cat2', ['t1', 't2', 't3']),
-])
+@pytest.mark.parametrize(
+ "input,expected_tag_names",
+ [
+ ("category:cat1", ["t1", "t2"]),
+ ("category:cat2", ["t3"]),
+ ("category:cat1,cat2", ["t1", "t2", "t3"]),
+ ],
+)
def test_filter_by_category(
- verify_unpaged,
- tag_factory,
- tag_category_factory,
- input,
- expected_tag_names):
- cat1 = tag_category_factory(name='cat1')
- cat2 = tag_category_factory(name='cat2')
- tag1 = tag_factory(names=['t1'], category=cat1)
- tag2 = tag_factory(names=['t2'], category=cat1)
- tag3 = tag_factory(names=['t3'], category=cat2)
+ verify_unpaged,
+ tag_factory,
+ tag_category_factory,
+ input,
+ expected_tag_names,
+):
+ cat1 = tag_category_factory(name="cat1")
+ cat2 = tag_category_factory(name="cat2")
+ tag1 = tag_factory(names=["t1"], category=cat1)
+ tag2 = tag_factory(names=["t2"], category=cat1)
+ tag3 = tag_factory(names=["t3"], category=cat2)
db.session.add_all([tag1, tag2, tag3])
db.session.flush()
verify_unpaged(input, expected_tag_names)
-@pytest.mark.parametrize('input,expected_tag_names', [
- ('creation-time:2014', ['t1', 't2']),
- ('creation-date:2014', ['t1', 't2']),
- ('-creation-time:2014', ['t3']),
- ('-creation-date:2014', ['t3']),
- ('creation-time:2014..2014-06', ['t1', 't2']),
- ('creation-time:2014-06..2015-01-01', ['t2', 't3']),
- ('creation-time:2014-06..', ['t2', 't3']),
- ('creation-time:..2014-06', ['t1', 't2']),
- ('-creation-time:2014..2014-06', ['t3']),
- ('-creation-time:2014-06..2015-01-01', ['t1']),
- ('creation-date:2014..2014-06', ['t1', 't2']),
- ('creation-date:2014-06..2015-01-01', ['t2', 't3']),
- ('creation-date:2014-06..', ['t2', 't3']),
- ('creation-date:..2014-06', ['t1', 't2']),
- ('-creation-date:2014..2014-06', ['t3']),
- ('-creation-date:2014-06..2015-01-01', ['t1']),
- ('creation-time:2014-01,2015', ['t1', 't3']),
- ('creation-date:2014-01,2015', ['t1', 't3']),
- ('-creation-time:2014-01,2015', ['t2']),
- ('-creation-date:2014-01,2015', ['t2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_tag_names",
+ [
+ ("creation-time:2014", ["t1", "t2"]),
+ ("creation-date:2014", ["t1", "t2"]),
+ ("-creation-time:2014", ["t3"]),
+ ("-creation-date:2014", ["t3"]),
+ ("creation-time:2014..2014-06", ["t1", "t2"]),
+ ("creation-time:2014-06..2015-01-01", ["t2", "t3"]),
+ ("creation-time:2014-06..", ["t2", "t3"]),
+ ("creation-time:..2014-06", ["t1", "t2"]),
+ ("-creation-time:2014..2014-06", ["t3"]),
+ ("-creation-time:2014-06..2015-01-01", ["t1"]),
+ ("creation-date:2014..2014-06", ["t1", "t2"]),
+ ("creation-date:2014-06..2015-01-01", ["t2", "t3"]),
+ ("creation-date:2014-06..", ["t2", "t3"]),
+ ("creation-date:..2014-06", ["t1", "t2"]),
+ ("-creation-date:2014..2014-06", ["t3"]),
+ ("-creation-date:2014-06..2015-01-01", ["t1"]),
+ ("creation-time:2014-01,2015", ["t1", "t3"]),
+ ("creation-date:2014-01,2015", ["t1", "t3"]),
+ ("-creation-time:2014-01,2015", ["t2"]),
+ ("-creation-date:2014-01,2015", ["t2"]),
+ ],
+)
def test_filter_by_creation_time(
- verify_unpaged, tag_factory, input, expected_tag_names):
- tag1 = tag_factory(names=['t1'])
- tag2 = tag_factory(names=['t2'])
- tag3 = tag_factory(names=['t3'])
+ verify_unpaged, tag_factory, input, expected_tag_names
+):
+ tag1 = tag_factory(names=["t1"])
+ tag2 = tag_factory(names=["t2"])
+ tag3 = tag_factory(names=["t3"])
tag1.creation_time = datetime(2014, 1, 1)
tag2.creation_time = datetime(2014, 6, 1)
tag3.creation_time = datetime(2015, 1, 1)
@@ -193,17 +235,21 @@ def test_filter_by_creation_time(
verify_unpaged(input, expected_tag_names)
-@pytest.mark.parametrize('input,expected_tag_names', [
- ('last-edit-date:2014', ['t1', 't3']),
- ('last-edit-time:2014', ['t1', 't3']),
- ('edit-date:2014', ['t1', 't3']),
- ('edit-time:2014', ['t1', 't3']),
-])
+@pytest.mark.parametrize(
+ "input,expected_tag_names",
+ [
+ ("last-edit-date:2014", ["t1", "t3"]),
+ ("last-edit-time:2014", ["t1", "t3"]),
+ ("edit-date:2014", ["t1", "t3"]),
+ ("edit-time:2014", ["t1", "t3"]),
+ ],
+)
def test_filter_by_edit_time(
- verify_unpaged, tag_factory, input, expected_tag_names):
- tag1 = tag_factory(names=['t1'])
- tag2 = tag_factory(names=['t2'])
- tag3 = tag_factory(names=['t3'])
+ verify_unpaged, tag_factory, input, expected_tag_names
+):
+ tag1 = tag_factory(names=["t1"])
+ tag2 = tag_factory(names=["t2"])
+ tag3 = tag_factory(names=["t3"])
tag1.last_edit_time = datetime(2014, 1, 1)
tag2.last_edit_time = datetime(2015, 1, 1)
tag3.last_edit_time = datetime(2014, 1, 1)
@@ -212,24 +258,28 @@ def test_filter_by_edit_time(
verify_unpaged(input, expected_tag_names)
-@pytest.mark.parametrize('input,expected_tag_names', [
- ('post-count:2', ['t1']),
- ('post-count:1', ['t2']),
- ('post-count:1..', ['t1', 't2']),
- ('post-count-min:1', ['t1', 't2']),
- ('post-count:..1', ['t2']),
- ('post-count-max:1', ['t2']),
- ('usage-count:2', ['t1']),
- ('usage-count:1', ['t2']),
- ('usages:2', ['t1']),
- ('usages:1', ['t2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_tag_names",
+ [
+ ("post-count:2", ["t1"]),
+ ("post-count:1", ["t2"]),
+ ("post-count:1..", ["t1", "t2"]),
+ ("post-count-min:1", ["t1", "t2"]),
+ ("post-count:..1", ["t2"]),
+ ("post-count-max:1", ["t2"]),
+ ("usage-count:2", ["t1"]),
+ ("usage-count:1", ["t2"]),
+ ("usages:2", ["t1"]),
+ ("usages:1", ["t2"]),
+ ],
+)
def test_filter_by_post_count(
- verify_unpaged, tag_factory, post_factory, input, expected_tag_names):
+ verify_unpaged, tag_factory, post_factory, input, expected_tag_names
+):
post1 = post_factory()
post2 = post_factory()
- tag1 = tag_factory(names=['t1'])
- tag2 = tag_factory(names=['t2'])
+ tag1 = tag_factory(names=["t1"])
+ tag2 = tag_factory(names=["t2"])
db.session.add_all([post1, post2, tag1, tag2])
post1.tags.append(tag1)
post1.tags.append(tag2)
@@ -238,31 +288,38 @@ def test_filter_by_post_count(
verify_unpaged(input, expected_tag_names)
-@pytest.mark.parametrize('input', [
- 'post-count:..',
- 'post-count:asd',
- 'post-count:asd,1',
- 'post-count:1,asd',
- 'post-count:asd..1',
- 'post-count:1..asd',
-])
+@pytest.mark.parametrize(
+ "input",
+ [
+ "post-count:..",
+ "post-count:asd",
+ "post-count:asd,1",
+ "post-count:1,asd",
+ "post-count:asd..1",
+ "post-count:1..asd",
+ ],
+)
def test_filter_by_invalid_input(executor, input):
with pytest.raises(errors.SearchError):
executor.execute(input, offset=0, limit=100)
-@pytest.mark.parametrize('input,expected_tag_names', [
- ('suggestion-count:2', ['t1']),
- ('suggestion-count:1', ['t2']),
- ('suggestion-count:0', ['sug1', 'sug2', 'sug3']),
-])
+@pytest.mark.parametrize(
+ "input,expected_tag_names",
+ [
+ ("suggestion-count:2", ["t1"]),
+ ("suggestion-count:1", ["t2"]),
+ ("suggestion-count:0", ["sug1", "sug2", "sug3"]),
+ ],
+)
def test_filter_by_suggestion_count(
- verify_unpaged, tag_factory, input, expected_tag_names):
- sug1 = tag_factory(names=['sug1'])
- sug2 = tag_factory(names=['sug2'])
- sug3 = tag_factory(names=['sug3'])
- tag1 = tag_factory(names=['t1'])
- tag2 = tag_factory(names=['t2'])
+ verify_unpaged, tag_factory, input, expected_tag_names
+):
+ sug1 = tag_factory(names=["sug1"])
+ sug2 = tag_factory(names=["sug2"])
+ sug3 = tag_factory(names=["sug3"])
+ tag1 = tag_factory(names=["t1"])
+ tag2 = tag_factory(names=["t2"])
db.session.add_all([sug1, sug3, tag2, sug2, tag1])
tag1.suggestions.append(sug1)
tag1.suggestions.append(sug2)
@@ -271,18 +328,22 @@ def test_filter_by_suggestion_count(
verify_unpaged(input, expected_tag_names)
-@pytest.mark.parametrize('input,expected_tag_names', [
- ('implication-count:2', ['t1']),
- ('implication-count:1', ['t2']),
- ('implication-count:0', ['sug1', 'sug2', 'sug3']),
-])
+@pytest.mark.parametrize(
+ "input,expected_tag_names",
+ [
+ ("implication-count:2", ["t1"]),
+ ("implication-count:1", ["t2"]),
+ ("implication-count:0", ["sug1", "sug2", "sug3"]),
+ ],
+)
def test_filter_by_implication_count(
- verify_unpaged, tag_factory, input, expected_tag_names):
- sug1 = tag_factory(names=['sug1'])
- sug2 = tag_factory(names=['sug2'])
- sug3 = tag_factory(names=['sug3'])
- tag1 = tag_factory(names=['t1'])
- tag2 = tag_factory(names=['t2'])
+ verify_unpaged, tag_factory, input, expected_tag_names
+):
+ sug1 = tag_factory(names=["sug1"])
+ sug2 = tag_factory(names=["sug2"])
+ sug3 = tag_factory(names=["sug3"])
+ tag1 = tag_factory(names=["t1"])
+ tag2 = tag_factory(names=["t2"])
db.session.add_all([sug1, sug3, tag2, sug2, tag1])
tag1.implications.append(sug1)
tag1.implications.append(sug2)
@@ -291,32 +352,39 @@ def test_filter_by_implication_count(
verify_unpaged(input, expected_tag_names)
-@pytest.mark.parametrize('input,expected_tag_names', [
- ('', ['t1', 't2']),
- ('sort:name', ['t1', 't2']),
- ('-sort:name', ['t2', 't1']),
- ('sort:name,asc', ['t1', 't2']),
- ('sort:name,desc', ['t2', 't1']),
- ('-sort:name,asc', ['t2', 't1']),
- ('-sort:name,desc', ['t1', 't2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_tag_names",
+ [
+ ("", ["t1", "t2"]),
+ ("sort:name", ["t1", "t2"]),
+ ("-sort:name", ["t2", "t1"]),
+ ("sort:name,asc", ["t1", "t2"]),
+ ("sort:name,desc", ["t2", "t1"]),
+ ("-sort:name,asc", ["t2", "t1"]),
+ ("-sort:name,desc", ["t1", "t2"]),
+ ],
+)
def test_sort_by_name(verify_unpaged, tag_factory, input, expected_tag_names):
- db.session.add(tag_factory(names=['t2']))
- db.session.add(tag_factory(names=['t1']))
+ db.session.add(tag_factory(names=["t2"]))
+ db.session.add(tag_factory(names=["t1"]))
db.session.flush()
verify_unpaged(input, expected_tag_names)
-@pytest.mark.parametrize('input,expected_tag_names', [
- ('', ['t1', 't2', 't3']),
- ('sort:creation-date', ['t3', 't2', 't1']),
- ('sort:creation-time', ['t3', 't2', 't1']),
-])
+@pytest.mark.parametrize(
+ "input,expected_tag_names",
+ [
+ ("", ["t1", "t2", "t3"]),
+ ("sort:creation-date", ["t3", "t2", "t1"]),
+ ("sort:creation-time", ["t3", "t2", "t1"]),
+ ],
+)
def test_sort_by_creation_time(
- verify_unpaged, tag_factory, input, expected_tag_names):
- tag1 = tag_factory(names=['t1'])
- tag2 = tag_factory(names=['t2'])
- tag3 = tag_factory(names=['t3'])
+ verify_unpaged, tag_factory, input, expected_tag_names
+):
+ tag1 = tag_factory(names=["t1"])
+ tag2 = tag_factory(names=["t2"])
+ tag3 = tag_factory(names=["t3"])
tag1.creation_time = datetime(1991, 1, 1)
tag2.creation_time = datetime(1991, 1, 2)
tag3.creation_time = datetime(1991, 1, 3)
@@ -325,18 +393,22 @@ def test_sort_by_creation_time(
verify_unpaged(input, expected_tag_names)
-@pytest.mark.parametrize('input,expected_tag_names', [
- ('', ['t1', 't2', 't3']),
- ('sort:last-edit-date', ['t3', 't2', 't1']),
- ('sort:last-edit-time', ['t3', 't2', 't1']),
- ('sort:edit-date', ['t3', 't2', 't1']),
- ('sort:edit-time', ['t3', 't2', 't1']),
-])
+@pytest.mark.parametrize(
+ "input,expected_tag_names",
+ [
+ ("", ["t1", "t2", "t3"]),
+ ("sort:last-edit-date", ["t3", "t2", "t1"]),
+ ("sort:last-edit-time", ["t3", "t2", "t1"]),
+ ("sort:edit-date", ["t3", "t2", "t1"]),
+ ("sort:edit-time", ["t3", "t2", "t1"]),
+ ],
+)
def test_sort_by_last_edit_time(
- verify_unpaged, tag_factory, input, expected_tag_names):
- tag1 = tag_factory(names=['t1'])
- tag2 = tag_factory(names=['t2'])
- tag3 = tag_factory(names=['t3'])
+ verify_unpaged, tag_factory, input, expected_tag_names
+):
+ tag1 = tag_factory(names=["t1"])
+ tag2 = tag_factory(names=["t2"])
+ tag3 = tag_factory(names=["t3"])
tag1.last_edit_time = datetime(1991, 1, 1)
tag2.last_edit_time = datetime(1991, 1, 2)
tag3.last_edit_time = datetime(1991, 1, 3)
@@ -345,17 +417,21 @@ def test_sort_by_last_edit_time(
verify_unpaged(input, expected_tag_names)
-@pytest.mark.parametrize('input,expected_tag_names', [
- ('sort:post-count', ['t2', 't1']),
- ('sort:usage-count', ['t2', 't1']),
- ('sort:usages', ['t2', 't1']),
-])
+@pytest.mark.parametrize(
+ "input,expected_tag_names",
+ [
+ ("sort:post-count", ["t2", "t1"]),
+ ("sort:usage-count", ["t2", "t1"]),
+ ("sort:usages", ["t2", "t1"]),
+ ],
+)
def test_sort_by_post_count(
- verify_unpaged, tag_factory, post_factory, input, expected_tag_names):
+ verify_unpaged, tag_factory, post_factory, input, expected_tag_names
+):
post1 = post_factory()
post2 = post_factory()
- tag1 = tag_factory(names=['t1'])
- tag2 = tag_factory(names=['t2'])
+ tag1 = tag_factory(names=["t1"])
+ tag2 = tag_factory(names=["t2"])
db.session.add_all([post1, post2, tag1, tag2])
post1.tags.append(tag1)
post1.tags.append(tag2)
@@ -364,16 +440,18 @@ def test_sort_by_post_count(
verify_unpaged(input, expected_tag_names)
-@pytest.mark.parametrize('input,expected_tag_names', [
- ('sort:suggestion-count', ['t1', 't2', 'sug1', 'sug2', 'sug3']),
-])
+@pytest.mark.parametrize(
+ "input,expected_tag_names",
+ [("sort:suggestion-count", ["t1", "t2", "sug1", "sug2", "sug3"]),],
+)
def test_sort_by_suggestion_count(
- verify_unpaged, tag_factory, input, expected_tag_names):
- sug1 = tag_factory(names=['sug1'])
- sug2 = tag_factory(names=['sug2'])
- sug3 = tag_factory(names=['sug3'])
- tag1 = tag_factory(names=['t1'])
- tag2 = tag_factory(names=['t2'])
+ verify_unpaged, tag_factory, input, expected_tag_names
+):
+ sug1 = tag_factory(names=["sug1"])
+ sug2 = tag_factory(names=["sug2"])
+ sug3 = tag_factory(names=["sug3"])
+ tag1 = tag_factory(names=["t1"])
+ tag2 = tag_factory(names=["t2"])
db.session.add_all([sug1, sug3, tag2, sug2, tag1])
tag1.suggestions.append(sug1)
tag1.suggestions.append(sug2)
@@ -382,16 +460,18 @@ def test_sort_by_suggestion_count(
verify_unpaged(input, expected_tag_names)
-@pytest.mark.parametrize('input,expected_tag_names', [
- ('sort:implication-count', ['t1', 't2', 'sug1', 'sug2', 'sug3']),
-])
+@pytest.mark.parametrize(
+ "input,expected_tag_names",
+ [("sort:implication-count", ["t1", "t2", "sug1", "sug2", "sug3"]),],
+)
def test_sort_by_implication_count(
- verify_unpaged, tag_factory, input, expected_tag_names):
- sug1 = tag_factory(names=['sug1'])
- sug2 = tag_factory(names=['sug2'])
- sug3 = tag_factory(names=['sug3'])
- tag1 = tag_factory(names=['t1'])
- tag2 = tag_factory(names=['t2'])
+ verify_unpaged, tag_factory, input, expected_tag_names
+):
+ sug1 = tag_factory(names=["sug1"])
+ sug2 = tag_factory(names=["sug2"])
+ sug3 = tag_factory(names=["sug3"])
+ tag1 = tag_factory(names=["t1"])
+ tag2 = tag_factory(names=["t2"])
db.session.add_all([sug1, sug3, tag2, sug2, tag1])
tag1.implications.append(sug1)
tag1.implications.append(sug2)
@@ -400,20 +480,21 @@ def test_sort_by_implication_count(
verify_unpaged(input, expected_tag_names)
-@pytest.mark.parametrize('input,expected_tag_names', [
- ('sort:category', ['t3', 't1', 't2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_tag_names", [("sort:category", ["t3", "t1", "t2"]),]
+)
def test_sort_by_category(
- verify_unpaged,
- tag_factory,
- tag_category_factory,
- input,
- expected_tag_names):
- cat1 = tag_category_factory(name='cat1')
- cat2 = tag_category_factory(name='cat2')
- tag1 = tag_factory(names=['t1'], category=cat2)
- tag2 = tag_factory(names=['t2'], category=cat2)
- tag3 = tag_factory(names=['t3'], category=cat1)
+ verify_unpaged,
+ tag_factory,
+ tag_category_factory,
+ input,
+ expected_tag_names,
+):
+ cat1 = tag_category_factory(name="cat1")
+ cat2 = tag_category_factory(name="cat2")
+ tag1 = tag_factory(names=["t1"], category=cat2)
+ tag2 = tag_factory(names=["t2"], category=cat2)
+ tag3 = tag_factory(names=["t3"], category=cat1)
db.session.add_all([tag1, tag2, tag3])
db.session.flush()
verify_unpaged(input, expected_tag_names)
diff --git a/server/szurubooru/tests/search/configs/test_user_search_config.py b/server/szurubooru/tests/search/configs/test_user_search_config.py
index e9cea5a..485ab1c 100644
--- a/server/szurubooru/tests/search/configs/test_user_search_config.py
+++ b/server/szurubooru/tests/search/configs/test_user_search_config.py
@@ -1,5 +1,7 @@
from datetime import datetime
+
import pytest
+
from szurubooru import db, errors, search
@@ -12,42 +14,48 @@ def executor():
def verify_unpaged(executor):
def verify(input, expected_user_names):
actual_count, actual_users = executor.execute(
- input, offset=0, limit=100)
+ input, offset=0, limit=100
+ )
actual_user_names = [u.name for u in actual_users]
assert actual_count == len(expected_user_names)
assert actual_user_names == expected_user_names
+
return verify
-@pytest.mark.parametrize('input,expected_user_names', [
- ('creation-time:2014', ['u1', 'u2']),
- ('creation-date:2014', ['u1', 'u2']),
- ('-creation-time:2014', ['u3']),
- ('-creation-date:2014', ['u3']),
- ('creation-time:2014..2014-06', ['u1', 'u2']),
- ('creation-time:2014-06..2015-01-01', ['u2', 'u3']),
- ('creation-time:2014-06..', ['u2', 'u3']),
- ('creation-time:..2014-06', ['u1', 'u2']),
- ('creation-time-min:2014-06', ['u2', 'u3']),
- ('creation-time-max:2014-06', ['u1', 'u2']),
- ('-creation-time:2014..2014-06', ['u3']),
- ('-creation-time:2014-06..2015-01-01', ['u1']),
- ('creation-date:2014..2014-06', ['u1', 'u2']),
- ('creation-date:2014-06..2015-01-01', ['u2', 'u3']),
- ('creation-date:2014-06..', ['u2', 'u3']),
- ('creation-date:..2014-06', ['u1', 'u2']),
- ('-creation-date:2014..2014-06', ['u3']),
- ('-creation-date:2014-06..2015-01-01', ['u1']),
- ('creation-time:2014-01,2015', ['u1', 'u3']),
- ('creation-date:2014-01,2015', ['u1', 'u3']),
- ('-creation-time:2014-01,2015', ['u2']),
- ('-creation-date:2014-01,2015', ['u2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_user_names",
+ [
+ ("creation-time:2014", ["u1", "u2"]),
+ ("creation-date:2014", ["u1", "u2"]),
+ ("-creation-time:2014", ["u3"]),
+ ("-creation-date:2014", ["u3"]),
+ ("creation-time:2014..2014-06", ["u1", "u2"]),
+ ("creation-time:2014-06..2015-01-01", ["u2", "u3"]),
+ ("creation-time:2014-06..", ["u2", "u3"]),
+ ("creation-time:..2014-06", ["u1", "u2"]),
+ ("creation-time-min:2014-06", ["u2", "u3"]),
+ ("creation-time-max:2014-06", ["u1", "u2"]),
+ ("-creation-time:2014..2014-06", ["u3"]),
+ ("-creation-time:2014-06..2015-01-01", ["u1"]),
+ ("creation-date:2014..2014-06", ["u1", "u2"]),
+ ("creation-date:2014-06..2015-01-01", ["u2", "u3"]),
+ ("creation-date:2014-06..", ["u2", "u3"]),
+ ("creation-date:..2014-06", ["u1", "u2"]),
+ ("-creation-date:2014..2014-06", ["u3"]),
+ ("-creation-date:2014-06..2015-01-01", ["u1"]),
+ ("creation-time:2014-01,2015", ["u1", "u3"]),
+ ("creation-date:2014-01,2015", ["u1", "u3"]),
+ ("-creation-time:2014-01,2015", ["u2"]),
+ ("-creation-date:2014-01,2015", ["u2"]),
+ ],
+)
def test_filter_by_creation_time(
- verify_unpaged, input, expected_user_names, user_factory):
- user1 = user_factory(name='u1')
- user2 = user_factory(name='u2')
- user3 = user_factory(name='u3')
+ verify_unpaged, input, expected_user_names, user_factory
+):
+ user1 = user_factory(name="u1")
+ user2 = user_factory(name="u2")
+ user3 = user_factory(name="u3")
user1.creation_time = datetime(2014, 1, 1)
user2.creation_time = datetime(2014, 6, 1)
user3.creation_time = datetime(2015, 1, 1)
@@ -56,59 +64,67 @@ def test_filter_by_creation_time(
verify_unpaged(input, expected_user_names)
-@pytest.mark.parametrize('input,expected_user_names', [
- ('name:user1', ['user1']),
- ('name:user2', ['user2']),
- ('name:none', []),
- ('name:', []),
- ('name:*1', ['user1']),
- ('name:*2', ['user2']),
- ('name:*', ['user1', 'user2', 'user3']),
- ('name:u*', ['user1', 'user2', 'user3']),
- ('name:*ser*', ['user1', 'user2', 'user3']),
- ('name:*zer*', []),
- ('name:zer*', []),
- ('name:*zer', []),
- ('-name:user1', ['user2', 'user3']),
- ('-name:user2', ['user1', 'user3']),
- ('name:user1,user2', ['user1', 'user2']),
- ('-name:user1,user3', ['user2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_user_names",
+ [
+ ("name:user1", ["user1"]),
+ ("name:user2", ["user2"]),
+ ("name:none", []),
+ ("name:", []),
+ ("name:*1", ["user1"]),
+ ("name:*2", ["user2"]),
+ ("name:*", ["user1", "user2", "user3"]),
+ ("name:u*", ["user1", "user2", "user3"]),
+ ("name:*ser*", ["user1", "user2", "user3"]),
+ ("name:*zer*", []),
+ ("name:zer*", []),
+ ("name:*zer", []),
+ ("-name:user1", ["user2", "user3"]),
+ ("-name:user2", ["user1", "user3"]),
+ ("name:user1,user2", ["user1", "user2"]),
+ ("-name:user1,user3", ["user2"]),
+ ],
+)
def test_filter_by_name(
- verify_unpaged, input, expected_user_names, user_factory):
- db.session.add(user_factory(name='user1'))
- db.session.add(user_factory(name='user2'))
- db.session.add(user_factory(name='user3'))
+ verify_unpaged, input, expected_user_names, user_factory
+):
+ db.session.add(user_factory(name="user1"))
+ db.session.add(user_factory(name="user2"))
+ db.session.add(user_factory(name="user3"))
db.session.flush()
verify_unpaged(input, expected_user_names)
-@pytest.mark.parametrize('input,expected_user_names', [
- ('name:u1', ['u1']),
- ('name:u2*', ['u2..']),
- ('name:u1,u3..x', ['u1', 'u3..x']),
- ('name:u2..', None),
- ('name:*..*', None),
- ('name:u3..x', None),
- ('name:*..x', None),
- ('name:u2\\..', ['u2..']),
- ('name:*\\..*', ['u2..', 'u3..x']),
- ('name:u3\\..x', ['u3..x']),
- ('name:*\\..x', ['u3..x']),
- ('name:u2.\\.', ['u2..']),
- ('name:*.\\.*', ['u2..', 'u3..x']),
- ('name:u3.\\.x', ['u3..x']),
- ('name:*.\\.x', ['u3..x']),
- ('name:u2\\.\\.', ['u2..']),
- ('name:*\\.\\.*', ['u2..', 'u3..x']),
- ('name:u3\\.\\.x', ['u3..x']),
- ('name:*\\.\\.x', ['u3..x']),
-])
+@pytest.mark.parametrize(
+ "input,expected_user_names",
+ [
+ ("name:u1", ["u1"]),
+ ("name:u2*", ["u2.."]),
+ ("name:u1,u3..x", ["u1", "u3..x"]),
+ ("name:u2..", None),
+ ("name:*..*", None),
+ ("name:u3..x", None),
+ ("name:*..x", None),
+ ("name:u2\\..", ["u2.."]),
+ ("name:*\\..*", ["u2..", "u3..x"]),
+ ("name:u3\\..x", ["u3..x"]),
+ ("name:*\\..x", ["u3..x"]),
+ ("name:u2.\\.", ["u2.."]),
+ ("name:*.\\.*", ["u2..", "u3..x"]),
+ ("name:u3.\\.x", ["u3..x"]),
+ ("name:*.\\.x", ["u3..x"]),
+ ("name:u2\\.\\.", ["u2.."]),
+ ("name:*\\.\\.*", ["u2..", "u3..x"]),
+ ("name:u3\\.\\.x", ["u3..x"]),
+ ("name:*\\.\\.x", ["u3..x"]),
+ ],
+)
def test_filter_by_name_that_looks_like_range(
- verify_unpaged, input, expected_user_names, user_factory):
- db.session.add(user_factory(name='u1'))
- db.session.add(user_factory(name='u2..'))
- db.session.add(user_factory(name='u3..x'))
+ verify_unpaged, input, expected_user_names, user_factory
+):
+ db.session.add(user_factory(name="u1"))
+ db.session.add(user_factory(name="u2.."))
+ db.session.add(user_factory(name="u3..x"))
db.session.flush()
if not expected_user_names:
with pytest.raises(errors.SearchError):
@@ -117,30 +133,36 @@ def test_filter_by_name_that_looks_like_range(
verify_unpaged(input, expected_user_names)
-@pytest.mark.parametrize('input,expected_user_names', [
- ('', ['u1', 'u2']),
- ('u1', ['u1']),
- ('u2', ['u2']),
- ('u1,u2', ['u1', 'u2']),
-])
-def test_anonymous(
- verify_unpaged, input, expected_user_names, user_factory):
- db.session.add(user_factory(name='u1'))
- db.session.add(user_factory(name='u2'))
+@pytest.mark.parametrize(
+ "input,expected_user_names",
+ [
+ ("", ["u1", "u2"]),
+ ("u1", ["u1"]),
+ ("u2", ["u2"]),
+ ("u1,u2", ["u1", "u2"]),
+ ],
+)
+def test_anonymous(verify_unpaged, input, expected_user_names, user_factory):
+ db.session.add(user_factory(name="u1"))
+ db.session.add(user_factory(name="u2"))
db.session.flush()
verify_unpaged(input, expected_user_names)
-@pytest.mark.parametrize('input,expected_user_names', [
- ('creation-time:2014 u1', ['u1']),
- ('creation-time:2014 u2', ['u2']),
- ('creation-time:2016 u2', []),
-])
+@pytest.mark.parametrize(
+ "input,expected_user_names",
+ [
+ ("creation-time:2014 u1", ["u1"]),
+ ("creation-time:2014 u2", ["u2"]),
+ ("creation-time:2016 u2", []),
+ ],
+)
def test_combining_tokens(
- verify_unpaged, input, expected_user_names, user_factory):
- user1 = user_factory(name='u1')
- user2 = user_factory(name='u2')
- user3 = user_factory(name='u3')
+ verify_unpaged, input, expected_user_names, user_factory
+):
+ user1 = user_factory(name="u1")
+ user2 = user_factory(name="u2")
+ user3 = user_factory(name="u3")
user1.creation_time = datetime(2014, 1, 1)
user2.creation_time = datetime(2014, 6, 1)
user3.creation_time = datetime(2015, 1, 1)
@@ -150,61 +172,77 @@ def test_combining_tokens(
@pytest.mark.parametrize(
- 'offset,limit,expected_total_count,expected_user_names', [
- (0, 1, 2, ['u1']),
- (1, 1, 2, ['u2']),
+ "offset,limit,expected_total_count,expected_user_names",
+ [
+ (0, 1, 2, ["u1"]),
+ (1, 1, 2, ["u2"]),
(2, 1, 2, []),
(-1, 1, 2, []),
- (-1, 2, 2, ['u1']),
- (0, 2, 2, ['u1', 'u2']),
+ (-1, 2, 2, ["u1"]),
+ (0, 2, 2, ["u1", "u2"]),
(3, 1, 2, []),
(0, 0, 2, []),
- ])
+ ],
+)
def test_paging(
- executor, user_factory, offset, limit,
- expected_total_count, expected_user_names):
- db.session.add(user_factory(name='u1'))
- db.session.add(user_factory(name='u2'))
+ executor,
+ user_factory,
+ offset,
+ limit,
+ expected_total_count,
+ expected_user_names,
+):
+ db.session.add(user_factory(name="u1"))
+ db.session.add(user_factory(name="u2"))
db.session.flush()
actual_count, actual_users = executor.execute(
- '', offset=offset, limit=limit)
+ "", offset=offset, limit=limit
+ )
actual_user_names = [u.name for u in actual_users]
assert actual_count == expected_total_count
assert actual_user_names == expected_user_names
-@pytest.mark.parametrize('input,expected_user_names', [
- ('', ['u1', 'u2']),
- ('sort:name', ['u1', 'u2']),
- ('-sort:name', ['u2', 'u1']),
- ('sort:name,asc', ['u1', 'u2']),
- ('sort:name,desc', ['u2', 'u1']),
- ('-sort:name,asc', ['u2', 'u1']),
- ('-sort:name,desc', ['u1', 'u2']),
-])
+@pytest.mark.parametrize(
+ "input,expected_user_names",
+ [
+ ("", ["u1", "u2"]),
+ ("sort:name", ["u1", "u2"]),
+ ("-sort:name", ["u2", "u1"]),
+ ("sort:name,asc", ["u1", "u2"]),
+ ("sort:name,desc", ["u2", "u1"]),
+ ("-sort:name,asc", ["u2", "u1"]),
+ ("-sort:name,desc", ["u1", "u2"]),
+ ],
+)
def test_sort_by_name(
- verify_unpaged, input, expected_user_names, user_factory):
- db.session.add(user_factory(name='u2'))
- db.session.add(user_factory(name='u1'))
+ verify_unpaged, input, expected_user_names, user_factory
+):
+ db.session.add(user_factory(name="u2"))
+ db.session.add(user_factory(name="u1"))
db.session.flush()
verify_unpaged(input, expected_user_names)
-@pytest.mark.parametrize('input,expected_user_names', [
- ('', ['u1', 'u2', 'u3']),
- ('sort:creation-date', ['u3', 'u2', 'u1']),
- ('sort:creation-time', ['u3', 'u2', 'u1']),
- ('-sort:creation-date', ['u1', 'u2', 'u3']),
- ('sort:creation-date,asc', ['u1', 'u2', 'u3']),
- ('sort:creation-date,desc', ['u3', 'u2', 'u1']),
- ('-sort:creation-date,asc', ['u3', 'u2', 'u1']),
- ('-sort:creation-date,desc', ['u1', 'u2', 'u3']),
-])
+@pytest.mark.parametrize(
+ "input,expected_user_names",
+ [
+ ("", ["u1", "u2", "u3"]),
+ ("sort:creation-date", ["u3", "u2", "u1"]),
+ ("sort:creation-time", ["u3", "u2", "u1"]),
+ ("-sort:creation-date", ["u1", "u2", "u3"]),
+ ("sort:creation-date,asc", ["u1", "u2", "u3"]),
+ ("sort:creation-date,desc", ["u3", "u2", "u1"]),
+ ("-sort:creation-date,asc", ["u3", "u2", "u1"]),
+ ("-sort:creation-date,desc", ["u1", "u2", "u3"]),
+ ],
+)
def test_sort_by_creation_time(
- verify_unpaged, input, expected_user_names, user_factory):
- user1 = user_factory(name='u1')
- user2 = user_factory(name='u2')
- user3 = user_factory(name='u3')
+ verify_unpaged, input, expected_user_names, user_factory
+):
+ user1 = user_factory(name="u1")
+ user2 = user_factory(name="u2")
+ user3 = user_factory(name="u3")
user1.creation_time = datetime(1991, 1, 1)
user2.creation_time = datetime(1991, 1, 2)
user3.creation_time = datetime(1991, 1, 3)
@@ -213,18 +251,22 @@ def test_sort_by_creation_time(
verify_unpaged(input, expected_user_names)
-@pytest.mark.parametrize('input,expected_user_names', [
- ('', ['u1', 'u2', 'u3']),
- ('sort:last-login-date', ['u3', 'u2', 'u1']),
- ('sort:last-login-time', ['u3', 'u2', 'u1']),
- ('sort:login-date', ['u3', 'u2', 'u1']),
- ('sort:login-time', ['u3', 'u2', 'u1']),
-])
+@pytest.mark.parametrize(
+ "input,expected_user_names",
+ [
+ ("", ["u1", "u2", "u3"]),
+ ("sort:last-login-date", ["u3", "u2", "u1"]),
+ ("sort:last-login-time", ["u3", "u2", "u1"]),
+ ("sort:login-date", ["u3", "u2", "u1"]),
+ ("sort:login-time", ["u3", "u2", "u1"]),
+ ],
+)
def test_sort_by_last_login_time(
- verify_unpaged, input, expected_user_names, user_factory):
- user1 = user_factory(name='u1')
- user2 = user_factory(name='u2')
- user3 = user_factory(name='u3')
+ verify_unpaged, input, expected_user_names, user_factory
+):
+ user1 = user_factory(name="u1")
+ user2 = user_factory(name="u2")
+ user3 = user_factory(name="u3")
user1.last_login_time = datetime(1991, 1, 1)
user2.last_login_time = datetime(1991, 1, 2)
user3.last_login_time = datetime(1991, 1, 3)
@@ -234,39 +276,43 @@ def test_sort_by_last_login_time(
def test_random_sort(executor, user_factory):
- user1 = user_factory(name='u1')
- user2 = user_factory(name='u2')
- user3 = user_factory(name='u3')
+ user1 = user_factory(name="u1")
+ user2 = user_factory(name="u2")
+ user3 = user_factory(name="u3")
db.session.add_all([user3, user1, user2])
db.session.flush()
actual_count, actual_users = executor.execute(
- 'sort:random', offset=0, limit=100)
+ "sort:random", offset=0, limit=100
+ )
actual_user_names = [u.name for u in actual_users]
assert actual_count == 3
assert len(actual_user_names) == 3
- assert 'u1' in actual_user_names
- assert 'u2' in actual_user_names
- assert 'u3' in actual_user_names
+ assert "u1" in actual_user_names
+ assert "u2" in actual_user_names
+ assert "u3" in actual_user_names
-@pytest.mark.parametrize('input,expected_error', [
- ('creation-date:..', errors.SearchError),
- ('creation-date-min:..', errors.ValidationError),
- ('creation-date-min:..2014-01-01', errors.ValidationError),
- ('creation-date-min:2014-01-01..', errors.ValidationError),
- ('creation-date-max:..2014-01-01', errors.ValidationError),
- ('creation-date-max:2014-01-01..', errors.ValidationError),
- ('creation-date-max:yesterday,today', errors.ValidationError),
- ('creation-date:bad..', errors.ValidationError),
- ('creation-date:..bad', errors.ValidationError),
- ('creation-date:bad..bad', errors.ValidationError),
- ('sort:', errors.SearchError),
- ('sort:nam', errors.SearchError),
- ('sort:name,as', errors.SearchError),
- ('sort:name,asc,desc', errors.SearchError),
- ('bad:x', errors.SearchError),
- ('special:unsupported', errors.SearchError),
-])
+@pytest.mark.parametrize(
+ "input,expected_error",
+ [
+ ("creation-date:..", errors.SearchError),
+ ("creation-date-min:..", errors.ValidationError),
+ ("creation-date-min:..2014-01-01", errors.ValidationError),
+ ("creation-date-min:2014-01-01..", errors.ValidationError),
+ ("creation-date-max:..2014-01-01", errors.ValidationError),
+ ("creation-date-max:2014-01-01..", errors.ValidationError),
+ ("creation-date-max:yesterday,today", errors.ValidationError),
+ ("creation-date:bad..", errors.ValidationError),
+ ("creation-date:..bad", errors.ValidationError),
+ ("creation-date:bad..bad", errors.ValidationError),
+ ("sort:", errors.SearchError),
+ ("sort:nam", errors.SearchError),
+ ("sort:name,as", errors.SearchError),
+ ("sort:name,asc,desc", errors.SearchError),
+ ("bad:x", errors.SearchError),
+ ("special:unsupported", errors.SearchError),
+ ],
+)
def test_bad_tokens(executor, input, expected_error):
with pytest.raises(expected_error):
executor.execute(input, offset=0, limit=100)
diff --git a/server/szurubooru/tests/search/test_executor.py b/server/szurubooru/tests/search/test_executor.py
index e1b2dac..4530bee 100644
--- a/server/szurubooru/tests/search/test_executor.py
+++ b/server/szurubooru/tests/search/test_executor.py
@@ -1,23 +1,27 @@
import unittest.mock
+
import pytest
+
from szurubooru import search
from szurubooru.func import cache
def test_retrieving_from_cache():
config = unittest.mock.MagicMock()
- with unittest.mock.patch('szurubooru.func.cache.has'), \
- unittest.mock.patch('szurubooru.func.cache.get'):
+ with unittest.mock.patch("szurubooru.func.cache.has"), unittest.mock.patch(
+ "szurubooru.func.cache.get"
+ ):
cache.has.side_effect = lambda *args: True
executor = search.Executor(config)
- executor.execute('test:whatever', 1, 10)
+ executor.execute("test:whatever", 1, 10)
assert cache.get.called
def test_putting_equivalent_queries_into_cache():
config = search.configs.PostSearchConfig()
- with unittest.mock.patch('szurubooru.func.cache.has'), \
- unittest.mock.patch('szurubooru.func.cache.put'):
+ with unittest.mock.patch("szurubooru.func.cache.has"), unittest.mock.patch(
+ "szurubooru.func.cache.put"
+ ):
hashes = []
def appender(key, _value):
@@ -26,20 +30,21 @@ def test_putting_equivalent_queries_into_cache():
cache.has.side_effect = lambda *args: False
cache.put.side_effect = appender
executor = search.Executor(config)
- executor.execute('safety:safe test', 1, 10)
- executor.execute('safety:safe test', 1, 10)
- executor.execute('safety:safe test ', 1, 10)
- executor.execute(' safety:safe test', 1, 10)
- executor.execute(' SAFETY:safe test', 1, 10)
- executor.execute('test safety:safe', 1, 10)
+ executor.execute("safety:safe test", 1, 10)
+ executor.execute("safety:safe test", 1, 10)
+ executor.execute("safety:safe test ", 1, 10)
+ executor.execute(" safety:safe test", 1, 10)
+ executor.execute(" SAFETY:safe test", 1, 10)
+ executor.execute("test safety:safe", 1, 10)
assert len(hashes) == 6
assert len(set(hashes)) == 1
def test_putting_non_equivalent_queries_into_cache():
config = search.configs.PostSearchConfig()
- with unittest.mock.patch('szurubooru.func.cache.has'), \
- unittest.mock.patch('szurubooru.func.cache.put'):
+ with unittest.mock.patch("szurubooru.func.cache.has"), unittest.mock.patch(
+ "szurubooru.func.cache.put"
+ ):
hashes = []
def appender(key, _value):
@@ -49,42 +54,42 @@ def test_putting_non_equivalent_queries_into_cache():
cache.put.side_effect = appender
executor = search.Executor(config)
args = [
- ('', 1, 10),
- ('creation-time:2016', 1, 10),
- ('creation-time:2015', 1, 10),
- ('creation-time:2016-01', 1, 10),
- ('creation-time:2016-02', 1, 10),
- ('creation-time:2016-01-01', 1, 10),
- ('creation-time:2016-01-02', 1, 10),
- ('tag-count:1,3', 1, 10),
- ('tag-count:1,2', 1, 10),
- ('tag-count:1', 1, 10),
- ('tag-count:1..3', 1, 10),
- ('tag-count:1..4', 1, 10),
- ('tag-count:2..3', 1, 10),
- ('tag-count:1..', 1, 10),
- ('tag-count:2..', 1, 10),
- ('tag-count:..3', 1, 10),
- ('tag-count:..4', 1, 10),
- ('-tag-count:1..3', 1, 10),
- ('-tag-count:1..4', 1, 10),
- ('-tag-count:2..3', 1, 10),
- ('-tag-count:1..', 1, 10),
- ('-tag-count:2..', 1, 10),
- ('-tag-count:..3', 1, 10),
- ('-tag-count:..4', 1, 10),
- ('safety:safe', 1, 10),
- ('safety:safe', 1, 20),
- ('safety:safe', 2, 10),
- ('safety:sketchy', 1, 10),
- ('safety:safe test', 1, 10),
- ('-safety:safe', 1, 10),
- ('-safety:safe', 1, 20),
- ('-safety:safe', 2, 10),
- ('-safety:sketchy', 1, 10),
- ('-safety:safe test', 1, 10),
- ('safety:safe -test', 1, 10),
- ('-test', 1, 10),
+ ("", 1, 10),
+ ("creation-time:2016", 1, 10),
+ ("creation-time:2015", 1, 10),
+ ("creation-time:2016-01", 1, 10),
+ ("creation-time:2016-02", 1, 10),
+ ("creation-time:2016-01-01", 1, 10),
+ ("creation-time:2016-01-02", 1, 10),
+ ("tag-count:1,3", 1, 10),
+ ("tag-count:1,2", 1, 10),
+ ("tag-count:1", 1, 10),
+ ("tag-count:1..3", 1, 10),
+ ("tag-count:1..4", 1, 10),
+ ("tag-count:2..3", 1, 10),
+ ("tag-count:1..", 1, 10),
+ ("tag-count:2..", 1, 10),
+ ("tag-count:..3", 1, 10),
+ ("tag-count:..4", 1, 10),
+ ("-tag-count:1..3", 1, 10),
+ ("-tag-count:1..4", 1, 10),
+ ("-tag-count:2..3", 1, 10),
+ ("-tag-count:1..", 1, 10),
+ ("-tag-count:2..", 1, 10),
+ ("-tag-count:..3", 1, 10),
+ ("-tag-count:..4", 1, 10),
+ ("safety:safe", 1, 10),
+ ("safety:safe", 1, 20),
+ ("safety:safe", 2, 10),
+ ("safety:sketchy", 1, 10),
+ ("safety:safe test", 1, 10),
+ ("-safety:safe", 1, 10),
+ ("-safety:safe", 1, 20),
+ ("-safety:safe", 2, 10),
+ ("-safety:sketchy", 1, 10),
+ ("-safety:safe test", 1, 10),
+ ("safety:safe -test", 1, 10),
+ ("-test", 1, 10),
]
for arg in args:
executor.execute(*arg)
@@ -92,18 +97,22 @@ def test_putting_non_equivalent_queries_into_cache():
assert len(set(hashes)) == len(args)
-@pytest.mark.parametrize('input', [
- 'special:fav',
- 'special:liked',
- 'special:disliked',
- '-special:fav',
- '-special:liked',
- '-special:disliked',
-])
+@pytest.mark.parametrize(
+ "input",
+ [
+ "special:fav",
+ "special:liked",
+ "special:disliked",
+ "-special:fav",
+ "-special:liked",
+ "-special:disliked",
+ ],
+)
def test_putting_auth_dependent_queries_into_cache(user_factory, input):
config = search.configs.PostSearchConfig()
- with unittest.mock.patch('szurubooru.func.cache.has'), \
- unittest.mock.patch('szurubooru.func.cache.put'):
+ with unittest.mock.patch("szurubooru.func.cache.has"), unittest.mock.patch(
+ "szurubooru.func.cache.put"
+ ):
hashes = []
def appender(key, _value):
--
cgit v1.3