publishing -> done ?

Author: 0saurabh0

legal_tools/management/commands/publish.py

@@ -125,7 +125,7 @@ def save_index_rdf(output_dir, filename):
     # Function is at top level of module so that it can be pickled by
     # multiprocessing.
     index_url = f"/rdf/{filename}"
-    relpath = f"rdf/{filename}"
+    relpath = f"{filename}"
     save_url_as_static_file(output_dir, url=index_url, relpath=relpath)
 
 
@@ -261,7 +261,58 @@ def copy_tools_rdfs(self):
             copyfile(os.path.join(tools_rdf_dir, rdf), dest_file)
             LOG.debug(f"    {relative_name}")
 
-    def copy_meta_rdfs(self):
+    # def copy_meta_rdfs(self):   TO BE REMOVED
+    #     hostname = socket.gethostname()
+    #     legacy_dir = self.legacy_dir
+    #     output_dir = self.output_dir
+    #     meta_rdf_dir = os.path.join(legacy_dir, "rdf-meta")
+    #     meta_files = [
+    #         meta_file
+    #         for meta_file in os.listdir(meta_rdf_dir)
+    #         if os.path.isfile(os.path.join(meta_rdf_dir, meta_file))
+    #     ]
+    #     meta_files.sort()
+    #     dest_dir = os.path.join(output_dir, "rdf")
+    #     os.makedirs(dest_dir, exist_ok=True)
+    #     LOG.debug(f"{hostname}:{output_dir}")
+    #     LOG.info("Copying RDF information and metadata")
+    #     for meta_file in meta_files:
+    #         dest_relative = os.path.join("rdf", meta_file)
+    #         dest_full = os.path.join(output_dir, dest_relative)
+    #         LOG.debug(f"    {dest_relative}")
+    #         copyfile(os.path.join(meta_rdf_dir, meta_file), dest_full)
+    #         if meta_file == "index.rdf":
+    #             os.makedirs(
+    #                 os.path.join(output_dir, "licenses"), exist_ok=True
+    #             )
+    #             dir_fd = os.open(output_dir, os.O_RDONLY)
+    #             symlink = os.path.join("licenses", meta_file)
+    #             try:
+    #                 os.symlink(f"../{dest_relative}", symlink, dir_fd=dir_fd)
+    #                 LOG.debug(f"   ^{symlink}")
+    #             finally:
+    #                 os.close(dir_fd)
+    #         elif meta_file == "ns.html":
+    #             dir_fd = os.open(output_dir, os.O_RDONLY)
+    #             symlink = meta_file
+    #             try:
+    #                 os.symlink(dest_relative, symlink, dir_fd=dir_fd)
+    #                 LOG.debug(f"   ^{symlink}")
+    #             finally:
+    #                 os.close(dir_fd)
+    #         elif meta_file == "schema.rdf":
+    #             dir_fd = os.open(output_dir, os.O_RDONLY)
+    #             symlink = meta_file
+    #             try:
+    #                 os.symlink(dest_relative, symlink, dir_fd=dir_fd)
+    #                 LOG.debug(f"   ^{symlink}")
+    #             finally:
+    #                 os.close(dir_fd)
+
+    def write_rdf_meta(self):
+        """
+        Generate the index.rdf, images.rdf and copies the rest.
+        """
         hostname = socket.gethostname()
         legacy_dir = self.legacy_dir
         output_dir = self.output_dir
@@ -275,12 +326,19 @@ def copy_meta_rdfs(self):
         dest_dir = os.path.join(output_dir, "rdf")
         os.makedirs(dest_dir, exist_ok=True)
         LOG.debug(f"{hostname}:{output_dir}")
-        LOG.info("Copying RDF information and metadata")
+
         for meta_file in meta_files:
             dest_relative = os.path.join("rdf", meta_file)
             dest_full = os.path.join(output_dir, dest_relative)
-            LOG.debug(f"    {dest_relative}")
-            copyfile(os.path.join(meta_rdf_dir, meta_file), dest_full)
+            filenames = ["index.rdf", "images.rdf"]
+            if meta_file in filenames:
+                LOG.info(f"Writing {meta_file}")
+                save_index_rdf(dest_dir, meta_file)
+            else:
+                LOG.info(f"Copying {meta_file}")
+                LOG.debug(f"    {dest_relative}")
+                copyfile(os.path.join(meta_rdf_dir, meta_file), dest_full)
+
             if meta_file == "index.rdf":
                 os.makedirs(
                     os.path.join(output_dir, "licenses"), exist_ok=True
@@ -309,38 +367,6 @@ def copy_meta_rdfs(self):
                 finally:
                     os.close(dir_fd)
 
-    def write_rdf_meta(self):
-        """
-        Generate the index.rdf, images.rdf and copies the rest.
-        """
-        hostname = socket.gethostname()
-        legacy_dir = self.legacy_dir
-        output_dir = self.output_dir
-        meta_rdf_dir = os.path.join(legacy_dir, "rdf-meta")
-        meta_files = [
-            meta_file
-            for meta_file in os.listdir(meta_rdf_dir)
-            if os.path.isfile(os.path.join(meta_rdf_dir, meta_file))
-        ]
-        meta_files.sort()
-        dest_dir = os.path.join(output_dir, "rdf")
-        os.makedirs(dest_dir, exist_ok=True)
-        LOG.debug(f"{hostname}:{output_dir}")
-
-        for meta_file in meta_files:
-            dest_relative = os.path.join("rdf", meta_file)
-            dest_full = os.path.join(output_dir, dest_relative)
-            filenames = ["index.rdf", "images.rdf"]
-            if meta_file in filenames:
-                for filename in filenames:
-                    rdf_path = os.path.join(dest_dir, filename)
-                    LOG.info(f"Writing {filename}")
-                    save_index_rdf(rdf_path, filename)
-            else:
-                LOG.info(f"Copying {meta_file}")
-                LOG.debug(f"    {dest_relative}")
-                copyfile(os.path.join(meta_rdf_dir, meta_file), dest_full)
-
     def copy_legal_code_plaintext(self):
         hostname = socket.gethostname()
         legacy_dir = self.legacy_dir