tidy-file-organizer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64666de0b28d39f73adc6636bdf9e96ab358e803585242df908fa3993ec7fce9
-  data.tar.gz: 5d7fd61c215b05a4fde8c27e0eeae9b85ba06792c3e6d4649df6980ffa9a94ca
+  metadata.gz: 5d8f46b93af807cefb8248c0b38ffda44f8733726bcccd54d2b769f7a4bd708a
+  data.tar.gz: c07701d4d8396d537f18ed6db6512c38a16e55d0790efabb064e0227b726fae0
 SHA512:
-  metadata.gz: a53e6db2f0ffa3f7b7c78054515f06b48050d92f05bdc227f3a2ec6fd34bd91addc0f4411dd85124dcc1ff0b9f33ad88bdb6888deebb205d3c2cc5586eecbe14
-  data.tar.gz: 346d0db207a564d6b40a1a685d23566ff061282461a4759231be22712d2f6ef7b6539304fce84f1203914cc6a3e431a8287255f2d8c6faf050642710f167cbfa
+  metadata.gz: 2b813dc8abe2411158718576bbb30f2c05563bd1c1c966fac1314c06c0cd21edc329c25718e627e0b27b68d22ee7ac5e39f4129598c44e9055204192f51de3b0
+  data.tar.gz: 20227b186a766087cc8a3f1db71c3be64b3db51bd66739dd087161eca87d1dc7637c8f6d60d29ca61142b3f52f3767dd498a7f3d69f439174541a300ef2423cb

data/.rubocop.yml

@@ -10,7 +10,7 @@ plugins:
 # Project-specific overrides
 
 Metrics/ClassLength:
-  Max: 170
+  Max: 200
 
 RSpec/MultipleExpectations:
   Max: 10

data/CLAUDE.md

@@ -4,7 +4,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 ## Project Overview
 
-A Ruby CLI tool that organizes files based on extensions, keywords, and dates. The tool supports internationalization (English/Japanese) based on the `LANG` environment variable and stores per-directory configurations using MD5 hashes.
+A Ruby CLI tool that organizes files based on extensions, keywords, regex patterns, and dates. The tool supports internationalization (English/Japanese) based on the `LANG` environment variable and stores per-directory configurations using MD5 hashes.
 
 ## Development Commands
 
@@ -60,9 +60,10 @@ ruby -I lib ./exe/tidyify run spec/data/ja --recursive
   - `organize-by-date`, `find-duplicates`, `remove-duplicates`: Directory is required
   - Options are parsed by checking for flags like `--dry-run`, `--recursive`/`-r`, `--pattern=<value>`, `--no-confirm`
 
-- **Organizer** (`lib/tidy_file_organizer/organizer.rb`): Main orchestrator for file organization. Implements two-level priority system:
-  1. Keyword matching (higher priority) - matches keywords anywhere in filename
-  2. Extension matching (lower priority) - matches file extensions
+- **Organizer** (`lib/tidy_file_organizer/organizer.rb`): Main orchestrator for file organization. Implements three-level priority system:
+  1. Pattern matching (highest priority) - matches regex patterns in filename
+  2. Keyword matching (high priority) - matches keywords anywhere in filename
+  3. Extension matching (normal priority) - matches file extensions
 
 - **Config** (`lib/tidy_file_organizer/config.rb`): Manages per-directory configuration using MD5 hash of directory path. Stores configs in `~/.config/tidy-file-organizer/[MD5hash].yml`. Supports default config references to avoid duplication.
 
@@ -95,11 +96,30 @@ Default configurations are sourced from `config/default.yml` and `config/default
 ```yaml
 language: en  # or 'ja'
 extensions:
-  Images: [jpg, jpeg, png, gif, bmp, svg, webp]
+  Images: [jpg, jpeg, png, gif, bmp, svg, webp, heic, heif, tiff, avif, ico, raw]
   Documents: [pdf, doc, docx, txt, md]
+  Databases: [db, sqlite, sqlite3, sql]
+  Fonts: [ttf, otf, woff, woff2]
+  eBooks: [epub, mobi, azw]
+  Logs: [log, out, err]
+  Data: [csv, tsv, parquet]
 keywords:
   Screenshots: [screenshot, スクリーンショット, スクショ]
   Invoices: [invoice, 請求書]
+  Receipts: [receipt, 領収書, レシート]
+  Reports: [report, 報告書, レポート]
+  Templates: [template, テンプレート, sample]
+patterns:
+  ByDate:
+  - pattern: '\d{4}-\d{2}-\d{2}'
+    description: 'Date format: 2024-01-15'
+  - pattern: '\d{8}'
+    description: 'Date format: 20240115'
+  Versions:
+  - pattern: 'v\d+\.\d+\.\d+'
+    description: 'Semantic version: v1.0.0'
+  - pattern: '_v\d+'
+    description: 'Version suffix: file_v2'
 ```
 
 **Interactive Setup Input Format**: `extensions,list:directory keyword,list:directory`
@@ -117,17 +137,30 @@ keywords:
 ### File Organization Priority
 
 When running `tidyify run`:
-1. **Keyword matching** is checked first (entire filename)
-2. **Extension matching** is checked second (file extension only)
-3. Files matching neither are skipped
-4. Organized directories are excluded from processing to prevent reorganizing already-organized files
+1. **Pattern matching** is checked first (regex patterns in filename) - highest priority
+2. **Keyword matching** is checked second (entire filename) - high priority
+3. **Extension matching** is checked third (file extension only) - normal priority
+4. Files matching none of the above are skipped
+5. Organized directories are excluded from processing to prevent reorganizing already-organized files
+
+**Priority Example**:
+- File: `invoice_2024-01-15.pdf`
+- Pattern match: `\d{4}-\d{2}-\d{2}` → Goes to `ByDate/` folder
+- Even though "invoice" keyword exists, pattern takes precedence
 
 **Exclusion Mechanism**:
-- `Organizer#extract_organized_dirs` collects all directory names from config (both extensions and keywords)
+- `Organizer#extract_organized_dirs` collects all directory names from config (extensions, keywords, and patterns)
 - In recursive mode, `FileHelper#excluded_path?` checks if any part of the file's relative path matches an organized directory name
 - This prevents files like `images/photo.jpg` from being re-organized into `images/images/photo.jpg`
 - Empty directories are automatically cleaned up after recursive organization (excluding the target directory and organized directories)
 
+**Pattern Matching Details**:
+- Patterns are defined as Ruby regular expressions in the config file
+- Each pattern category can have multiple regex patterns
+- Patterns are matched against the full filename (including extension)
+- Invalid regex patterns are skipped with a warning message
+- Pattern matching supports both string keys ('pattern') and symbol keys (:pattern) for flexibility
+
 ## Code Style
 
 This project follows [Cookpad's Ruby Style Guide](https://github.com/cookpad/styleguide) via `.rubocop.cookpad-styleguide.yml` with project-specific overrides in `.rubocop.yml`.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tidy-file-organizer (1.0.1)
+    tidy-file-organizer (1.0.2)
 
 GEM
   remote: https://rubygems.org/
@@ -65,10 +65,10 @@ PLATFORMS
 
 DEPENDENCIES
   rake (~> 13.0)
-  rspec (~> 3.0, >= 0)
-  rubocop (~> 1.0, >= 0)
-  rubocop-performance (~> 1.0, >= 0)
-  rubocop-rspec (~> 3.0, >= 0)
+  rspec
+  rubocop
+  rubocop-performance
+  rubocop-rspec
   tidy-file-organizer!
 
 CHECKSUMS
@@ -94,9 +94,9 @@ CHECKSUMS
   rubocop-performance (1.26.1) sha256=cd19b936ff196df85829d264b522fd4f98b6c89ad271fa52744a8c11b8f71834
   rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
-  tidy-file-organizer (1.0.1)
+  tidy-file-organizer (1.0.2)
   unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42
   unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f
 
 BUNDLED WITH
-  4.0.1
+   2.5.23

data/config/default.ja.yml

@@ -15,6 +15,15 @@
   - bmp
   - svg
   - webp
+  - heic
+  - heif
+  - tiff
+  - tif
+  - avif
+  - ico
+  - raw
+  - cr2
+  - nef
   動画:
   - mp4
   - mov
@@ -22,12 +31,21 @@
   - mkv
   - flv
   - wmv
+  - webm
+  - m4v
+  - 3gp
+  - ogv
   音声:
   - mp3
   - wav
   - flac
   - aac
   - m4a
+  - ogg
+  - opus
+  - wma
+  - midi
+  - mid
   書類:
   - pdf
   - doc
@@ -48,6 +66,17 @@
   - c
   - go
   - rs
+  - sh
+  - bash
+  - zsh
+  - fish
+  - ps1
+  - r
+  - swift
+  - kt
+  - scala
+  - clj
+  - lua
   ウェブ:
   - html
   - css
@@ -69,6 +98,34 @@
   - toml
   - xml
   - ini
+  データベース:
+  - db
+  - sqlite
+  - sqlite3
+  - sql
+  - mdb
+  - accdb
+  フォント:
+  - ttf
+  - otf
+  - woff
+  - woff2
+  - eot
+  電子書籍:
+  - epub
+  - mobi
+  - azw
+  - azw3
+  - fb2
+  ログ:
+  - log
+  - out
+  - err
+  データ:
+  - csv
+  - tsv
+  - parquet
+  - arrow
 :keywords:
   スクリーンショット:
   - screenshot
@@ -90,3 +147,58 @@
   - backup
   - バックアップ
   - bak
+  領収書:
+  - receipt
+  - 領収書
+  - レシート
+  報告書:
+  - report
+  - 報告書
+  - レポート
+  - 報告
+  提案書:
+  - proposal
+  - 提案書
+  - 提案
+  - 企画書
+  プレゼン資料:
+  - presentation
+  - slide
+  - deck
+  - プレゼン
+  - 資料
+  - スライド
+  テンプレート:
+  - template
+  - テンプレート
+  - sample
+  - サンプル
+  - boilerplate
+  下書き:
+  - draft
+  - 草案
+  - 下書き
+  - wip
+  - temp
+  - tmp
+  メモ:
+  - note
+  - memo
+  - メモ
+  - ノート
+  - 覚書
+:patterns:
+  日付:
+  - pattern: '\d{4}-\d{2}-\d{2}'
+    description: '日付形式: 2024-01-15'
+  - pattern: '\d{4}_\d{2}_\d{2}'
+    description: '日付形式: 2024_01_15'
+  - pattern: '\d{8}'
+    description: '日付形式: 20240115'
+  バージョン:
+  - pattern: 'v\d+\.\d+\.\d+'
+    description: 'セマンティックバージョン: v1.0.0'
+  - pattern: '_v\d+'
+    description: 'バージョン接尾辞: file_v2'
+  - pattern: '_(final|rev\d+)'
+    description: '最終版または改訂版: file_final, file_rev3'

data/config/default.yml

@@ -15,6 +15,15 @@
   - bmp
   - svg
   - webp
+  - heic
+  - heif
+  - tiff
+  - tif
+  - avif
+  - ico
+  - raw
+  - cr2
+  - nef
   Videos:
   - mp4
   - mov
@@ -22,12 +31,21 @@
   - mkv
   - flv
   - wmv
+  - webm
+  - m4v
+  - 3gp
+  - ogv
   Audio:
   - mp3
   - wav
   - flac
   - aac
   - m4a
+  - ogg
+  - opus
+  - wma
+  - midi
+  - mid
   Documents:
   - pdf
   - doc
@@ -48,6 +66,17 @@
   - c
   - go
   - rs
+  - sh
+  - bash
+  - zsh
+  - fish
+  - ps1
+  - r
+  - swift
+  - kt
+  - scala
+  - clj
+  - lua
   Web:
   - html
   - css
@@ -69,6 +98,34 @@
   - toml
   - xml
   - ini
+  Databases:
+  - db
+  - sqlite
+  - sqlite3
+  - sql
+  - mdb
+  - accdb
+  Fonts:
+  - ttf
+  - otf
+  - woff
+  - woff2
+  - eot
+  eBooks:
+  - epub
+  - mobi
+  - azw
+  - azw3
+  - fb2
+  Logs:
+  - log
+  - out
+  - err
+  Data:
+  - csv
+  - tsv
+  - parquet
+  - arrow
 :keywords:
   Screenshots:
   - screenshot
@@ -90,3 +147,58 @@
   - backup
   - バックアップ
   - bak
+  Receipts:
+  - receipt
+  - 領収書
+  - レシート
+  Reports:
+  - report
+  - 報告書
+  - レポート
+  - 報告
+  Proposals:
+  - proposal
+  - 提案書
+  - 提案
+  - 企画書
+  Presentations:
+  - presentation
+  - slide
+  - deck
+  - プレゼン
+  - 資料
+  - スライド
+  Templates:
+  - template
+  - テンプレート
+  - sample
+  - サンプル
+  - boilerplate
+  Drafts:
+  - draft
+  - 草案
+  - 下書き
+  - wip
+  - temp
+  - tmp
+  Notes:
+  - note
+  - memo
+  - メモ
+  - ノート
+  - 覚書
+:patterns:
+  ByDate:
+  - pattern: '\d{4}-\d{2}-\d{2}'
+    description: 'Date format: 2024-01-15'
+  - pattern: '\d{4}_\d{2}_\d{2}'
+    description: 'Date format: 2024_01_15'
+  - pattern: '\d{8}'
+    description: 'Date format: 20240115'
+  Versions:
+  - pattern: 'v\d+\.\d+\.\d+'
+    description: 'Semantic version: v1.0.0'
+  - pattern: '_v\d+'
+    description: 'Version suffix: file_v2'
+  - pattern: '_(final|rev\d+)'
+    description: 'Final or revision: file_final, file_rev3'

data/lib/tidy_file_organizer/config.rb

@@ -44,7 +44,7 @@ module TidyFileOrganizer
     end
 
     def default
-      { extensions: {}, keywords: {} }
+      { extensions: {}, keywords: {}, patterns: {} }
     end
 
     def path

data/lib/tidy_file_organizer/organizer.rb

@@ -47,7 +47,9 @@ module TidyFileOrganizer
     end
 
     def extract_organized_dirs(config)
-      (config[:extensions].keys + config[:keywords].keys).uniq
+      dirs = config[:extensions].keys + config[:keywords].keys
+      dirs += config[:patterns].keys if config[:patterns]
+      dirs.uniq
     end
 
     def handle_empty_files
@@ -71,7 +73,8 @@ module TidyFileOrganizer
       filename = File.basename(file_path)
       extension = extract_extension(file_path)
 
-      find_by_keyword(filename, config[:keywords]) ||
+      find_by_pattern(filename, config[:patterns]) ||
+        find_by_keyword(filename, config[:keywords]) ||
         find_by_extension(extension, config[:extensions])
     end
 
@@ -79,6 +82,26 @@ module TidyFileOrganizer
       File.extname(file_path).delete('.').downcase
     end
 
+    def find_by_pattern(filename, patterns_config)
+      return nil unless patterns_config
+
+      patterns_config.each do |dir, patterns|
+        patterns.each do |pattern_info|
+          pattern = pattern_info['pattern'] || pattern_info[:pattern]
+          next unless pattern
+
+          begin
+            regex = Regexp.new(pattern)
+            return dir if filename.match?(regex)
+          rescue RegexpError => e
+            # Skip invalid regex patterns
+            warn "Invalid regex pattern '#{pattern}': #{e.message}"
+          end
+        end
+      end
+      nil
+    end
+
     def find_by_keyword(filename, keywords_config)
       keywords_config.each do |dir, keywords|
         return dir if keywords.any? { |kw| filename.include?(kw) }

data/lib/tidy_file_organizer/setup_prompt.rb

@@ -109,25 +109,35 @@ module TidyFileOrganizer
     def default_extensions
       if @language == 'en'
         {
-          'Images' => %w[jpg jpeg png gif bmp svg webp],
-          'Videos' => %w[mp4 mov avi mkv flv wmv],
-          'Audio' => %w[mp3 wav flac aac m4a],
+          'Images' => %w[jpg jpeg png gif bmp svg webp heic heif tiff tif avif ico raw cr2 nef],
+          'Videos' => %w[mp4 mov avi mkv flv wmv webm m4v 3gp ogv],
+          'Audio' => %w[mp3 wav flac aac m4a ogg opus wma midi mid],
           'Documents' => %w[pdf doc docx xls xlsx ppt pptx txt md],
-          'Scripts' => %w[rb py js ts java cpp c go rs],
+          'Scripts' => %w[rb py js ts java cpp c go rs sh bash zsh fish ps1 r swift kt scala clj lua],
           'Web' => %w[html css scss jsx tsx vue],
           'Archives' => %w[zip tar gz rar 7z bz2],
           'Configs' => %w[json yml yaml toml xml ini],
+          'Databases' => %w[db sqlite sqlite3 sql mdb accdb],
+          'Fonts' => %w[ttf otf woff woff2 eot],
+          'eBooks' => %w[epub mobi azw azw3 fb2],
+          'Logs' => %w[log out err],
+          'Data' => %w[csv tsv parquet arrow],
         }
       else
         {
-          '画像' => %w[jpg jpeg png gif bmp svg webp],
-          '動画' => %w[mp4 mov avi mkv flv wmv],
-          '音声' => %w[mp3 wav flac aac m4a],
+          '画像' => %w[jpg jpeg png gif bmp svg webp heic heif tiff tif avif ico raw cr2 nef],
+          '動画' => %w[mp4 mov avi mkv flv wmv webm m4v 3gp ogv],
+          '音声' => %w[mp3 wav flac aac m4a ogg opus wma midi mid],
           '書類' => %w[pdf doc docx xls xlsx ppt pptx txt md],
-          'スクリプト' => %w[rb py js ts java cpp c go rs],
+          'スクリプト' => %w[rb py js ts java cpp c go rs sh bash zsh fish ps1 r swift kt scala clj lua],
           'ウェブ' => %w[html css scss jsx tsx vue],
           'アーカイブ' => %w[zip tar gz rar 7z bz2],
           '設定' => %w[json yml yaml toml xml ini],
+          'データベース' => %w[db sqlite sqlite3 sql mdb accdb],
+          'フォント' => %w[ttf otf woff woff2 eot],
+          '電子書籍' => %w[epub mobi azw azw3 fb2],
+          'ログ' => %w[log out err],
+          'データ' => %w[csv tsv parquet arrow],
         }
       end
     end
@@ -140,6 +150,13 @@ module TidyFileOrganizer
           'Minutes' => %w[議事録 minutes meeting],
           'Contracts' => %w[契約 contract 同意書],
           'Backups' => %w[backup バックアップ bak],
+          'Receipts' => %w[receipt 領収書 レシート],
+          'Reports' => %w[report 報告書 レポート 報告],
+          'Proposals' => %w[proposal 提案書 提案 企画書],
+          'Presentations' => %w[presentation slide deck プレゼン 資料 スライド],
+          'Templates' => %w[template テンプレート sample サンプル boilerplate],
+          'Drafts' => %w[draft 草案 下書き wip temp tmp],
+          'Notes' => %w[note memo メモ ノート 覚書],
         }
       else
         {
@@ -148,6 +165,13 @@ module TidyFileOrganizer
           '議事録' => %w[議事録 minutes meeting],
           '契約書' => %w[契約 contract 同意書],
           'バックアップ' => %w[backup バックアップ bak],
+          '領収書' => %w[receipt 領収書 レシート],
+          '報告書' => %w[report 報告書 レポート 報告],
+          '提案書' => %w[proposal 提案書 提案 企画書],
+          'プレゼン資料' => %w[presentation slide deck プレゼン 資料 スライド],
+          'テンプレート' => %w[template テンプレート sample サンプル boilerplate],
+          '下書き' => %w[draft 草案 下書き wip temp tmp],
+          'メモ' => %w[note memo メモ ノート 覚書],
         }
       end
     end

data/lib/tidy_file_organizer/version.rb

@@ -1,3 +1,3 @@
 module TidyFileOrganizer
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tidy-file-organizer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - sachin21
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.4
 specification_version: 4
 summary: File organizer based on extensions, names, and keywords.
 test_files: []