Merge pull request #171 from lanl/pulido/issue96

data move bug fix

Author: jpulidojr

dsi/core.py

@@ -1474,11 +1474,8 @@ def index(self, local_loc, remote_loc, isVerbose=False):
             raise
 
         # See if filesystem exists
-        try:
-            fs_t = t.get_table("filesystem")
-            if isVerbose:
-                print("fs table exists already, skipping for now")
-        except:
+        fs_t = t.get_table("filesystem")
+        if fs_t.empty:
             if isVerbose:
                 print( "Creating new fs table")
             # Create new filesystem collection with origin and remote locations
@@ -1518,7 +1515,8 @@ def copy(self, tool="copy", isVerbose=False, **kwargs):
 
         try:
             #f = os.path.join((local_loc, str(self.project_name+".db") ))
-            f = self.local_location+"/"+self.project_name+".db"
+            #f = self.local_location+"/"+self.project_name+".db"
+            f = self.project_name+".db"
             if isVerbose:
                 print("db: ", f)
             if os.path.exists(f):
@@ -1528,9 +1526,8 @@ def copy(self, tool="copy", isVerbose=False, **kwargs):
             raise
 
         # See if filesystem exists
-        try:
-            fs_t = t.get_table("filesystem")
-        except:
+        fs_t = t.get_table("filesystem")
+        if fs_t.empty:
             print( " Filesystem table not found. Try running Index first.")
             print( " Data copy failed. ")
             return
@@ -1555,8 +1552,9 @@ def copy(self, tool="copy", isVerbose=False, **kwargs):
 
             # Database movement
             if isVerbose:
-                print( " cp " + os.path.join(self.local_location, str(self.project_name+".db") ) + " " + os.path.join(self.remote_location, self.project_name, self.project_name+".db" ) )
-            shutil.copy2(os.path.join(self.local_location, str(self.project_name+".db") ), os.path.join(self.remote_location, self.project_name, self.project_name+".db" ) )
+                print( " cp " + str(self.project_name+".db") + " " + os.path.join(self.remote_location, self.project_name, self.project_name+".db" ) )
+            #shutil.copy2(os.path.join(self.local_location, str(self.project_name+".db") ), os.path.join(self.remote_location, self.project_name, self.project_name+".db" ) )
+            shutil.copy2(str(self.project_name+".db"), os.path.join(self.remote_location, self.project_name, self.project_name+".db" ) )
 
             print( " Data Copy Complete! ")
         elif tool == "scp":

examples/dsi_tutorial.ipynb

@@ -621,7 +621,7 @@
    "outputs": [],
    "source": [
     "# Create Sync type with project name\n",
-    "s = Sync(\"dsi-tutorial.db\")"
+    "s = Sync(\"dsi-tutorial\")"
    ]
   },
   {
@@ -634,6 +634,16 @@
     "s.index(local_files,remote_path,True)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "62994a77-f6f4-4a39-a592-ad4cb914796e",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "store.summary()"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,