Compare commits

..

2 Commits
0.8.2 ... 0.8.3

Author SHA1 Message Date
837e1280bd Bump version to 0.8.3 2023-02-06 23:30:14 -05:00
8f9c825903 Fix user timezones in scrobbler files 2023-02-06 23:28:57 -05:00
3 changed files with 11 additions and 7 deletions

View File

@ -1,6 +1,6 @@
[tool.poetry]
name = "vrobbler"
version = "0.8.2"
version = "0.8.3"
description = ""
authors = ["Colin Powell <colin@unbl.ink>"]

View File

@ -52,7 +52,9 @@ class AudioScrobblerTSVImport(TimeStampedModel):
tz = None
if self.user:
tz = self.user.profile.tzinfo
scrobbles = process_audioscrobbler_tsv_file(self.tsv_file.path, tz=tz)
scrobbles = process_audioscrobbler_tsv_file(
self.tsv_file.path, user_tz=tz
)
if scrobbles:
self.process_log = f"Created {len(scrobbles)} scrobbles"
for scrobble in scrobbles:

View File

@ -9,11 +9,11 @@ from scrobbles.models import Scrobble
logger = logging.getLogger(__name__)
def process_audioscrobbler_tsv_file(file_path, tz=None):
def process_audioscrobbler_tsv_file(file_path, user_tz=None):
"""Takes a path to a file of TSV data and imports it as past scrobbles"""
new_scrobbles = []
if not tz:
tz = pytz.utc
if not user_tz:
user_tz = pytz.utc
with open(file_path) as infile:
source = 'Audioscrobbler File'
@ -71,8 +71,10 @@ def process_audioscrobbler_tsv_file(file_path, tz=None):
track.musicbrainz_id = row[7]
track.save()
timestamp = datetime.utcfromtimestamp(int(row[6])).replace(
tzinfo=tz
timestamp = (
datetime.utcfromtimestamp(int(row[6]))
.replace(tzinfo=user_tz)
.astimezone(pytz.utc)
)
source = 'Audioscrobbler File'