fixed issue #2

CHANGELOG.md

@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.0.3] - 2019-07-13
+## Changed
+- Fixed issue #2, windows version did not work because file paths had mixed
+slashes and backslashes. File path must be normalized with os.path.normpath()
+
+## [1.0.2] - 2018-10-25
+## Added
+- Enforced Python version 2
+
 ## [1.0.1] - 2018-03-12
 ### Added
 - Deduplication mechanism with `--nodedup` flag.

Makefile

@@ -35,7 +35,7 @@ w:
 win32: build32 zip32
 
 build32:
-	wine pyinstaller --onefile scrapbook2zotero.py
+	wine pyinstaller --onefile --hiddenimport=rdflib scrapbook2zotero.py
 
 zip32:
 	cd dist && zip scrapbook2zotero-$(shell git describe --abbrev=4 --dirty --always --tags).zip scrapbook2zotero.exe

scrapbook2zotero.py

@@ -397,7 +397,7 @@ def export_node(node, source_dir, tagchain, counter, deduplicator):
         <rdf:resource rdf:resource="{1}"/>
         <dc:title>{2}</dc:title>
         <link:type>application/pdf</link:type>
-    </z:Attachment>""".format(pdf_resource, basedir + '/' + pdfname, pdfname)
+    </z:Attachment>""".format(pdf_resource, os.path.normpath(basedir + '/' + pdfname), pdfname)
             pdf_links += u'\n        <link:link rdf:resource="#item_{0}"/>'.format(
                 pdf_resource)
             debug("pdf attachment '%s' added to '%s'" % (pdfname, node.nodeid))
@@ -438,7 +438,7 @@ def export_node(node, source_dir, tagchain, counter, deduplicator):
         <z:linkMode>1</z:linkMode>
         <link:type>text/html</link:type>
     </z:Attachment>""".format(node.nodeid, # {0}
-                              indexfname, # {1}
+                              os.path.normpath(indexfname), # {1}
                               ampersand(node.source), # {2}
                               nodetime_formatted, # {3}
                               ampersand(node.name) # {4}

test_s2z.py

@@ -85,7 +85,8 @@ def test_4_win32():
     subprocess.check_call(["wine", "dist/scrapbook2zotero.exe",
                            "scrapbook_test_data", "tmp/test-windows-crlf.rdf"])
     subprocess.check_call(["dos2unix", "-n", "tmp/test-windows-crlf.rdf", "tmp/test-windows.rdf"])
-    assert filecmp.cmp("samples/standard.rdf", "tmp/test-windows.rdf")
+    # standard-windows.rdf is like standard.rdf but with '/' replaced by '\' in file paths 
+    assert filecmp.cmp("samples/standard-windows.rdf", "tmp/test-windows.rdf")
 
 def test_5_nocoll():
     """ Testing disabling of collection exports (--nocoll flag) """