2.0.2

FuzzyIdeas · Aug 13, 2023 · a3bc1a8 · a3bc1a8
1 parent 16173a7
commit a3bc1a8
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 11 deletions.
diff --git a/Clop.xcodeproj/project.pbxproj b/Clop.xcodeproj/project.pbxproj
@@ -364,7 +364,7 @@
 				CODE_SIGN_ENTITLEMENTS = Clop/Clop.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2.0.1;
+				CURRENT_PROJECT_VERSION = 2.0.2;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Clop/Preview Content\"";
 				DEVELOPMENT_TEAM = RDDXV84A73;
@@ -384,7 +384,7 @@
 					"$(PROJECT_DIR)/Clop/bin",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lowtechguys.Clop;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -400,7 +400,7 @@
 				CODE_SIGN_ENTITLEMENTS = Clop/Clop.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2.0.1;
+				CURRENT_PROJECT_VERSION = 2.0.2;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Clop/Preview Content\"";
 				DEVELOPMENT_TEAM = RDDXV84A73;
@@ -420,7 +420,7 @@
 					"$(PROJECT_DIR)/Clop/bin",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.0.2;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lowtechguys.Clop;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/Clop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Clop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -78,7 +78,7 @@
       "location" : "https://github.com/FuzzyIdeas/Lowtech",
       "state" : {
         "branch" : "ventura",
-        "revision" : "bf1387dd710d00814d73994f52e2e4edf2a278f2"
+        "revision" : "d5b0aa840f91d036b59821abb7727bf22866df00"
       }
     },
     {

diff --git a/Clop/Images.swift b/Clop/Images.swift
@@ -329,7 +329,7 @@ class Image: CustomStringConvertible {
 
         path.backup(operation: .copy)
 
-        var type = UTType.png
+        var type = UTType.jpeg
         if let pngOutFile, pngOutFile.exists,
            let pngSize = pngOutFile.fileSize(), pngSize > 0,
            let jpegSize = tempFile.fileSize(),

diff --git a/Clop/OptimizationUtils.swift b/Clop/OptimizationUtils.swift
@@ -196,7 +196,6 @@ final class Optimizer: ObservableObject, Identifiable, Hashable, Equatable, Cust
     var type: ItemType
     let startedAt = Date()
 
-    @Published var running = true
     @Published var hidden = false
     @Published var isOriginal = false
     @Published var progress = Progress()
@@ -227,6 +226,15 @@ final class Optimizer: ObservableObject, Identifiable, Hashable, Equatable, Cust
 
     @Published var inRemoval = false
 
+    @Published var running = true {
+        didSet {
+            if running, !oldValue {
+                remover = nil
+                inRemoval = false
+                lastRemoveAfterMs = nil
+            }
+        }
+    }
     @Published var url: URL? {
         didSet {
             print("URL set to \(url?.path ?? "nil") from \(oldValue?.path ?? "nil")")

diff --git a/Makefile b/Makefile
@@ -24,10 +24,10 @@ DERIVED_DATA_DIR=$(shell ls -td $$HOME/Library/Developer/Xcode/DerivedData/Clop-
 print-%  : ; @echo $* = $($*)
 
 upload:
-	rsync -avz Releases/*.delta darkwoods:/static/lowtechguys/deltas/ || true
-	rsync -avzP Releases/*.dmg darkwoods:/static/lowtechguys/releases/
-	rsync -avz Releases/*.html darkwoods:/static/lowtechguys/ReleaseNotes/
-	rsync -avzP Releases/appcast.xml darkwoods:/static/lowtechguys/clop/
+	rsync -avz Releases/*.delta hetzner:/static/lowtechguys/deltas/ || true
+	rsync -avzP Releases/*.dmg hetzner:/static/lowtechguys/releases/
+	rsync -avz Releases/*.html hetzner:/static/lowtechguys/ReleaseNotes/
+	rsync -avzP Releases/appcast.xml hetzner:/static/lowtechguys/clop/
 	cfcli -d lowtechguys.com purge
 
 release:

diff --git a/Releases/Clop-2.0.2.html b/Releases/Clop-2.0.2.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
+<head>
+  <meta charset="utf-8" />
+  <meta name="generator" content="pandoc" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+  <title>Clop 2.0.2 - Release Notes</title>
+  <style>
+    code{white-space: pre-wrap;}
+    span.smallcaps{font-variant: small-caps;}
+    div.columns{display: flex; gap: min(4vw, 1.5em);}
+    div.column{flex: auto; overflow-x: auto;}
+    div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
+    /* The extra [class] is a hack that increases specificity enough to
+       override a similar rule in reveal.js */
+    ul.task-list[class]{list-style: none;}
+    ul.task-list li input[type="checkbox"] {
+      font-size: inherit;
+      width: 0.8em;
+      margin: 0 0.8em 0.2em -1.6em;
+      vertical-align: middle;
+    }
+    .display.math{display: block; text-align: center; margin: 0.5rem auto;}
+  </style>
+  <link rel="stylesheet" href="https://files.lowtechguys.com/release.css" />
+  <!--[if lt IE 9]>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
+  <![endif]-->
+</head>
+<body>
+<header id="title-block-header">
+<h1 class="title">Clop 2.0.2 - Release Notes</h1>
+</header>
+<h2 id="fixes">Fixes</h2>
+<ul>
+<li>Fix HEIC file watching optimiser</li>
+<li>Fix removing the last path from the file watcher list</li>
+</ul>
+</body>
+</html>
diff --git a/Releases/appcast.xml b/Releases/appcast.xml
@@ -1,6 +1,21 @@
 <?xml version="1.0" standalone="yes"?>
 <rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
     <channel>
+        <item>
+            <title>2.0.2</title>
+            <pubDate>Sun, 13 Aug 2023 12:58:34 +0300</pubDate>
+            <link>https://lowtechguys.com/clop</link>
+            <sparkle:fullReleaseNotesLink>https://github.com/FuzzyIdeas/Clop/releases</sparkle:fullReleaseNotesLink>
+            <sparkle:version>2.0.2</sparkle:version>
+            <sparkle:shortVersionString>2.0.2</sparkle:shortVersionString>
+            <sparkle:minimumSystemVersion>13.0</sparkle:minimumSystemVersion>
+            <sparkle:releaseNotesLink>https://files.lowtechguys.com/ReleaseNotes/Clop-2.0.2.html</sparkle:releaseNotesLink>
+            <enclosure url="https://files.lowtechguys.com/releases/Clop-2.0.2.dmg" length="52440431" type="application/octet-stream" sparkle:edSignature="WLlyRfaBRRJLArd3VpaNBJSym3NWh6QMNNU9/sD1VoBsO76cEJebK6XyX7KTjTJWwz/6PnAtN0LSc4HNCvl2AQ=="/>
+            <sparkle:deltas>
+                <enclosure url="https://files.lowtechguys.com/releases/Clop2.0.2-2.0.1.delta" sparkle:deltaFrom="2.0.1" length="217762" type="application/octet-stream" sparkle:deltaFromSparkleExecutableSize="865040" sparkle:deltaFromSparkleLocales="de,he,ar,el,ja,fa,en" sparkle:edSignature="uH5c00QXojGCRaRNxXXrku0ERNxGvn1HGEsNut7no9hkAZ4OXcWohvkJgye0XN1Kr/lVLRVNHLOEevwJunXpDQ=="/>
+                <enclosure url="https://files.lowtechguys.com/releases/Clop2.0.2-2.0.0.delta" sparkle:deltaFrom="2.0.0" length="514678" type="application/octet-stream" sparkle:deltaFromSparkleExecutableSize="865040" sparkle:deltaFromSparkleLocales="de,he,ar,el,ja,fa,en" sparkle:edSignature="cX0DHioXvlOaBTpohGbRukArWwfeXlQdO4gp9GWMrTH6NgeT91Zt46Xl8JJcXZGx4wgPJ231arqzGlJRV6SyAg=="/>
+            </sparkle:deltas>
+        </item>
         <item>
             <title>2.0.1</title>
             <pubDate>Sat, 12 Aug 2023 12:24:43 +0300</pubDate>