ghdl 0.4.3__tar.gz → 0.4.5__tar.gz

{ghdl-0.4.3 → ghdl-0.4.5}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: ghdl
-Version: 0.4.3
-Summary: Package manager for Github Release binaries
+Version: 0.4.5
+Summary: Binary Manager for Github Releases
 License: AGPL-3.0-or-later
 Author: Imran Khan
 Author-email: imran@khan.ovh

{ghdl-0.4.3 → ghdl-0.4.5}/ghdl/__init__.hy

@@ -1,3 +1,3 @@
-(setv __version__ "0.4.3")
+(setv __version__ "0.4.5")
 
 (import ghdl.main [main set-dry set-single])

{ghdl-0.4.3 → ghdl-0.4.5}/ghdl/config.hy

@@ -36,6 +36,8 @@
             (-> record.repo (.split "/") (get 1)))
       (setv record.name (get info "name")))
 
+  (setv record.release-filter (.get info "release_filter" None))
+
   (when (in "archive" info)
     (setv record.isArchive? (get info "archive")))
 

{ghdl-0.4.3 → ghdl-0.4.5}/ghdl/main.hy

@@ -39,15 +39,17 @@
 
 
 (defn/a add-remote-metadata [record client]
-  (setv remote-metadata
-        (await (remote.metadata record.repo record.pre-release? client Config.token)))
+  (setv record.url None)
 
-  ;; Network error
-  (when (not remote-metadata)
-    (do
-      (setv record.toUpdate? False)
-      (.append Config.failures #(record.repo "Network"))
-      (return)))
+  (setv remote-metadata
+        (try
+          (await (remote.metadata record client Config.token))
+          (except [e []]
+            (print f"Failed to fetch remote data from Github API for {record.repo}")
+            (print (traceback.format_exc))
+            (setv record.toUpdate? False)
+            (.append Config.failures #(record.repo "Network"))
+            (return))))
 
   (setv record.tag remote-metadata.tag)
   (setv record.timestamp remote-metadata.timestamp)
@@ -56,7 +58,6 @@
   (if (not dl-url)
       (do
         (setv record.toUpdate? False)
-        (setv record.url "N/A")
         (.append Config.failures #(record.repo "No Matching URL"))
         (return))
       (setv record.url dl-url)))
@@ -109,6 +110,8 @@
 
 
 (defn process [record]
+  (unless record.toUpdate? (return))
+
   (with [(utils.Tempdir)]
     (setv filename (-> record.url (.split "/") (get -1)))
     (utils.download_file record.url filename)

ghdl-0.4.5/ghdl/remote.hy

@@ -0,0 +1,53 @@
+(import json re dateutil.parser collections [namedtuple])
+
+(require hyrule [-> assoc])
+
+
+(defclass NoMatchingReleaseException [Exception])
+
+
+(setv Remote (namedtuple "Record" '("tag" "timestamp" "url_data")))
+
+
+(defn get-api [record]
+  (if (or record.pre-release? record.release-filter)
+      f"{record.repo}/releases"
+      f"{record.repo}/releases/latest"))
+
+
+(defn to-unix [timestring]
+  (-> timestring (dateutil.parser.parse) (.strftime "%s") (int)))
+
+
+(defn find-matching-release [resp release-filter]
+  (for [release resp]
+    (setv name (get release "name"))
+    (setv pattern (re.compile release-filter))
+    (when (bool (re.search pattern name))
+      (return release)))
+  (print f"No matching release found for: {release-filter}")
+  (raise NoMatchingReleaseException))
+
+
+(defn/a get-remote [record client [token None]]
+  (setv headers {"Accept" "application/vnd.github.v3+json"})
+  (setv api (get-api record))
+  (when token (assoc headers "Authorization" f"token {token}"))
+  (setv resp (.json (await (client.get api :headers headers))))
+  (cond
+    record.pre-release? (get resp 0)
+    record.release-filter (find-matching-release resp record.release-filter)
+    True resp))
+
+
+(defn get-metadata [resp]
+  (setv urls
+        (lfor asset (get resp "assets")
+              #((get asset "name") (get asset "browser_download_url"))))
+  (Remote (get resp "tag_name")
+          (to-unix (get resp "published_at"))
+          urls))
+
+
+(defn/a metadata [record client [token None]]
+  (get-metadata (await (get-remote record client token))))

{ghdl-0.4.3 → ghdl-0.4.5}/ghdl/schema.hy

@@ -24,6 +24,5 @@
     (print f"Name: {self.name}")
     (print f"Exists?: {self.exists?}")
     (print f"Update?: {self.toUpdate?}")
-    ;(print f"Archive?: {self.isArchive?}")
     (print f"URL: {self.url}")
     (print "---------------")))

{ghdl-0.4.3 → ghdl-0.4.5}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "ghdl"
-version = "0.4.3"
-description = "Package manager for Github Release binaries"
+version = "0.4.5"
+description = "Binary Manager for Github Releases"
 authors = ["Imran Khan <imran@khan.ovh>"]
 license = "AGPL-3.0-or-later"
 

ghdl-0.4.3/ghdl/remote.hy

@@ -1,41 +0,0 @@
-(import json dateutil.parser collections [namedtuple])
-
-(require hyrule [-> assoc])
-
-
-(setv Remote (namedtuple "Record" '("tag" "timestamp" "url_data")))
-
-
-(defn get-api [repo pre-release?]
-  (if pre-release?
-      f"{repo}/releases"
-      f"{repo}/releases/latest"))
-
-
-(defn to-unix [timestring]
-  (-> timestring (dateutil.parser.parse) (.strftime "%s") (int)))
-
-
-(defn/a get-remote [repo pre-release? client [token None]]
-  (setv headers {"Accept" "application/vnd.github.v3+json"})
-  (setv api (get-api repo pre-release?))
-  (when token (assoc headers "Authorization" f"token {token}"))
-  (setv resp (.json (await (client.get api :headers headers))))
-  (return (if pre-release? (get resp 0) resp)))
-
-
-(defn get-metadata [resp]
-  (setv urls
-        (lfor asset (get resp "assets")
-              #((get asset "name") (get asset "browser_download_url"))))
-  (Remote (get resp "tag_name")
-          (to-unix (get resp "published_at"))
-          urls))
-
-
-(defn/a metadata [repo pre-release? client [token None]]
-  (try
-    (get-metadata (await (get-remote repo pre-release? client token)))
-    (except []
-      (print f"Error fetching metadata from Github API for {repo}")
-      None)))