[maid] Consolidate + clean up rules file.

home/.maid/public_rules.rb

@@ -1,87 +0,0 @@
-Maid.rules do
-  rule 'Clean my Desk' do
-    move(
-      dir('~/Desktop/*'),
-      mkdir("~/Puffer")
-    )
-  end
-
-  rule 'File away Taz' do
-    move(
-      dir('~/Downloads/taz_*{epub,txt,pdf}'),
-      mkdir("~/Lager/eBooks/taz/")
-    )
-  end
-
-  rule 'Keep Dear Mac OS Posts' do
-    move(
-      dir('~/Puffer/dearmacos*'),
-      mkdir("~/Puffer/DearMacOS")
-    )
-    move(
-      dir('~/Downloads/dearmacos*'),
-      mkdir("~/Puffer/DearMacOS")
-    )
-  end
-
-  rule 'Move PDF Files to be buffered' do
-    move(
-      dir('~/Puffer/*.pdf'),
-      mkdir("~/Puffer/#{DateTime.now.strftime("%Y-%m")}/")
-    )
-    move(
-      dir('~/Downloads/*.pdf'),
-      mkdir("~/Puffer/#{DateTime.now.strftime("%Y-%m")}/")
-    )
-  end
-
-  rule 'Move PDF Files to be buffered' do
-    move(
-      dir('~/Puffer/*.pdf'),
-      mkdir("~/Puffer/#{DateTime.now.strftime("%Y-%m")}/")
-    )
-    move(
-      dir('~/Downloads/*.pdf'),
-      mkdir("~/Puffer/#{DateTime.now.strftime("%Y-%m")}/")
-    )
-  end
-
-  rule 'Move Mediathek Downlads' do
-    move(
-      dir('~/*{nano,kulturzeit,Abenteuer_Forschung,hitec,Arte,ARD,ZDF,wido}*.{mkv,mp4}'),
-      mkdir("~/Puffer/Videos/Mediathek/")
-    )
-  end
-
-  rule 'Move Screenshots' do
-    move(
-      dir('~/{Screen,screen,screnn}*.{png,jpg,JPG,PNG}'),
-      mkdir("~/Puffer/Bilder/Screenshots/")
-    )
-  end
-
-  rule 'Move files away from Buffer' do
-    move(
-      dir('~/Puffer/*.{png,jpg,jpeg,tif,gif}'),
-      mkdir("~/Puffer/Bilder/")
-    )
-  end
-
-  rule 'Delete old downloads' do
-    dir('~/Downloads/*.{deb,zip,tar.gz,gz,bz,bz2,7z,rpm}').each do |path|
-      trash(path) if 3.days.since?(modified_at(path))
-    end
-  end
-
-  rule 'Delete extracted folders' do
-    dir('~/Downloads/*').each do |path|
-      trash(path) if 5.days.since?(modified_at(path))
-    end
-  end
-
-  rule 'Delete partial downloads' do
-    dir('~/Puffer/*.part').each do |path|
-      trash(path) if 1.days.since?(accessed_at(path))
-    end
-  end
-end

home/.maid/rules.rb

@@ -1,2 +1,52 @@
-require_relative 'public_rules'
-require_relative 'private_rules'
+require_relative File.expand_path "~/.maid/private_rules.rb"
+
+Maid.rules do
+  NOW = DateTime.now.strftime("%Y-%m")
+  rule 'File away Taz' do
+    move(
+      dir('~/Downloads/taz_*{epub,txt,pdf}'),
+      mkdir("~/Lager/eBooks/taz/")
+    )
+  end
+
+  rule 'Move PDF Files to be buffered' do
+    move(
+      dir('~/Downloads/*.{PDF,pdf}'),
+      mkdir("~/Lager/Downloaded-Documents/#{NOW}/")
+    )
+  end
+
+  rule 'Move Mediathek Downlads' do
+    move(
+      dir('~/*{nano,kulturzeit,Abenteuer_Forschung,hitec,Arte,ARD,ZDF,wido}*.{mkv,mp4}'),
+      mkdir("~/Videos/Mediathek/")
+    )
+  end
+
+  rule 'Move files away from Buffer' do
+    move(
+      dir('~/Downloads/*.{png,jpg,jpeg,tif,gif}'),
+      mkdir("~/Lager/Downloaded-Pictures/#{NOW}/")
+    )
+  end
+
+  rule 'Move ISOs' do
+    dir('~/Downloads/*.iso').each do |f|
+      name = File.basename(f, ".iso").capitalize
+      move(f, mkdir("~/Lager/Images/#{name}/"))
+    end
+  end
+
+  rule 'Delete old and partial downloads' do
+    dir('~/Downloads/*.{deb,zip,tgz,xz,gz,bz,jar,txz,dmg,exe,bz2,7z,rpm,part}').each do |path|
+      trash(path) if 3.days.since?(modified_at(path))
+    end
+  end
+
+  rule 'Delete extracted folders' do
+    dir('~/Downloads/*').each do |path|
+      trash(path) if 5.days.since?(modified_at(path)) && File.directory?(path)
+    end
+  end
+
+end