Skip to content

Commit bd9060c

Browse files
ross-spencerross-spencer
committed
WIP: Windows compatibility
1 parent e13c096 commit bd9060c

7 files changed

Lines changed: 82 additions & 56 deletions

File tree

‎.github/workflows/test.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ jobs:
1212
strategy:
1313
matrix:
1414
include:
15-
- python-version: "3.9"
16-
toxenv: "py39"
1715
- python-version: "3.10"
1816
toxenv: "py310"
1917
steps:

‎src/sqlitefid/libs/CSVHandlerClass.py‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,22 @@
1313
import logging
1414
import os.path
1515
from urllib.parse import urlparse
16+
import os
1617

17-
try:
18-
from libs import unicodecsv
19-
from libs.PyDateHandler import PyDateHandler
20-
except ModuleNotFoundError:
18+
if os.name != "nt":
2119
try:
22-
from src.sqlitefid.libs import unicodecsv
23-
from src.sqlitefid.libs.PyDateHandler import PyDateHandler
20+
from libs import unicodecsv
21+
from libs.PyDateHandler import PyDateHandler
2422
except ModuleNotFoundError:
25-
from sqlitefid.libs import unicodecsv
26-
from sqlitefid.libs.PyDateHandler import PyDateHandler
23+
try:
24+
from src.sqlitefid.libs import unicodecsv
25+
from src.sqlitefid.libs.PyDateHandler import PyDateHandler
26+
except ModuleNotFoundError:
27+
from sqlitefid.libs import unicodecsv
28+
from sqlitefid.libs.PyDateHandler import PyDateHandler
29+
else:
30+
from . import unicodecsv
31+
from .PyDateHandler import PyDateHandler
2732

2833

2934
class CSVExportException(Exception):

‎src/sqlitefid/libs/DROIDLoaderClass.py‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,22 @@
1111

1212
import logging
1313
from sqlite3 import OperationalError
14+
import os
1415

15-
try:
16-
from libs.CSVHandlerClass import DroidCSVHandler
17-
from libs.ToolMappingClass import ToolMapping
18-
except ModuleNotFoundError:
16+
if os.name != "nt":
1917
try:
20-
from src.sqlitefid.libs.CSVHandlerClass import DroidCSVHandler
21-
from src.sqlitefid.libs.ToolMappingClass import ToolMapping
18+
from libs.CSVHandlerClass import DroidCSVHandler
19+
from libs.ToolMappingClass import ToolMapping
2220
except ModuleNotFoundError:
23-
from sqlitefid.libs.CSVHandlerClass import DroidCSVHandler
24-
from sqlitefid.libs.ToolMappingClass import ToolMapping
21+
try:
22+
from src.sqlitefid.libs.CSVHandlerClass import DroidCSVHandler
23+
from src.sqlitefid.libs.ToolMappingClass import ToolMapping
24+
except ModuleNotFoundError:
25+
from sqlitefid.libs.CSVHandlerClass import DroidCSVHandler
26+
from sqlitefid.libs.ToolMappingClass import ToolMapping
27+
else:
28+
from .CSVHandlerClass import DroidCSVHandler
29+
from .ToolMappingClass import ToolMapping
2530

2631

2732
class DROIDLoader:

‎src/sqlitefid/libs/FidoLoaderClass.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@
1515

1616
import logging
1717
import tempfile
18+
import os
1819

19-
try:
20-
from libs.CSVHandlerClass import GenericCSVHandler
21-
except ModuleNotFoundError:
20+
if os.name != "nt":
2221
try:
23-
from src.sqlitefid.libs.CSVHandlerClass import GenericCSVHandler
22+
from libs.CSVHandlerClass import GenericCSVHandler
2423
except ModuleNotFoundError:
25-
from sqlitefid.libs.CSVHandlerClass import GenericCSVHandler
24+
try:
25+
from src.sqlitefid.libs.CSVHandlerClass import GenericCSVHandler
26+
except ModuleNotFoundError:
27+
from sqlitefid.libs.CSVHandlerClass import GenericCSVHandler
28+
else:
29+
from .CSVHandlerClass import GenericCSVHandler
2630

2731

2832
class FidoLoader:

‎src/sqlitefid/libs/SFHandlerClass.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@
1616
import logging
1717
import ntpath
1818
import os.path
19+
import os
1920

20-
try:
21-
from libs.PyDateHandler import PyDateHandler
22-
except ModuleNotFoundError:
21+
if os.name != "nt":
2322
try:
24-
from src.sqlitefid.libs.PyDateHandler import PyDateHandler
23+
from libs.PyDateHandler import PyDateHandler
2524
except ModuleNotFoundError:
26-
from sqlitefid.libs.PyDateHandler import PyDateHandler
25+
try:
26+
from src.sqlitefid.libs.PyDateHandler import PyDateHandler
27+
except ModuleNotFoundError:
28+
from sqlitefid.libs.PyDateHandler import PyDateHandler
29+
else:
30+
from .PyDateHandler import PyDateHandler
2731

2832

2933
class SFYAMLHandler:

‎src/sqlitefid/libs/SFLoaderClass.py‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,22 @@
99
into the sqlite db.
1010
"""
1111

12-
try:
13-
from libs.SFHandlerClass import SFYAMLHandler
14-
from libs.ToolMappingClass import ToolMapping
15-
except ModuleNotFoundError:
12+
import os
13+
14+
if os.name != "nt":
1615
try:
17-
from src.sqlitefid.libs.SFHandlerClass import SFYAMLHandler
18-
from src.sqlitefid.libs.ToolMappingClass import ToolMapping
16+
from libs.SFHandlerClass import SFYAMLHandler
17+
from libs.ToolMappingClass import ToolMapping
1918
except ModuleNotFoundError:
20-
from sqlitefid.libs.SFHandlerClass import SFYAMLHandler
21-
from sqlitefid.libs.ToolMappingClass import ToolMapping
19+
try:
20+
from src.sqlitefid.libs.SFHandlerClass import SFYAMLHandler
21+
from src.sqlitefid.libs.ToolMappingClass import ToolMapping
22+
except ModuleNotFoundError:
23+
from sqlitefid.libs.SFHandlerClass import SFYAMLHandler
24+
from sqlitefid.libs.ToolMappingClass import ToolMapping
25+
else:
26+
from .SFHandlerClass import SFYAMLHandler
27+
from .ToolMappingClass import ToolMapping
2228

2329

2430
class SFLoader:

‎src/sqlitefid/sqlitefid.py‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,32 @@
1717
import sys
1818
import time
1919

20-
try:
21-
from libs.DROIDLoaderClass import DROIDLoader
22-
from libs.FidoLoaderClass import FidoLoader
23-
from libs.GenerateBaselineDBClass import GenerateBaselineDB
24-
from libs.IdentifyExportClass import IdentifyExport
25-
from libs.SFLoaderClass import SFLoader
26-
from libs.Version import SqliteFIDVersion
27-
except ModuleNotFoundError:
20+
if os.name != "nt":
2821
try:
29-
from src.sqlitefid.libs.DROIDLoaderClass import DROIDLoader
30-
from src.sqlitefid.libs.FidoLoaderClass import FidoLoader
31-
from src.sqlitefid.libs.GenerateBaselineDBClass import GenerateBaselineDB
32-
from src.sqlitefid.libs.IdentifyExportClass import IdentifyExport
33-
from src.sqlitefid.libs.SFLoaderClass import SFLoader
34-
from src.sqlitefid.libs.Version import SqliteFIDVersion
22+
from libs.DROIDLoaderClass import DROIDLoader
23+
from libs.FidoLoaderClass import FidoLoader
24+
from libs.GenerateBaselineDBClass import GenerateBaselineDB
25+
from libs.IdentifyExportClass import IdentifyExport
26+
from libs.SFLoaderClass import SFLoader
27+
from libs.Version import SqliteFIDVersion
3528
except ModuleNotFoundError:
36-
from sqlitefid.libs.DROIDLoaderClass import DROIDLoader
37-
from sqlitefid.libs.FidoLoaderClass import FidoLoader
38-
from sqlitefid.libs.GenerateBaselineDBClass import GenerateBaselineDB
39-
from sqlitefid.libs.IdentifyExportClass import IdentifyExport
40-
from sqlitefid.libs.SFLoaderClass import SFLoader
41-
from sqlitefid.libs.Version import SqliteFIDVersion
29+
try:
30+
from src.sqlitefid.libs.DROIDLoaderClass import DROIDLoader
31+
from src.sqlitefid.libs.FidoLoaderClass import FidoLoader
32+
from src.sqlitefid.libs.GenerateBaselineDBClass import GenerateBaselineDB
33+
from src.sqlitefid.libs.IdentifyExportClass import IdentifyExport
34+
from src.sqlitefid.libs.SFLoaderClass import SFLoader
35+
from src.sqlitefid.libs.Version import SqliteFIDVersion
36+
except ModuleNotFoundError:
37+
from sqlitefid.libs.DROIDLoaderClass import DROIDLoader
38+
from sqlitefid.libs.FidoLoaderClass import FidoLoader
39+
from sqlitefid.libs.GenerateBaselineDBClass import GenerateBaselineDB
40+
from sqlitefid.libs.IdentifyExportClass import IdentifyExport
41+
from sqlitefid.libs.SFLoaderClass import SFLoader
42+
from sqlitefid.libs.Version import SqliteFIDVersion
43+
else:
44+
from . import unicodecsv
45+
from .PyDateHandler import PyDateHandler
4246

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

0 commit comments

Comments
 (0)