From e39548c50b64152095902a80ea5edf7c0086ed9b Mon Sep 17 00:00:00 2001
From: JustAnotherArchivist <JustAnotherArchivist@users.noreply.github.com>
Date: Fri, 24 Mar 2023 21:07:19 +0000
Subject: [PATCH] Fix file extensions

---
 codearchiver/modules/git.py | 2 +-
 codearchiver/storage.py     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/codearchiver/modules/git.py b/codearchiver/modules/git.py
index 24e212e..2d0b2c3 100644
--- a/codearchiver/modules/git.py
+++ b/codearchiver/modules/git.py
@@ -41,7 +41,7 @@ class Git(codearchiver.core.Module):
 		if os.path.exists(directory):
 			_logger.fatal(f'{directory!r} already exists')
 			raise FileExistsError(f'{directory!r} already exists')
-		bundle = f'{self._id}.bundle'
+		bundle = f'{self._id}_git.bundle'
 		if os.path.exists(bundle):
 			_logger.fatal(f'{bundle!r} already exists')
 			raise FileExistsError(f'{bundle!r} already exists')
diff --git a/codearchiver/storage.py b/codearchiver/storage.py
index 118a786..26d6e55 100644
--- a/codearchiver/storage.py
+++ b/codearchiver/storage.py
@@ -67,7 +67,7 @@ class DirectoryStorage(Storage):
 		shutil.move(filename, self._directory)
 		if not metadata:
 			return
-		metadataFilename = os.path.join(self._directory, f'{filename}.codearchiver-metadata')
+		metadataFilename = os.path.join(self._directory, f'{filename}_codearchiver_metadata.txt')
 		# No need to check for existence here thanks to the 'x' mode
 		_logger.info(f'Writing metadata for {filename} to {metadataFilename}')
 		with open(metadataFilename, 'x') as fp:
@@ -78,7 +78,7 @@ class DirectoryStorage(Storage):
 		# Replace this with `root_dir` when dropping Python 3.9 support
 		escapedDirPrefix = os.path.join(glob.escape(self._directory), '')
 		escapedDirPrefixLen = len(escapedDirPrefix)
-		files = glob.glob(f'{escapedDirPrefix}*.codearchiver-metadata')
+		files = glob.glob(f'{escapedDirPrefix}*_codearchiver_metadata.txt')
 		files.sort()
 		for metadataFilename in files:
 			metadataFilename = metadataFilename[escapedDirPrefixLen:]
@@ -87,12 +87,12 @@ class DirectoryStorage(Storage):
 				idx = codearchiver.core.Metadata.deserialise(fp, validate = False)
 			if idx.matches(criteria):
 				_logger.info(f'Found metadata match {metadataFilename}')
-				yield metadataFilename.rsplit('.', 1)[0]
+				yield metadataFilename.rsplit('_', 2)[0]
 		_logger.info('Done searching metadata')
 
 	@contextlib.contextmanager
 	def open_metadata(self, filename):
-		with self.open(f'{filename}.codearchiver-metadata', 'r') as fp:
+		with self.open(f'{filename}_codearchiver_metadata.txt', 'r') as fp:
 			yield fp
 
 	@contextlib.contextmanager