369 - Long to instant (#370)

Co-authored-by: Regis Leray <rleray@caesars.com>

Author: regis-leray

README.md

@@ -174,7 +174,7 @@ ZIO.runtime.map { implicit r: zio.Runtime[Any] =>
 # generate key
 $ gpg --gen-key
 
-# list the keys
+# list the keysFtpResource.scala
 $ gpg --list-keys
 
 /home/foo/.gnupg/pubring.gpg
@@ -188,16 +188,13 @@ sub   rsa4096 2018-08-22 [E]
 $>LONG_ID=1234517530FB96F147C6A146A326F592D39AAAAA 
 
 #send key to server
-$> gpg --keyserver hkp://keyserver.ubuntu.com --send-key $LONG_ID && \
- gpg --keyserver hkp://pgp.mit.edu --send-key $LONG_ID && \
- gpg --keyserver hkp://pool.sks-keyservers.net --send-key $LONG_ID 
-
-
-
+$> gpg --keyserver hkp://keyserver.ubuntu.com --send-key $LONG_ID
 
 ```
 
-2. Github secrets
+2. Github GPG / Secrets
+
+Full documentation here => https://github.com/sbt/sbt-ci-release?tab=readme-ov-file#gpg
 
 declare in github / repo / settings / secrets (new repository secret)
 
@@ -209,14 +206,15 @@ gpg --armor --export-secret-keys $LONG_ID | base64 -w0 | pbcopy
 The randomly generated password you used to create a fresh gpg key
 
 
+login to https://central.sonatype.com/
+click your username in the top right, then View Account,
+click on "Generate User Token", and "Ok"
+
 # declare in github (settings) SONATYPE_PASSWORD in plain text
-The password you use to log into https://s01.oss.sonatype.org/ (or https://oss.sonatype.org/ if your Sonatype account was created before February 2021). 
-***IMPORTANT*** Login s01.oss.sonatype.org and after profile, and select "User token"
- Alternatively, the password part of the user token if you generated one above.
+The password part of your Sonatype OSSRH token, generated on the Central Portal (not the account password!).
 
-# declare in github (settings) SONATYPE_USERNAME in plain text 
-***IMPORTANT*** Login s01.oss.sonatype.org, got to profile, and select "User token"
-Alternatively, the username part of the user token if you generated one above.
+# declare in github (settings) SONATYPE_USERNAME in plain text
+The username part of your Sonatype user token (not the account username!). 
 ```
 
 2. create a tag and push

src/main/scala/fs2/ftp/FtpResource.scala

@@ -2,17 +2,17 @@ package fs2.ftp
 
 import java.nio.file.attribute.PosixFilePermission
 import java.nio.file.attribute.PosixFilePermission._
-
 import net.schmizz.sshj.sftp.{ FileAttributes, RemoteResourceInfo }
 import net.schmizz.sshj.xfer.FilePermission._
 import org.apache.commons.net.ftp.FTPFile
 
+import java.time.Instant
 import scala.jdk.CollectionConverters._
 
 final case class FtpResource(
   path: String,
   size: Long,
-  lastModified: Long,
+  lastModified: Instant,
   permissions: Set[PosixFilePermission],
   isDirectory: Option[Boolean]
 )
@@ -26,7 +26,7 @@ object FtpResource {
         case p   => s"$p/${f.getName}"
       },
       f.getSize,
-      f.getTimestamp.getTimeInMillis,
+      f.getTimestamp.toInstant,
       getPosixFilePermissions(f),
       Some(f.isDirectory)
     )
@@ -35,13 +35,13 @@ object FtpResource {
     FtpResource(
       file.getPath,
       file.getAttributes.getSize,
-      file.getAttributes.getMtime,
+      Instant.ofEpochSecond(file.getAttributes.getMtime),
       posixFilePermissions(file.getAttributes),
       Some(file.isDirectory)
     )
 
   def apply(path: String, attr: FileAttributes): FtpResource =
-    FtpResource(path, attr.getSize, attr.getMtime, posixFilePermissions(attr), None)
+    FtpResource(path, attr.getSize, Instant.ofEpochSecond(attr.getMtime), posixFilePermissions(attr), None)
 
   private def getPosixFilePermissions(file: FTPFile) =
     Map(

src/test/scala/fs2/ftp/UnsecureFtpSpec.scala

@@ -11,6 +11,7 @@ import org.scalatest.wordspec.AnyWordSpec
 
 import java.io.{ FileNotFoundException, InputStream }
 import java.nio.file.{ Paths, Files => JFiles }
+import java.time.Instant
 import scala.io.Source
 import scala.util.Random
 
@@ -43,6 +44,19 @@ trait BaseFtpTest extends AnyWordSpec with Matchers with BeforeAndAfterAll {
       .map(_.path) should contain allElementsOf List("/notes.txt", "/dir1")
   }
 
+  import java.time.{ Duration => JDuration }
+
+  "timestamp" in {
+    val lastModified = connect[IO, JFTPClient](settings)
+      .use {
+        _.ls("/notes.txt").compile.toList.map(_.last)
+      }
+      .unsafeRunSync()
+      .lastModified
+
+    JDuration.between(lastModified, Instant.now()).abs.toMinutes < 10 shouldBe true
+  }
+
   "ls with wrong dir" in {
     connect[IO, JFTPClient](settings)
       .use {