Skip to content

Commit 4c8587b

Browse files
authored
Merge pull request #116 from AntiDog/master2
dates were null in data for pocket code
2 parents 728294e + d826737 commit 4c8587b

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/scratchtocatrobat/scratch/scratchwebapi.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -275,18 +275,18 @@ def extract_project_details(project_id, escape_quotes=True):
275275
extracted_text = getMetaDataEntry(project_id , "history")
276276
extracted_text = extracted_text["modified"]
277277
if extracted_text is None: return None
278-
modified_date_str = unicode(extracted_text).replace("Modified:", "").strip()
278+
modified_date_str = unicode(extracted_text).replace("Modified:", "").replace("Z","000").strip()
279279
try:
280-
modified_date = datetime.strptime(modified_date_str, '%d %b %Y')
280+
modified_date = datetime.strptime(modified_date_str, "%Y-%m-%dT%H:%M:%S.%f")
281281
except:
282282
modified_date = None
283283

284284
extracted_text = getMetaDataEntry(project_id , "history")
285285
extracted_text = extracted_text["shared"]
286286
if extracted_text is None: return None
287-
shared_date_str = unicode(extracted_text).replace("Shared:", "").strip()
287+
shared_date_str = unicode(extracted_text).replace("Shared:", "").replace("Z","000").strip()
288288
try:
289-
shared_date = datetime.strptime(shared_date_str, '%d %b %Y')
289+
shared_date = datetime.strptime(shared_date_str, "%Y-%m-%dT%H:%M:%S.%f")
290290
except:
291291
shared_date = None
292292

src/scratchtocatrobat/scratch/test_scratchwebapi.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,12 @@ def test_can_request_remixes_for_id(self):
340340
assert extracted_project_remixes == expected_project_remixes, \
341341
"'{}' is not equal to '{}'".format(extracted_project_remixes,
342342
expected_project_remixes)
343+
def test_extract_project_details(self):
344+
details = scratchwebapi.extract_project_details(10205819, escape_quotes=True)
345+
assert details.as_dict()["modified_date"] != None
346+
assert details.as_dict()["shared_date"] != None
343347

344-
# def test_can_request_project_info_for_id(self):
348+
# def test_can_request_project_info_for_id(self):
345349
# for (project_id, expected_project_title) in TEST_PROJECT_ID_TO_TITLE_MAP.iteritems():
346350
# extracted_project_info = scratchwebapi.request_project_details_for(project_id)
347351
# assert extracted_project_info is not None

0 commit comments

Comments
 (0)