Skip to content

Assorted small fixes #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyanDFIR merged 3 commits into from
Jul 6, 2026
+25 −14
Merged

Assorted small fixes #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72e12fd
Associate `source_item` with bookmark and session items in Firefox ar…
RyanDFIR Jul 6, 2026
ad75540
Refactor `make_version_info` to ensure compatibility on non-Windows p…
RyanDFIR Jul 6, 2026
9d40cb0
Add UTC timezone info to datetime objects in test configurations
RyanDFIR Jul 6, 2026
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
6 changes: 6 additions & 0 deletions pyhindsight/browsers/firefox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ def get_bookmarks(self, path, database='places.sqlite'):
rows = cursor.fetchall()
folder_titles = {r['id']: (r['title'] or '') for r in rows if r['type'] == BOOKMARK_TYPE_FOLDER}

source_item = os.path.relpath(os.path.join(path, database), self.profile_path)
for row in rows:
bm_type = row.get('type')
parent_folder = folder_titles.get(row.get('parent'), '')
Expand All @@ -323,6 +324,7 @@ def get_bookmarks(self, path, database='places.sqlite'):
url=row.get('url'),
parent_folder=parent_folder,
)
item.source_item = source_item
results.append(item)
elif bm_type == BOOKMARK_TYPE_FOLDER:
# Skip the synthetic top-level roots (menu/toolbar/tags/unfiled/mobile).
Expand All @@ -335,6 +337,7 @@ def get_bookmarks(self, path, database='places.sqlite'):
name=row.get('title') or '',
parent_folder=parent_folder,
)
item.source_item = source_item
results.append(item)

self.artifacts_counts['Bookmarks'] = len(results)
Expand Down Expand Up @@ -1182,6 +1185,7 @@ def _emit_entries(entries, window_idx, tab_idx, selected_index,
)
item.row_type = row_label
item.value = ''
item.source_item = source_item
item.transition_type = (
'selected' if nav_idx + 1 == selected_index else 'history'
)
Expand Down Expand Up @@ -1216,6 +1220,7 @@ def _emit_entries(entries, window_idx, tab_idx, selected_index,
)
item.row_type = f'session (closed tab, {source_label})'
item.value = ''
item.source_item = source_item
item.transition_type = 'closed'
results.append(item)

Expand All @@ -1241,6 +1246,7 @@ def _emit_entries(entries, window_idx, tab_idx, selected_index,
)
item.row_type = f'session (closed window, {source_label})'
item.value = ''
item.source_item = source_item
item.transition_type = 'closed'
results.append(item)

Expand Down
13 changes: 9 additions & 4 deletions spec/_version_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,17 @@

from pyhindsight import __version__

from PyInstaller.utils.win32.versioninfo import (
VSVersionInfo, FixedFileInfo, StringFileInfo, StringTable, StringStruct,
VarFileInfo, VarStruct)


def make_version_info(original_filename):
# The version resource is Windows-only, and PyInstaller's versioninfo
# module can't even be imported elsewhere (pefile is a Windows-only dep).
if sys.platform != 'win32':
return None

from PyInstaller.utils.win32.versioninfo import (
VSVersionInfo, FixedFileInfo, StringFileInfo, StringTable, StringStruct,
VarFileInfo, VarStruct)

parts = __version__.split('.')
year, month = int(parts[0]), int(parts[1])
micro = int(parts[2]) if len(parts) > 2 else 0
Expand Down
10 changes: 5 additions & 5 deletions tests/test_downloads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ class TestGetDownloads(unittest.TestCase):
def test_get_downloads(self):

test_config = [
{'version': [1], 'record_count': 2, 'wikipedia_record': 0, 'wikipedia_timestamp': datetime.datetime(2013, 6, 5, 4, 28, 30)},
{'version': [10], 'record_count': 2, 'wikipedia_record': 0, 'wikipedia_timestamp': datetime.datetime(2013, 6, 27, 4, 23, 25)},
{'version': [20], 'record_count': 2, 'wikipedia_record': 0, 'wikipedia_timestamp': datetime.datetime(2013, 6, 30, 21, 26, 5)},
{'version': [30], 'record_count': 2, 'wikipedia_record': 0, 'wikipedia_timestamp': datetime.datetime(2013, 10, 2, 23, 17, 29, 397160)},
{'version': [60], 'record_count': 2, 'wikipedia_record': 0, 'wikipedia_timestamp': datetime.datetime(2017, 8, 5, 22, 6, 52, 88356)}
{'version': [1], 'record_count': 2, 'wikipedia_record': 0, 'wikipedia_timestamp': datetime.datetime(2013, 6, 5, 4, 28, 30, tzinfo=datetime.timezone.utc)},
{'version': [10], 'record_count': 2, 'wikipedia_record': 0, 'wikipedia_timestamp': datetime.datetime(2013, 6, 27, 4, 23, 25, tzinfo=datetime.timezone.utc)},
{'version': [20], 'record_count': 2, 'wikipedia_record': 0, 'wikipedia_timestamp': datetime.datetime(2013, 6, 30, 21, 26, 5, tzinfo=datetime.timezone.utc)},
{'version': [30], 'record_count': 2, 'wikipedia_record': 0, 'wikipedia_timestamp': datetime.datetime(2013, 10, 2, 23, 17, 29, 397160, tzinfo=datetime.timezone.utc)},
{'version': [60], 'record_count': 2, 'wikipedia_record': 0, 'wikipedia_timestamp': datetime.datetime(2017, 8, 5, 22, 6, 52, 88356, tzinfo=datetime.timezone.utc)}
]

for config in test_config:
Expand Down
10 changes: 5 additions & 5 deletions tests/test_history.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ class TestGetHistory(unittest.TestCase):
def test_get_history(self):

test_config = [
{'version': [1], 'record_count': 46, 'wikipedia_record': 7, 'wikipedia_timestamp': datetime.datetime(2013, 6, 5, 4, 28, 55, 498623)},
{'version': [10], 'record_count': 84, 'wikipedia_record': 7, 'wikipedia_timestamp': datetime.datetime(2013, 6, 27, 4, 23, 14, 176756)},
{'version': [20], 'record_count': 58, 'wikipedia_record': 7, 'wikipedia_timestamp': datetime.datetime(2013, 6, 30, 21, 26, 13, 162176)},
{'version': [30], 'record_count': 46, 'wikipedia_record': 4, 'wikipedia_timestamp': datetime.datetime(2013, 10, 2, 23, 15, 13, 326712)},
{'version': [60], 'record_count': 61, 'wikipedia_record': 5, 'wikipedia_timestamp': datetime.datetime(2017, 8, 5, 22, 6, 56, 507864)}
{'version': [1], 'record_count': 46, 'wikipedia_record': 7, 'wikipedia_timestamp': datetime.datetime(2013, 6, 5, 4, 28, 55, 498623, tzinfo=datetime.timezone.utc)},
{'version': [10], 'record_count': 84, 'wikipedia_record': 7, 'wikipedia_timestamp': datetime.datetime(2013, 6, 27, 4, 23, 14, 176756, tzinfo=datetime.timezone.utc)},
{'version': [20], 'record_count': 58, 'wikipedia_record': 7, 'wikipedia_timestamp': datetime.datetime(2013, 6, 30, 21, 26, 13, 162176, tzinfo=datetime.timezone.utc)},
{'version': [30], 'record_count': 46, 'wikipedia_record': 4, 'wikipedia_timestamp': datetime.datetime(2013, 10, 2, 23, 15, 13, 326712, tzinfo=datetime.timezone.utc)},
{'version': [60], 'record_count': 61, 'wikipedia_record': 5, 'wikipedia_timestamp': datetime.datetime(2017, 8, 5, 22, 6, 56, 507864, tzinfo=datetime.timezone.utc)}
]

for config in test_config:
Expand Down
Loading