From 2ed14897fd08ae97e957c7f0737c9b20b782844d Mon Sep 17 00:00:00 2001 From: Justin Campbell Date: Tue, 1 Jun 2021 16:02:29 -0400 Subject: [PATCH] Move isValidItemName func to Utilities module --- src/webqueue2api/Queue.py | 19 ++----------------- src/webqueue2api/Utilities.py | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 src/webqueue2api/Utilities.py diff --git a/src/webqueue2api/Queue.py b/src/webqueue2api/Queue.py index 00fb36c..4794f62 100644 --- a/src/webqueue2api/Queue.py +++ b/src/webqueue2api/Queue.py @@ -1,21 +1,6 @@ -import os, re +import os from .Item import Item - -def isValidItemName(name: str) -> bool: - """Returns true if file name is a valid item name - - Example: - isValidItemName("21") -> true - isValidItemName("twentyone") -> false - - Args: - name (str): The name to test. - - Returns: - bool: Name is valid item name. - """ - itemPattern = re.compile("^[0123456789]{1,3}$") - return True if itemPattern.match(name) else False +from .Utilities import isValidItemName queueDirectory = "/home/pier/e/queue/Mail" diff --git a/src/webqueue2api/Utilities.py b/src/webqueue2api/Utilities.py new file mode 100644 index 0000000..437cc2b --- /dev/null +++ b/src/webqueue2api/Utilities.py @@ -0,0 +1,20 @@ +"""A collection of utilities to be used throughout the webqueue2 API. +""" + +import re + +def isValidItemName(name: str) -> bool: + """Returns true if file name is a valid item name + + Example: + isValidItemName("21") -> true + isValidItemName("twentyone") -> false + + Args: + name (str): The name to test. + + Returns: + bool: Name is valid item name. + """ + itemPattern = re.compile("^[0123456789]{1,3}$") + return True if itemPattern.match(name) else False \ No newline at end of file