Changeset 37727

Timestamp:

2023-04-25T17:24:32+12:00 (12 months ago)

Author:

davidb

Message:

Updated to work with newly structured spreadsheet that separates out Online (File) and DriveLink

File:

• gs3-installations/thewillow/trunk/sites/thewillow/collect/community-contributions/prepare/xlsx-to-csv--thewillow-directorysheet.py (modified) (4 diffs)

gs3-installations/thewillow/trunk/sites/thewillow/collect/community-contributions/prepare/xlsx-to-csv--thewillow-directorysheet.py

@@ -33 +33 @@
     "Description"       : { "gsheading": "Description"    },
     "Creation Date"     : { "gsheading": "CreationDate"   },
-    "Orginial/ Copy"    : { "gsheading": "OirginalOrCopy" },
+    "Orginial/ Copy"    : { "gsheading": "OriginalOrCopy" },
     "File"              : { "gsheading": "FileNote"       },
+    "DriveLink"         : { "gsheading": "DriveNote"       },
     "Library Reference" : { "gsheading": "LibraryRefNum"  },
     "Copyright?"        : { "gsheading": "InCopyright"    },
@@ -49 +50 @@
 #
 ExtraHeadings = {
-    "Filename"     : { "colpos": 1 },
-    "DLIdentifier" : { "colpos": 2 },
-    "OrigFilename" : { "colpos": 3 },
-    "OptHyperlink" : None
+    "Filename"          : { "colpos": 1 },
+    "FilenameAssocwith" : { "colpos": 2 },
+    "DLIdentifier"      : { "colpos": 3 },
+    "OrigFilename"      : { "colpos": 4 },
+    "OrigDrivename"     : { "colpos": 5 },
+    "OptHyperlink"      : None,
+    "OptDrivelink"      : None
 }
     
@@ -259 +263 @@
         
         # print("    row: " + str(row_i))
-
+        sys.stdout.write("["+ str(row_i) + "] " )
+        sys.stdout.flush()
+        
         dl_identifier_str = "tw-contrib-%04d" % dl_identifier
         
@@ -298 +304 @@
             worksheet.cell(row=row_i, column=filename_colpos, value=renamed_filename)
 
-            
+        drivenote_colpos = HeadingsTransformation["DriveLink"]["colpos"]
+
+        drivenote_cell = worksheet.cell(row=row_i, column=drivenote_colpos)
+        opt_drivelink  = drivenote_cell.hyperlink
+            
+        if opt_drivelink != None:
+            
+            opt_drivelink_colpos = HeadingsTransformation["OptDrivelink"]["colpos"]
+            doc_url = opt_drivelink.target
+            worksheet.cell(row=row_i, column=opt_drivelink_colpos, value=doc_url)
+            
+            downloaded_filename = downloadGoogleDoc(doc_url)
+
+            orig_file = os.path.basename(downloaded_filename)
+
+            # Determine if this will be the primary (doc) file, or an assoicated file
+            orig_filename_colpos = HeadingsTransformation["OrigFilename"]["colpos"]
+            orig_filename_value = worksheet.cell(row=row_i, column=orig_filename_colpos).value
+
+            downloaded_filename = optConvertDocToPdf(downloaded_filename)
+            
+            if orig_filename_value is None or orig_filename_value == "":
+                # Make this the primary file/doc
+                worksheet.cell(row=row_i, column=orig_filename_colpos, value=orig_file)
+
+                renamed_filename = fileRenameToDLIdentifier(downloaded_filename,dl_identifier_str)
+
+                filename_colpos = HeadingsTransformation["Filename"]["colpos"]
+                worksheet.cell(row=row_i, column=filename_colpos, value=renamed_filename)                
+            else:
+                orig_drivename_colpos = HeadingsTransformation["OrigDrivename"]["colpos"]
+                
+                worksheet.cell(row=row_i, column=orig_drivename_colpos, value=orig_file)
+
+                dl_identifier_assocwith_str = "tw-contrib-%04d-assocwith" % dl_identifier
+                
+                renamed_filename = fileRenameToDLIdentifier(downloaded_filename,dl_identifier_assocwith_str)
+
+                # We store this in the spreasheet mostly for auditing purposes
+                # The actual 'assocwith' DL behaviour is triggered by the plugin option,
+                # driven by a regular expression matching on the two filenames
+                filename_assocwith_colpos = HeadingsTransformation["FilenameAssocwith"]["colpos"]
+                worksheet.cell(row=row_i, column=filename_assocwith_colpos, value=renamed_filename)                
+
         dl_identifier += 1
         row_i += 1