Corrections for backups and upgrades

cabernetwork · Jan 6, 2024 · 44e0260 · 44e0260
1 parent 77688b3
commit 44e0260
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/common/utils.py b/lib/common/utils.py
@@ -37,7 +37,7 @@
 
 import lib.common.exceptions as exceptions
 
-VERSION = '0.9.15.00-DEV01'
+VERSION = '0.9.15.00-DEV02'
 CABERNET_URL = 'https://github.com/cabernetwork/cabernet'
 CABERNET_ID = 'cabernet'
 CABERNET_REPO = 'manifest.json'

diff --git a/lib/db/datamgmt/data_mgmt_html.py b/lib/db/datamgmt/data_mgmt_html.py
@@ -195,7 +195,7 @@ def __init__(self, _plugins):
         self.logger = logging.getLogger(__name__)
         self.config = _plugins.config_obj.data
         self.bkups = backups.Backups(_plugins)
-        self.search_date = re.compile('[^_]+(_([\d.]+[-RC\d]*))?_(\d*?_\d*)')
+        self.search_date = re.compile('[^_]+(_([\d.]+[-DEV\d]+[-RC\d]))?_(\d*?_\d*)')
 
     def get(self):
         return ''.join([self.header, self.body])

diff --git a/lib/updater/cabernet.py b/lib/updater/cabernet.py
@@ -215,7 +215,7 @@ def check_expected_files(self, _web_status):
         """
         files_present = ['build', 'lib', 'misc',
                          '.dockerignore', '.gitignore', 'CHANGELOG.md', 'CONTRIBUTING.md',
-                         'Dockerfile', 'Dockerfile_l2p', 'Dockerfile_tvh', 'Dockerfile_tvh_crypt.alpine',
+                         'Docker_entrypoint.sh', 'Dockerfile', 'Dockerfile_tvh_crypt.alpine',
                          'Dockerfile_tvh_crypt.slim-buster', 'LICENSE', 'README.md',
                          'TVHEADEND.md', 'docker-compose.yml', 'requirements.txt', 'tvh_main.py',
                          'data', 'config.ini', 'is_container', '.git', 'cabernet.url', 'ffmpeg',