tg-prepare 1.1.0__tar.gz → 2.1.0b1__tar.gz

{tg_prepare-1.1.0/tg_prepare.egg-info → tg_prepare-2.1.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tg_prepare
-Version: 1.1.0
+Version: 2.1.0b1
 Summary: Simple UI to handle TextGrid imports visually.
 Author: Ralf Klammer, Moritz Wilhelm
 Author-email: ralf.klammer@tu-dresden.de, moritz.wilhelm@tu-dresden.de
@@ -8,8 +8,8 @@ License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: flask
 Requires-Dist: flask_json
-Requires-Dist: tg_model>=3.6.0
-Requires-Dist: tgclients==0.17.0
+Requires-Dist: tg_model==3.8.0.b2
+Requires-Dist: tgclients
 Requires-Dist: tgadmin
 Requires-Dist: nextcloud-api-wrapper
 Dynamic: author

{tg_prepare-1.1.0 → tg_prepare-2.1.0b1}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="tg_prepare",
-    version="1.1.0",
+    version="2.1.0.b1",
     description="Simple UI to handle TextGrid imports visually.",
     author="Ralf Klammer, Moritz Wilhelm",
     author_email="ralf.klammer@tu-dresden.de, moritz.wilhelm@tu-dresden.de",
@@ -16,8 +16,8 @@ setup(
         "click",
         "flask",
         "flask_json",
-        "tg_model>=3.6.0",
-        "tgclients==0.17.0",
+        "tg_model==3.8.0.b2",
+        "tgclients",
         "tgadmin",
         "nextcloud-api-wrapper",
     ],

{tg_prepare-1.1.0 → tg_prepare-2.1.0b1/tg_prepare.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tg_prepare
-Version: 1.1.0
+Version: 2.1.0b1
 Summary: Simple UI to handle TextGrid imports visually.
 Author: Ralf Klammer, Moritz Wilhelm
 Author-email: ralf.klammer@tu-dresden.de, moritz.wilhelm@tu-dresden.de
@@ -8,8 +8,8 @@ License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: flask
 Requires-Dist: flask_json
-Requires-Dist: tg_model>=3.6.0
-Requires-Dist: tgclients==0.17.0
+Requires-Dist: tg_model==3.8.0.b2
+Requires-Dist: tgclients
 Requires-Dist: tgadmin
 Requires-Dist: nextcloud-api-wrapper
 Dynamic: author

tg_prepare-2.1.0b1/tg_prepare.egg-info/SOURCES.txt

@@ -0,0 +1,83 @@
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+setup.py
+tg_prepare.egg-info/PKG-INFO
+tg_prepare.egg-info/SOURCES.txt
+tg_prepare.egg-info/dependency_links.txt
+tg_prepare.egg-info/entry_points.txt
+tg_prepare.egg-info/requires.txt
+tg_prepare.egg-info/top_level.txt
+tg_prepare.egg-info/projects/.secret_key
+tgp_backend/__init__.py
+tgp_backend/auth.py
+tgp_backend/cli.py
+tgp_backend/config.py
+tgp_backend/directories.py
+tgp_backend/interfaces.py
+tgp_backend/nextcloud.py
+tgp_backend/project.py
+tgp_backend/session_manager.py
+tgp_backend/tgclient.py
+tgp_backend/util.py
+tgp_ui/__init__.py
+tgp_ui/app.py
+tgp_ui/routes/__init__.py
+tgp_ui/routes/collection.py
+tgp_ui/routes/data.py
+tgp_ui/routes/project.py
+tgp_ui/routes/publication.py
+tgp_ui/routes/tabs.py
+tgp_ui/routes/views.py
+tgp_ui/static/css/bootstrap-icons.min.css
+tgp_ui/static/css/bootstrap.min.css
+tgp_ui/static/css/bootstrap.min.css.map
+tgp_ui/static/css/main.css
+tgp_ui/static/css/navbar.css
+tgp_ui/static/css/simpleXML.css
+tgp_ui/static/img/favicon.ico
+tgp_ui/static/img/textgrid-logo.svg
+tgp_ui/static/js/bootstrap.bundle.min.js
+tgp_ui/static/js/collectionManager.js
+tgp_ui/static/js/fileManager.js
+tgp_ui/static/js/jquery.min.js
+tgp_ui/static/js/main.js
+tgp_ui/static/js/modalManager.js
+tgp_ui/static/js/navbarManager.js
+tgp_ui/static/js/projectManager.js
+tgp_ui/static/js/require.js
+tgp_ui/static/js/sidebarManager.js
+tgp_ui/static/js/simpleXML.js
+tgp_ui/static/js/tabManager.js
+tgp_ui/templates/file_tree.html
+tgp_ui/templates/layout.html
+tgp_ui/templates/macros.html
+tgp_ui/templates/nxc_login.html
+tgp_ui/templates/nxc_tab.html
+tgp_ui/templates/project_main.html
+tgp_ui/templates/project_navbar.html
+tgp_ui/templates/projects_main.html
+tgp_ui/templates/publication.html
+tgp_ui/templates/tab_final_upload.html
+tgp_ui/templates/details/empty_container.html
+tgp_ui/templates/details/manage_collection.html
+tgp_ui/templates/includes/set_session_id_form.html
+tgp_ui/templates/includes/upload_form.html
+tgp_ui/templates/modal/delete_project.html
+tgp_ui/templates/modal/empty_container.html
+tgp_ui/templates/modal/file_explorer_content.html
+tgp_ui/templates/modal/file_explorer_main.html
+tgp_ui/templates/modal/file_explorer_nextcloud.html
+tgp_ui/templates/modal/github_modal.html
+tgp_ui/templates/modal/nextcloud_login.html
+tgp_ui/templates/modal/tei_explorer.html
+tgp_ui/templates/modal/xpath_parser.html
+tgp_ui/templates/tabs/check_result.html
+tgp_ui/templates/tabs/edit_project.html
+tgp_ui/templates/tabs/empty_container.html
+tgp_ui/templates/tabs/import_data.html
+tgp_ui/templates/tabs/manage_collections.html
+tgp_ui/templates/tabs/select_directories.html
+tgp_ui/templates/tabs/upload.html
+tgp_ui/templates/tabs/validate_metadata.html

tg_prepare-2.1.0b1/tg_prepare.egg-info/projects/.secret_key

@@ -0,0 +1 @@
+"94c9d50a8949b627be9608827a66d0025919e013d89236b092de90dd0b79fd12"

{tg_prepare-1.1.0 → tg_prepare-2.1.0b1}/tg_prepare.egg-info/requires.txt

@@ -1,7 +1,7 @@
 click
 flask
 flask_json
-tg_model>=3.6.0
-tgclients==0.17.0
+tg_model==3.8.0.b2
+tgclients
 tgadmin
 nextcloud-api-wrapper

{tg_prepare-1.1.0 → tg_prepare-2.1.0b1}/tgp_backend/__init__.py

@@ -4,15 +4,14 @@
 
 import logging
 
-from .util import config
+from .config import LOG_LEVEL
 
 log = logging.getLogger(__name__)
 
-log_level = config("log", "level", default="INFO")
 log_config = dict(
-    level=log_level,
+    level=LOG_LEVEL,
     format="%(asctime)s %(name)-10s %(levelname)-4s %(message)s",
 )
 
 logging.basicConfig(**log_config)
-logging.getLogger("").setLevel(log_level)
+logging.getLogger("").setLevel(LOG_LEVEL)

tg_prepare-2.1.0b1/tgp_backend/config.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2023-2024 TU-Dresden (ZIH)
+# ralf.klammer@tu-dresden.de
+import logging
+
+from configparser import ConfigParser
+
+log = logging.getLogger(__name__)
+
+
+def get_config_value(section, parameter, default=None):
+    _config = ConfigParser()
+    _config.read("config.ini")
+
+    if section not in _config:
+        log.warn("Section: %s not in *.ini -> using default" % section)
+        return default
+    config_val = _config[section].get(parameter)
+    if not config_val:
+        log.info(
+            "Parameter: %s not in section: (%s) of *.ini -> using default: %s"
+            % (parameter, section, default)
+        )
+        return default
+    else:
+        return config_val
+
+
+LOG_LEVEL = get_config_value("log", "level", default="INFO")
+MAIN_PATH = get_config_value("main", "path", default="./projects")
+MAX_FILENAME_LENGTH = get_config_value("main", "maxFileNameLength", default=15)

{tg_prepare-1.1.0 → tg_prepare-2.1.0b1}/tgp_backend/directories.py

@@ -6,13 +6,11 @@ import logging
 import os
 import re
 
-from tgp_backend.util import config, get_file_extension
-
+from tgp_backend.config import MAX_FILENAME_LENGTH
+from tgp_backend.util import get_file_extension
 
 log = logging.getLogger(__name__)
 
-maxFileNameLength = config("main", "maxFileNameLength", default=15)
-
 
 def generateList(path=None):
     # path = path if path else config("main", "path", default="/tmp")
@@ -38,12 +36,12 @@ def generateList(path=None):
     curDir = path
 
     for d in dList:
-        if len(d["name"]) > maxFileNameLength:
+        if len(d["name"]) > MAX_FILENAME_LENGTH:
             dots = "..."
         else:
             dots = ""
         temp_dir = {}
-        temp_dir["f"] = d["name"][0:maxFileNameLength] + dots
+        temp_dir["f"] = d["name"][0:MAX_FILENAME_LENGTH] + dots
         temp_dir["name"] = d["name"]
         temp_dir["f_url"] = re.sub("#", "|HASHTAG|", d["fullpath"])
         temp_dir["currentDir"] = curDir
@@ -61,12 +59,12 @@ def generateList(path=None):
             pass
         if not image:
             image = "files_icon/unknown-icon.png"
-        if len(f["name"]) > maxFileNameLength:
+        if len(f["name"]) > MAX_FILENAME_LENGTH:
             dots = "..."
         else:
             dots = ""
         temp_file = {}
-        temp_file["f"] = f["name"][0:maxFileNameLength] + dots
+        temp_file["f"] = f["name"][0:MAX_FILENAME_LENGTH] + dots
         temp_file["name"] = f["name"]
         temp_file["name_stripped"] = f["name"].replace(f".{tp}", "")
         temp_file["f_url"] = re.sub("#", "|HASHTAG|", f["fullpath"])

{tg_prepare-1.1.0 → tg_prepare-2.1.0b1}/tgp_backend/nextcloud.py

@@ -4,7 +4,6 @@
 # moritz.wilhelm@tu-dresden.de
 
 import logging
-
 import nextcloud
 import os
 
@@ -14,21 +13,21 @@ log = logging.getLogger(__name__)
 class Nextcloud:
     def __init__(
         self,
-        nextcloud_url=None,
+        url=None,
         username=None,
         password=None,
-        root_dir=None,
+        folder=None,
         **kwargs,
     ):
         self._nxc = None
         self._root = None
-        self.nextcloud_url = nextcloud_url
+        self.url = url
         self.username = username
         self.password = password
-        self.root_dir = root_dir
+        self.root_dir = folder
 
     def test_connection(self):
-        if all([self.nextcloud_url, self.username, self.password]):
+        if all([self.url, self.username, self.password]):
             return str(self.nxc.list_folders().status_code).startswith("2")
         return False
 
@@ -36,7 +35,7 @@ class Nextcloud:
     def nxc(self):
         if self._nxc is None:
             self._nxc = nextcloud.NextCloud(
-                endpoint=self.nextcloud_url,
+                endpoint=self.url,
                 user=self.username,
                 password=self.password,
             )
@@ -51,29 +50,51 @@ class Nextcloud:
                 raise "Could not find the Root Directory"
         return self._root
 
-    def nxc_list_files_and_folders(self):
+    def nxc_list_files_and_folders(self, get_selectable=False):
+
+        selectable_folders = []
 
-        def _list_rec(item):
+        def recursive_list(item, depth=0):
             items = []
             for d in item.list():
                 if d.isdir():
-                    children = _list_rec(d)
+                    children = recursive_list(d, depth=depth + 1)
+                    contains_xml = any(
+                        f.get("name", "").endswith(".xml") for f in children
+                    )
+                    item = {
+                        "type": "folder",
+                        "name": d.basename(),
+                        "depth": depth,
+                        "path": d.get_relative_path(),
+                        "contains_xml": contains_xml,
+                        "children": {
+                            "count": len(children),
+                            "list": children,
+                        },
+                    }
+                    items.append(item)
+                    if contains_xml:
+                        selectable_folders.append(item)
+                else:
                     items.append(
                         {
-                            "type": "folder",
+                            "type": "file",
                             "name": d.basename(),
-                            "path": d.get_relative_path(),
-                            "children": {
-                                "count": len(children),
-                                "list": children,
-                            },
+                            "depth": depth,
                         }
                     )
-                else:
-                    items.append({"type": "file", "name": d.basename()})
             return items
 
-        return _list_rec(self.root)
+        result = recursive_list(self.root)
+        if get_selectable:
+            return selectable_folders
+        else:
+            return result
+
+    def get_selectable_folders(self):
+
+        return self.nxc_list_files_and_folders(get_selectable=True)
 
     def download_nxc_files(self, file_paths, projectname):
         for path in file_paths: