<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[138483] branches/gsoc15-pallet</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/138483">138483</a></dd>
<dt>Author</dt> <dd>ksammons@macports.org</dd>
<dt>Date</dt> <dd>2015-07-09 12:23:14 -0700 (Thu, 09 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added basic reclaim functionality</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkMPMacPortsh">branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.h</a></li>
<li><a href="#branchesgsoc15palletMacPorts_FrameworkMPMacPortsm">branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.m</a></li>
<li><a href="#branchesgsoc15palletPalletMPActionLauncherh">branches/gsoc15-pallet/Pallet/MPActionLauncher.h</a></li>
<li><a href="#branchesgsoc15palletPalletMPActionLauncherm">branches/gsoc15-pallet/Pallet/MPActionLauncher.m</a></li>
<li><a href="#branchesgsoc15palletPalletMPActionsControllerm">branches/gsoc15-pallet/Pallet/MPActionsController.m</a></li>
<li><a href="#branchesgsoc15palletPalletPalletxcodeprojprojectxcworkspacexcuserdatamrappleseedxcuserdatadUserInterfaceStatexcuserstate">branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc15palletMacPorts_FrameworkMPMacPortsh"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.h (138482 => 138483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.h 2015-07-09 19:22:08 UTC (rev 138482)
+++ branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.h 2015-07-09 19:23:14 UTC (rev 138483)
</span><span class="lines">@@ -95,6 +95,12 @@
</span><span class="cx"> - (id)diagnose:(NSError**)sError;
</span><span class="cx">
</span><span class="cx"> /*!
</span><ins>+ @brief Runs the reclaim command.
+ */
+- (id)reclaim:(NSError**)sError;
+
+
+/*!
</ins><span class="cx"> @brief Synchronizes the ports tree without checking for upgrades to the MacPorts base.
</span><span class="cx"> */
</span><span class="cx"> - (id)sync:(NSError **)sError;
</span></span></pre></div>
<a id="branchesgsoc15palletMacPorts_FrameworkMPMacPortsm"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.m (138482 => 138483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.m 2015-07-09 19:22:08 UTC (rev 138482)
+++ branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.m 2015-07-09 19:23:14 UTC (rev 138483)
</span><span class="lines">@@ -131,12 +131,39 @@
</span><span class="cx">
</span><span class="cx"> #pragma MacPorts API
</span><span class="cx">
</span><ins>+- (id)reclaim:(NSError**)sError
+{
+ NSString * result = nil;
+
+ [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"MacPorts_reclaim_Started" object:nil];
+ [[MPNotifications sharedListener] setPerformingTclCommand:@"reclaim"];
+
+ //FIXME
+ /*
+ if ([self authorizationMode])
+ {
+ result = [interpreter evaluateStringWithMPHelperTool:@"mportdiagnose" error:sError];
+ }
+ else
+ {
+ result = [interpreter evaluateStringWithPossiblePrivileges:@"mportdiagnose" error:sError];
+ }*/
+
+ result = [interpreter evaluateStringAsString:@"reclaim::main \"\"" error:sError];
+
+ [[MPNotifications sharedListener] setPerformingTclCommand:@""];
+ [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"MacPorts_reclaim_Finished" object:nil];
+
+ return result;
+}
+
+
</ins><span class="cx"> - (id)diagnose:(NSError**)sError
</span><span class="cx"> {
</span><span class="cx"> NSString * result = nil;
</span><span class="cx">
</span><span class="cx"> [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"MacPorts_diagnose_Started" object:nil];
</span><del>- [[MPNotifications sharedListener] setPerformingTclCommand:@"sync"];
</del><ins>+ [[MPNotifications sharedListener] setPerformingTclCommand:@"diagnose"];
</ins><span class="cx">
</span><span class="cx"> //FIXME
</span><span class="cx"> /*
</span></span></pre></div>
<a id="branchesgsoc15palletPalletMPActionLauncherh"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/Pallet/MPActionLauncher.h (138482 => 138483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-pallet/Pallet/MPActionLauncher.h 2015-07-09 19:22:08 UTC (rev 138482)
+++ branches/gsoc15-pallet/Pallet/MPActionLauncher.h 2015-07-09 19:23:14 UTC (rev 138483)
</span><span class="lines">@@ -85,6 +85,11 @@
</span><span class="cx"> - (void)diagnose;
</span><span class="cx">
</span><span class="cx"> /*!
</span><ins>+ @brief Runs the reclaim command.
+ */
+- (void)reclaim;
+
+/*!
</ins><span class="cx"> @brief Syncs the MacPorts installation in another thread
</span><span class="cx"> */
</span><span class="cx"> - (void)sync;
</span></span></pre></div>
<a id="branchesgsoc15palletPalletMPActionLauncherm"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/Pallet/MPActionLauncher.m (138482 => 138483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-pallet/Pallet/MPActionLauncher.m 2015-07-09 19:22:08 UTC (rev 138482)
+++ branches/gsoc15-pallet/Pallet/MPActionLauncher.m 2015-07-09 19:23:14 UTC (rev 138483)
</span><span class="lines">@@ -118,6 +118,22 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)reclaim
+{
+ errorReceived = NO;
+ NSError * error;
+ [[MPMacPorts sharedInstance] reclaim:&error];
+ if(errorReceived)
+ {
+ [self sendNotification:GROWL_RECLAIMFAILED];
+ }
+ else
+ {
+ [self sendNotification:GROWL_RECLAIM];
+ [[NSNotificationCenter defaultCenter] postNotificationName:@"advanceQ" object:nil userInfo:nil];
+ }
+}
+
</ins><span class="cx"> - (void)diagnose
</span><span class="cx"> {
</span><span class="cx"> errorReceived = NO;
</span></span></pre></div>
<a id="branchesgsoc15palletPalletMPActionsControllerm"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-pallet/Pallet/MPActionsController.m (138482 => 138483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-pallet/Pallet/MPActionsController.m 2015-07-09 19:22:08 UTC (rev 138482)
+++ branches/gsoc15-pallet/Pallet/MPActionsController.m 2015-07-09 19:23:14 UTC (rev 138483)
</span><span class="lines">@@ -445,6 +445,11 @@
</span><span class="cx"> NSLog(@"We have diagnose");
</span><span class="cx"> [[MPActionLauncher sharedInstance] performSelectorInBackground:@selector(diagnose) withObject:nil];
</span><span class="cx"> }
</span><ins>+ else if([[dict objectForKey:@"operation"] isEqualToString:@"reclaim"])
+ {
+ NSLog(@"We have reclaim");
+ [[MPActionLauncher sharedInstance] performSelectorInBackground:@selector(reclaim) withObject:nil];
+ }
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchesgsoc15palletPalletPalletxcodeprojprojectxcworkspacexcuserdatamrappleseedxcuserdatadUserInterfaceStatexcuserstate"></a>
<div class="binary"><h4>Modified: branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
</div>
</body>
</html>