Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ jobs:
strategy:
matrix:
include:
- python-version: "3.9"
toxenv: "py39"
- python-version: "3.10"
toxenv: "py310"
steps:
Expand Down
21 changes: 13 additions & 8 deletions src/sqlitefid/libs/CSVHandlerClass.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,22 @@
import logging
import os.path
from urllib.parse import urlparse
import os

try:
from libs import unicodecsv
from libs.PyDateHandler import PyDateHandler
except ModuleNotFoundError:
if os.name != "nt":
try:
from src.sqlitefid.libs import unicodecsv
from src.sqlitefid.libs.PyDateHandler import PyDateHandler
from libs import unicodecsv
from libs.PyDateHandler import PyDateHandler
except ModuleNotFoundError:
from sqlitefid.libs import unicodecsv
from sqlitefid.libs.PyDateHandler import PyDateHandler
try:
from src.sqlitefid.libs import unicodecsv
from src.sqlitefid.libs.PyDateHandler import PyDateHandler
except ModuleNotFoundError:
from sqlitefid.libs import unicodecsv
from sqlitefid.libs.PyDateHandler import PyDateHandler
else:
from . import unicodecsv
from .PyDateHandler import PyDateHandler


class CSVExportException(Exception):
Expand Down
21 changes: 13 additions & 8 deletions src/sqlitefid/libs/DROIDLoaderClass.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,22 @@

import logging
from sqlite3 import OperationalError
import os

try:
from libs.CSVHandlerClass import DroidCSVHandler
from libs.ToolMappingClass import ToolMapping
except ModuleNotFoundError:
if os.name != "nt":
try:
from src.sqlitefid.libs.CSVHandlerClass import DroidCSVHandler
from src.sqlitefid.libs.ToolMappingClass import ToolMapping
from libs.CSVHandlerClass import DroidCSVHandler
from libs.ToolMappingClass import ToolMapping
except ModuleNotFoundError:
from sqlitefid.libs.CSVHandlerClass import DroidCSVHandler
from sqlitefid.libs.ToolMappingClass import ToolMapping
try:
from src.sqlitefid.libs.CSVHandlerClass import DroidCSVHandler
from src.sqlitefid.libs.ToolMappingClass import ToolMapping
except ModuleNotFoundError:
from sqlitefid.libs.CSVHandlerClass import DroidCSVHandler
from sqlitefid.libs.ToolMappingClass import ToolMapping
else:
from .CSVHandlerClass import DroidCSVHandler
from .ToolMappingClass import ToolMapping


class DROIDLoader:
Expand Down
14 changes: 9 additions & 5 deletions src/sqlitefid/libs/FidoLoaderClass.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,18 @@

import logging
import tempfile
import os

try:
from libs.CSVHandlerClass import GenericCSVHandler
except ModuleNotFoundError:
if os.name != "nt":
try:
from src.sqlitefid.libs.CSVHandlerClass import GenericCSVHandler
from libs.CSVHandlerClass import GenericCSVHandler
except ModuleNotFoundError:
from sqlitefid.libs.CSVHandlerClass import GenericCSVHandler
try:
from src.sqlitefid.libs.CSVHandlerClass import GenericCSVHandler
except ModuleNotFoundError:
from sqlitefid.libs.CSVHandlerClass import GenericCSVHandler
else:
from .CSVHandlerClass import GenericCSVHandler


class FidoLoader:
Expand Down
14 changes: 9 additions & 5 deletions src/sqlitefid/libs/SFHandlerClass.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,18 @@
import logging
import ntpath
import os.path
import os

try:
from libs.PyDateHandler import PyDateHandler
except ModuleNotFoundError:
if os.name != "nt":
try:
from src.sqlitefid.libs.PyDateHandler import PyDateHandler
from libs.PyDateHandler import PyDateHandler
except ModuleNotFoundError:
from sqlitefid.libs.PyDateHandler import PyDateHandler
try:
from src.sqlitefid.libs.PyDateHandler import PyDateHandler
except ModuleNotFoundError:
from sqlitefid.libs.PyDateHandler import PyDateHandler
else:
from .PyDateHandler import PyDateHandler


class SFYAMLHandler:
Expand Down
22 changes: 14 additions & 8 deletions src/sqlitefid/libs/SFLoaderClass.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,22 @@
into the sqlite db.
"""

try:
from libs.SFHandlerClass import SFYAMLHandler
from libs.ToolMappingClass import ToolMapping
except ModuleNotFoundError:
import os

if os.name != "nt":
try:
from src.sqlitefid.libs.SFHandlerClass import SFYAMLHandler
from src.sqlitefid.libs.ToolMappingClass import ToolMapping
from libs.SFHandlerClass import SFYAMLHandler
from libs.ToolMappingClass import ToolMapping
except ModuleNotFoundError:
from sqlitefid.libs.SFHandlerClass import SFYAMLHandler
from sqlitefid.libs.ToolMappingClass import ToolMapping
try:
from src.sqlitefid.libs.SFHandlerClass import SFYAMLHandler
from src.sqlitefid.libs.ToolMappingClass import ToolMapping
except ModuleNotFoundError:
from sqlitefid.libs.SFHandlerClass import SFYAMLHandler
from sqlitefid.libs.ToolMappingClass import ToolMapping
else:
from .SFHandlerClass import SFYAMLHandler
from .ToolMappingClass import ToolMapping


class SFLoader:
Expand Down
44 changes: 24 additions & 20 deletions src/sqlitefid/sqlitefid.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,32 @@
import sys
import time

try:
from libs.DROIDLoaderClass import DROIDLoader
from libs.FidoLoaderClass import FidoLoader
from libs.GenerateBaselineDBClass import GenerateBaselineDB
from libs.IdentifyExportClass import IdentifyExport
from libs.SFLoaderClass import SFLoader
from libs.Version import SqliteFIDVersion
except ModuleNotFoundError:
if os.name != "nt":
try:
from src.sqlitefid.libs.DROIDLoaderClass import DROIDLoader
from src.sqlitefid.libs.FidoLoaderClass import FidoLoader
from src.sqlitefid.libs.GenerateBaselineDBClass import GenerateBaselineDB
from src.sqlitefid.libs.IdentifyExportClass import IdentifyExport
from src.sqlitefid.libs.SFLoaderClass import SFLoader
from src.sqlitefid.libs.Version import SqliteFIDVersion
from libs.DROIDLoaderClass import DROIDLoader
from libs.FidoLoaderClass import FidoLoader
from libs.GenerateBaselineDBClass import GenerateBaselineDB
from libs.IdentifyExportClass import IdentifyExport
from libs.SFLoaderClass import SFLoader
from libs.Version import SqliteFIDVersion
except ModuleNotFoundError:
from sqlitefid.libs.DROIDLoaderClass import DROIDLoader
from sqlitefid.libs.FidoLoaderClass import FidoLoader
from sqlitefid.libs.GenerateBaselineDBClass import GenerateBaselineDB
from sqlitefid.libs.IdentifyExportClass import IdentifyExport
from sqlitefid.libs.SFLoaderClass import SFLoader
from sqlitefid.libs.Version import SqliteFIDVersion
try:
from src.sqlitefid.libs.DROIDLoaderClass import DROIDLoader
from src.sqlitefid.libs.FidoLoaderClass import FidoLoader
from src.sqlitefid.libs.GenerateBaselineDBClass import GenerateBaselineDB
from src.sqlitefid.libs.IdentifyExportClass import IdentifyExport
from src.sqlitefid.libs.SFLoaderClass import SFLoader
from src.sqlitefid.libs.Version import SqliteFIDVersion
except ModuleNotFoundError:
from sqlitefid.libs.DROIDLoaderClass import DROIDLoader
from sqlitefid.libs.FidoLoaderClass import FidoLoader
from sqlitefid.libs.GenerateBaselineDBClass import GenerateBaselineDB
from sqlitefid.libs.IdentifyExportClass import IdentifyExport
from sqlitefid.libs.SFLoaderClass import SFLoader
from sqlitefid.libs.Version import SqliteFIDVersion
else:
from . import unicodecsv
from .PyDateHandler import PyDateHandler

LOGFORMAT = "%(asctime)-15s %(levelname)s: %(message)s"
DATEFORMAT = "%Y-%m-%d %H:%M:%S"
Expand Down
Loading