Skip to content

Commit

Permalink
Version 1.6. Bug checks not finished.
Browse files Browse the repository at this point in the history
Bug fix:
Unicode characters in comic file will no longer error
Folder rules are now saved
Progress bar will now correctly update

Change:
Cancel button in Progress bar and tag selection forms
Text should now reflect what mode you are using
All text will now reflect when mode you are using

New Features:
Path to long exception is now caught and gives you the option to shorten it
Better duplicate form

Add age rating, file name fileformat, filepath and scan information to exclude rules options
Added Age Rating and scan information tags

Option to automaticly insert any of Characters, Genre, Scan Information, Tags, Teams or Writers without asking when there is only one value
Option to automaticly use the selected tags, characters etc when an issue in the operation has them
  • Loading branch information
Stonepaw committed May 22, 2011
1 parent dd95b01 commit 02775ed
Show file tree
Hide file tree
Showing 14 changed files with 1,760 additions and 1,039 deletions.
257 changes: 257 additions & 0 deletions DuplicateForm.xaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Package.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name=Library Organizer
Author=Stonepaw
Version=1.4
Version=1.6
Description=A file and folder organizer with GUI that helps build you file and folder paths.
Image=lopackagelogo.png
KeepFiles= losettingsx.dat
Binary file added arrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 15 additions & 19 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
New Features:
Rule Groups
Rule operators less than and greater than
Add option for rules matches to be excluded or the only ones to be moved
Characters, Tags, Writer, Genre, Teams, Series Complete and Manga fields.
Test mode. When in test mode the script will act as though the operation is working but no files or directories will be created/deleted
Copy mode. Option to add copied comic to the library
Library Organizer- Undo last move script. Undoes the last, and only the last, move operation.
Bug fix:
Unicode characters in comic file will no longer error
Folder rules are now saved
Progress bar will now correctly update

Change:
Cancel button in Progress bar and tag selection forms
Text should now reflect what mode you are using
All text will now reflect when mode you are using

Changes:
Improved rule calculating and how they are added to the UI
Improved template text insertion
Changed when overwriting a file to move it to the recycle bin instead of deleting permenantly


Bug fixes:
Fixed possible error when calculating exclude rules when a rule had been deleted and match type was all
Fixed error when a rule was set to Tags
Misc. other bug fixes and tweaks

New Features:
Path to long exception is now caught and gives you the option to shorten it
Better duplicate form

Add age rating, file name fileformat, filepath and scan information to exclude rules options
Added Age Rating and scan information tags

Option to automaticly insert any of Characters, Genre, Scan Information, Tags, Teams or Writers without asking when there is only one value
Option to automaticly use the selected tags, characters etc when an issue in the operation has them
68 changes: 38 additions & 30 deletions libraryorganizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
The main script file. Some code is this file is based off of wadegiles's Guided eComic file renaming script. Credit is very much due to him
Version 1.4:
Version 1.6:
Added Undo script
Added configscript hook script
Author: Stonepaw
Expand All @@ -20,7 +20,7 @@
from System.IO import File, StreamReader, StreamWriter

clr.AddReference("System.Windows.Forms")
from System.Windows.Forms import DialogResult
from System.Windows.Forms import DialogResult, MessageBox

clr.AddReference("System.Xml")
import System.Xml
Expand All @@ -40,8 +40,10 @@

import lobookmover


#@Name Library Organizer
#@Hook Books
#@Key library-organizer-main
#@Image libraryorganizer.png

def LibraryOrganizer(books):
Expand Down Expand Up @@ -77,8 +79,14 @@ def LibraryOrganizer(books):
print Exception
print str(ex)

#@Key library-organizer-main
#@Hook ConfigScript
def ConfigLibraryOrganizer():
ConfigureLibraryOrganizer(None)

#@Name Library Organizer (Quick)
#@Hook Books
#@Key library-organizer-quick
#@Image libraryorganizerquick.png
def LibraryOrganizerQuick(books):
if books:
Expand Down Expand Up @@ -110,49 +118,49 @@ def LibraryOrganizerQuick(books):
#@Hook Library
#@Image libraryorganizer.png
def ConfigureLibraryOrganizer(books):
if books:
try:
loworkerform.ComicRack = ComicRack
locommon.ComicRack = ComicRack
lobookmover.ComicRack = ComicRack
settings, lastused = LoadSettings()
#Get a random book to use as an example
config = ConfigForm(books, settings, lastused)
result = config.ShowDialog()
if result == DialogResult.Cancel:
#Dont save settings and quit the script
return
else:
config.SaveSettings()
lastused = config._cmbProfiles.SelectedItem
#Now save the settings
SaveSettings(settings, lastused)
except Exception, ex:
print "The Following error occured"
print Exception
print str(ex)
if books == None:
books = ComicRack.App.GetLibraryBooks()
try:
loworkerform.ComicRack = ComicRack
locommon.ComicRack = ComicRack
lobookmover.ComicRack = ComicRack
settings, lastused = LoadSettings()
config = ConfigForm(books, settings, lastused)
result = config.ShowDialog()
if result == DialogResult.Cancel:
#Dont save settings and quit the script
return
else:
config.SaveSettings()
lastused = config._cmbProfiles.SelectedItem
#Now save the settings
SaveSettings(settings, lastused)
except Exception, ex:
print "The Following error occured"
print Exception
print str(ex)

#@Name Library Organizer - Undo last move
#@Hook Library
#@Image libraryorganizer.png
def LibraryOrganizerUndo(books):
if books:
try:
loworkerform.ComicRack = ComicRack
locommon.ComicRack = ComicRack
lobookmover.ComicRack = ComicRack
settings, lastused = LoadSettings()
if File.Exists(locommon.UNDOFILE):
loworkerform.ComicRack = ComicRack
locommon.ComicRack = ComicRack
lobookmover.ComicRack = ComicRack
settings, lastused = LoadSettings()
dict = locommon.LoadDict(locommon.UNDOFILE)
if dict:
workerForm = WorkerFormUndo(dict, settings[lastused])
workerForm.ShowDialog()
workerForm.Dispose()
File.Delete(locommon.UNDOFILE)
else:
MessageBox.Show("Error loading Undo file")
MessageBox.Show("Error loading Undo file", "Library Organizer - Undo")
else:
MessageBox.Show("Nothing to Undo")
MessageBox.Show("Nothing to Undo", "Library Organizer - Undo")
except Exception, ex:
print "The following error occured"
print Exception
Expand Down
Loading

0 comments on commit 02775ed

Please sign in to comment.