some FIX

fit-project · Oct 31, 2024 · d7def89 · d7def89
1 parent c4c48ee
commit d7def89
Show file tree

Hide file tree

Showing 16 changed files with 81 additions and 58 deletions.
diff --git a/assets/config.ini b/assets/config.ini
@@ -1,7 +1,8 @@
 [fit_properties]
-tag_name = 2.0.1
+tag_name = v.2.0.1
 check_connection_url = http://google.com
 npcap_latest_version_url = https://api.github.com/repos/nmap/npcap/releases/latest
 npcap_installer_url = https://npcap.com/dist/
 pec_providers_url = https://www.agid.gov.it/it/piattaforme/posta-elettronica-certificata/elenco-gestori-pec
-fit_latest_version_url = https://api.github.com/repos/fit-project/fit/releases/latest
+fit_latest_version_url = https://api.github.com/repos/fit-project/fit/releases/latest
+
diff --git a/pyinstaller/mac/fit.spec b/pyinstaller/mac/fit.spec
diff --git a/pyinstaller/pre_build.py b/pyinstaller/pre_build.py
@@ -0,0 +1,65 @@
+import subprocess
+import re
+from configparser import ConfigParser
+
+
+def get_version_from_latest_git_tag():
+    try:
+        tag = subprocess.check_output(
+            ["git", "describe", "--tags", "--abbrev=0"]
+        ).strip()
+        return tag.decode("utf-8")
+    except subprocess.CalledProcessError:
+        return None
+
+
+def get_version_from_pyproject():
+    try:
+        with open("pyproject.toml", "r") as file:
+            for line in file:
+                match = re.match(r'^\s*version\s*=\s*"(.*?)"\s*$', line)
+                if match:
+                    return match.group(1)
+        return None
+    except FileNotFoundError:
+        return None
+
+
+def get_version():
+    version = get_version_from_latest_git_tag()
+    if version is None:
+        version = get_version_from_pyproject()
+    return version
+
+
+def update_version_in_pyproject_toml():
+    with open("pyproject.toml", "r") as file:
+        content = file.read()
+    new_content = re.sub(
+        r'version\s*=\s*"[0-9a-zA-Z.-]+"', f'version = "{VERSION}"', content
+    )
+
+    with open("pyproject.toml", "w") as file:
+        file.write(new_content)
+
+
+def update_version_in_config_ini():
+    config = ConfigParser()
+    config.read("assets/config.ini")
+
+    if config.has_section("fit_properties"):
+        config.set("fit_properties", "tag_name", VERSION)
+
+    with open("assets/config.ini", "w") as configfile:
+        config.write(configfile)
+
+
+def update_version():
+    update_version_in_pyproject_toml()
+    update_version_in_config_ini()
+
+
+VERSION = get_version()
+
+if VERSION is not None:
+    update_version()
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fit"
-version = "2.0.1"
+version = "v.2.0.1"
 description = "FIT is a Python3 application for forensic acquisition of contents like web pages, emails, social media, etc. directly from the internet."
 authors = ["Fit Project <[email protected]>"]
 license = "GPL-3.0-only"

diff --git a/view/case_form_dialog.py b/view/case_form_dialog.py
@@ -40,7 +40,7 @@ def __init_ui(self):
         self.close_button.clicked.connect(self.close)
 
         # SET VERSION
-        self.version.setText("v" + get_version())
+        self.version.setText(get_version())
 
         # CANCEL BUTTON
         self.cancel_button.clicked.connect(self.reject)

diff --git a/view/configuration.py b/view/configuration.py
@@ -48,7 +48,7 @@ def __init_ui(self):
         self.close_button.clicked.connect(self.close)
 
         # SET VERSION
-        self.version.setText("v" + get_version())
+        self.version.setText(get_version())
 
         # CANCEL BUTTON
         self.cancel_button.clicked.connect(self.reject)

diff --git a/view/scrapers/entire_website/entire_website.py b/view/scrapers/entire_website/entire_website.py
@@ -72,7 +72,7 @@ def __init_ui(self):
         self.status_message.setHidden(True)
 
         # SET VERSION
-        self.version.setText("v" + get_version())
+        self.version.setText(get_version())
 
         # LOAD FROM DOMAIN CHECKBOX
         self.load_from_domain.clicked.connect(self.__switch_load_type)

diff --git a/view/scrapers/instagram/instagram.py b/view/scrapers/instagram/instagram.py
@@ -69,7 +69,7 @@ def __init_ui(self):
         self.status_message.setHidden(True)
 
         # SET VERSION
-        self.version.setText("v" + get_version())
+        self.version.setText(get_version())
 
         # SERVER INPUT FIELDS
         self.login_configuration_fields = self.login_configuration.findChildren(

diff --git a/view/scrapers/mail/mail.py b/view/scrapers/mail/mail.py
@@ -83,7 +83,7 @@ def __init_ui(self):
         self.status_message.setHidden(True)
 
         # SET VERSION
-        self.version.setText("v" + get_version())
+        self.version.setText(get_version())
         self.server_configuration_vlayout.addWidget(
             ClickableLabelView(mail.TWO_FACTOR_AUTH_URL, mail.TWO_FACTOR_AUTH)
         )

diff --git a/view/scrapers/video/video.py b/view/scrapers/video/video.py
@@ -72,7 +72,7 @@ def __init_ui(self):
         self.status_message.setHidden(True)
 
         # SET VERSION
-        self.version.setText("v" + get_version())
+        self.version.setText(get_version())
 
         # PREVIEW CONTAINER
         self.preview_container.setEnabled(False)

diff --git a/view/scrapers/web/web.py b/view/scrapers/web/web.py
@@ -88,7 +88,7 @@ def __init_ui(self):
         self.status_message.setHidden(True)
 
         # SET VERSION
-        self.version.setText("v" + get_version())
+        self.version.setText(get_version())
 
         # SET NAVIGATION BUTTONS
         self.back_button.clicked.connect(self.__back)

diff --git a/view/tasks/post/hash.py b/view/tasks/post/hash.py
@@ -47,6 +47,7 @@ def start(self):
         list().append
         self.exclude_list.append("acquisition.hash")
         self.exclude_list.append("acquisition.log")
+        self.exclude_list.append("acquisition_video.mp4")
         for file in files:
             if file not in self.exclude_list:
                 filename = os.path.join(self.folder, file)

diff --git a/view/tasks/tasks_info.py b/view/tasks/tasks_info.py
@@ -39,7 +39,7 @@ def __init_ui(self):
         self.close_button.clicked.connect(self.close)
 
         # SET VERSION
-        self.version.setText("v" + get_version())
+        self.version.setText(get_version())
 
         self.icon = QtGui.QIcon(
             os.path.join(resolve_path("ui/icons"), "info-circle.png")

diff --git a/view/verify_pdf_timestamp.py b/view/verify_pdf_timestamp.py
@@ -69,7 +69,7 @@ def __init_ui(self):
         self.close_button.clicked.connect(self.close)
 
         # SET VERSION
-        self.version.setText("v" + get_version())
+        self.version.setText(get_version())
 
         # PDF FILE BUTTON
         self.pdf_file_button.clicked.connect(

diff --git a/view/verify_pec.py b/view/verify_pec.py
@@ -62,7 +62,7 @@ def __init_ui(self):
         self.close_button.clicked.connect(self.close)
 
         # SET VERSION
-        self.version.setText("v" + get_version())
+        self.version.setText(get_version())
 
         # EML FOLDER BUTTON
         self.eml_folder_button.clicked.connect(self.__select_eml_file)

diff --git a/view/wizard.py b/view/wizard.py
@@ -70,7 +70,7 @@ def __init__(self, parent=None):
         self.back_button.hide()
 
         # SET VERSION
-        self.version.setText("v" + get_version())
+        self.version.setText(get_version())
 
         # PAGE1 CASE INFO FORM
         self.form_manager = CaseFormManager(self.form)